These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / gpio / gpio-stp-xway.c

diff --git a/kernel/drivers/gpio/gpio-stp-xway.c b/kernel/drivers/gpio/gpio-stp-xway.c
index 202361e..81bdbe7 100644 (file)
--- a/kernel/drivers/gpio/gpio-stp-xway.c
+++ b/kernel/drivers/gpio/gpio-stp-xway.c
@@ -58,7 +58,7 @@
 #define XWAY_STP_ADSL_MASK     0x3
 
 /* 2 groups of 3 bits can be driven by the phys */
-#define XWAY_STP_PHY_MASK      0x3
+#define XWAY_STP_PHY_MASK      0x7
 #define XWAY_STP_PHY1_SHIFT    27
 #define XWAY_STP_PHY2_SHIFT    15
 
@@ -200,7 +200,7 @@ static int xway_stp_hw_init(struct xway_stp *chip)
 static int xway_stp_probe(struct platform_device *pdev)
 {
        struct resource *res;
-       const __be32 *shadow, *groups, *dsl, *phy;
+       u32 shadow, groups, dsl, phy;
        struct xway_stp *chip;
        struct clk *clk;
        int ret = 0;
@@ -223,33 +223,28 @@ static int xway_stp_probe(struct platform_device *pdev)
        chip->gc.owner = THIS_MODULE;
 
        /* store the shadow value if one was passed by the devicetree */
-       shadow = of_get_property(pdev->dev.of_node, "lantiq,shadow", NULL);
-       if (shadow)
-               chip->shadow = be32_to_cpu(*shadow);
+       if (!of_property_read_u32(pdev->dev.of_node, "lantiq,shadow", &shadow))
+               chip->shadow = shadow;
 
        /* find out which gpio groups should be enabled */
-       groups = of_get_property(pdev->dev.of_node, "lantiq,groups", NULL);
-       if (groups)
-               chip->groups = be32_to_cpu(*groups) & XWAY_STP_GROUP_MASK;
+       if (!of_property_read_u32(pdev->dev.of_node, "lantiq,groups", &groups))
+               chip->groups = groups & XWAY_STP_GROUP_MASK;
        else
                chip->groups = XWAY_STP_GROUP0;
        chip->gc.ngpio = fls(chip->groups) * 8;
 
        /* find out which gpios are controlled by the dsl core */
-       dsl = of_get_property(pdev->dev.of_node, "lantiq,dsl", NULL);
-       if (dsl)
-               chip->dsl = be32_to_cpu(*dsl) & XWAY_STP_ADSL_MASK;
+       if (!of_property_read_u32(pdev->dev.of_node, "lantiq,dsl", &dsl))
+               chip->dsl = dsl & XWAY_STP_ADSL_MASK;
 
        /* find out which gpios are controlled by the phys */
        if (of_machine_is_compatible("lantiq,ar9") ||
                        of_machine_is_compatible("lantiq,gr9") ||
                        of_machine_is_compatible("lantiq,vr9")) {
-               phy = of_get_property(pdev->dev.of_node, "lantiq,phy1", NULL);
-               if (phy)
-                       chip->phy1 = be32_to_cpu(*phy) & XWAY_STP_PHY_MASK;
-               phy = of_get_property(pdev->dev.of_node, "lantiq,phy2", NULL);
-               if (phy)
-                       chip->phy2 = be32_to_cpu(*phy) & XWAY_STP_PHY_MASK;
+               if (!of_property_read_u32(pdev->dev.of_node, "lantiq,phy1", &phy))
+                       chip->phy1 = phy & XWAY_STP_PHY_MASK;
+               if (!of_property_read_u32(pdev->dev.of_node, "lantiq,phy2", &phy))
+                       chip->phy2 = phy & XWAY_STP_PHY_MASK;
        }
 
        /* check which edge trigger we should use, default to a falling edge */