pinctrl: uniphier: remove obsoleted compatibles

Since commit 3e030b0b4e46 ("pinctrl: uniphier: allow to have pinctrl
node under syscon node"), this driver has kept compatibility for the
old DT files.  Several releases have passed since then, so remove
the obsoleted compatibles and clean up the code.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-core.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-core.c
index 546f23c9040c2f27721f9db2d7a1c646cfe95785..30dec0ee7f35d89b6dbcac9503d88ad5fa876f0e 100644 (file)
--- a/drivers/pinctrl/uniphier/pinctrl-uniphier-core.c
+++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-core.c
@@ -1,5 +1,6 @@
 /*
- * Copyright (C) 2015 Masahiro Yamada <yamada.masahiro@socionext.com>
+ * Copyright (C) 2015-2017 Socionext Inc.
+ *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -26,11 +27,18 @@
 #include "../pinctrl-utils.h"
 #include "pinctrl-uniphier.h"
 
+#define UNIPHIER_PINCTRL_PINMUX_BASE   0x1000
+#define UNIPHIER_PINCTRL_LOAD_PINMUX   0x1700
+#define UNIPHIER_PINCTRL_DRVCTRL_BASE  0x1800
+#define UNIPHIER_PINCTRL_DRV2CTRL_BASE 0x1900
+#define UNIPHIER_PINCTRL_DRV3CTRL_BASE 0x1980
+#define UNIPHIER_PINCTRL_PUPDCTRL_BASE 0x1a00
+#define UNIPHIER_PINCTRL_IECTRL                0x1d00
+
 struct uniphier_pinctrl_priv {
        struct pinctrl_desc pctldesc;
        struct pinctrl_dev *pctldev;
        struct regmap *regmap;
-       unsigned int regbase;
        struct uniphier_pinctrl_socdata *socdata;
 };
 
@@ -171,7 +179,7 @@ static int uniphier_conf_pin_bias_get(struct pinctrl_dev *pctldev,
        reg = UNIPHIER_PINCTRL_PUPDCTRL_BASE + pupdctrl / 32 * 4;
        shift = pupdctrl % 32;
 
-       ret = regmap_read(priv->regmap, priv->regbase + reg, &val);
+       ret = regmap_read(priv->regmap, reg, &val);
        if (ret)
                return ret;
 
@@ -231,7 +239,7 @@ static int uniphier_conf_pin_drive_get(struct pinctrl_dev *pctldev,
        shift = drvctrl % 32;
        mask = (1U << width) - 1;
 
-       ret = regmap_read(priv->regmap, priv->regbase + reg, &val);
+       ret = regmap_read(priv->regmap, reg, &val);
        if (ret)
                return ret;
 
@@ -252,8 +260,7 @@ static int uniphier_conf_pin_input_enable_get(struct pinctrl_dev *pctldev,
                /* This pin is always input-enabled. */
                return 0;
 
-       ret = regmap_read(priv->regmap,
-                         priv->regbase + UNIPHIER_PINCTRL_IECTRL, &val);
+       ret = regmap_read(priv->regmap, UNIPHIER_PINCTRL_IECTRL, &val);
        if (ret)
                return ret;
 
@@ -366,8 +373,7 @@ static int uniphier_conf_pin_bias_set(struct pinctrl_dev *pctldev,
        reg = UNIPHIER_PINCTRL_PUPDCTRL_BASE + pupdctrl / 32 * 4;
        shift = pupdctrl % 32;
 
-       return regmap_update_bits(priv->regmap, priv->regbase + reg,
-                                 1 << shift, val << shift);
+       return regmap_update_bits(priv->regmap, reg, 1 << shift, val << shift);
 }
 
 static int uniphier_conf_pin_drive_set(struct pinctrl_dev *pctldev,
@@ -427,7 +433,7 @@ static int uniphier_conf_pin_drive_set(struct pinctrl_dev *pctldev,
        shift = drvctrl % 32;
        mask = (1U << width) - 1;
 
-       return regmap_update_bits(priv->regmap, priv->regbase + reg,
+       return regmap_update_bits(priv->regmap, reg,
                                  mask << shift, val << shift);
 }
 
@@ -451,7 +457,7 @@ static int uniphier_conf_pin_input_enable(struct pinctrl_dev *pctldev,
        if (iectrl == UNIPHIER_PIN_IECTRL_NONE)
                return enable ? 0 : -EINVAL;
 
-       reg = priv->regbase + UNIPHIER_PINCTRL_IECTRL + iectrl / 32 * 4;
+       reg = UNIPHIER_PINCTRL_IECTRL + iectrl / 32 * 4;
        mask = BIT(iectrl % 32);
 
        return regmap_update_bits(priv->regmap, reg, mask, enable ? mask : 0);
@@ -601,7 +607,7 @@ static int uniphier_pmx_set_one_mux(struct pinctrl_dev *pctldev, unsigned pin,
         * stored in the offset+4.
         */
        for (; reg < reg_end; reg += 4) {
-               ret = regmap_update_bits(priv->regmap, priv->regbase + reg,
+               ret = regmap_update_bits(priv->regmap, reg,
                                         mask << shift, muxval << shift);
                if (ret)
                        return ret;
@@ -610,8 +616,7 @@ static int uniphier_pmx_set_one_mux(struct pinctrl_dev *pctldev, unsigned pin,
 
        if (load_pinctrl) {
                ret = regmap_write(priv->regmap,
-                                  priv->regbase + UNIPHIER_PINCTRL_LOAD_PINMUX,
-                                  1);
+                                  UNIPHIER_PINCTRL_LOAD_PINMUX, 1);
                if (ret)
                        return ret;
        }
@@ -698,20 +703,9 @@ int uniphier_pinctrl_probe(struct platform_device *pdev,
        if (!priv)
                return -ENOMEM;
 
-       if (of_device_is_compatible(dev->of_node, "socionext,ph1-ld4-pinctrl") ||
-           of_device_is_compatible(dev->of_node, "socionext,ph1-pro4-pinctrl") ||
-           of_device_is_compatible(dev->of_node, "socionext,ph1-sld8-pinctrl") ||
-           of_device_is_compatible(dev->of_node, "socionext,ph1-pro5-pinctrl") ||
-           of_device_is_compatible(dev->of_node, "socionext,proxstream2-pinctrl") ||
-           of_device_is_compatible(dev->of_node, "socionext,ph1-ld6b-pinctrl")) {
-               /* old binding */
-               priv->regmap = syscon_node_to_regmap(dev->of_node);
-       } else {
-               priv->regbase = 0x1000;
-               parent = of_get_parent(dev->of_node);
-               priv->regmap = syscon_node_to_regmap(parent);
-               of_node_put(parent);
-       }
+       parent = of_get_parent(dev->of_node);
+       priv->regmap = syscon_node_to_regmap(parent);
+       of_node_put(parent);
 
        if (IS_ERR(priv->regmap)) {
                dev_err(dev, "failed to get regmap\n");

diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld4.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld4.c
index 3edfb6f9d6df997253f0c472f9d50ae1812ec13a..ce2a705c32c74234864cda74ea26885746d0ecb1 100644 (file)
--- a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld4.c
+++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld4.c
@@ -929,7 +929,6 @@ static int uniphier_ld4_pinctrl_probe(struct platform_device *pdev)
 
 static const struct of_device_id uniphier_ld4_pinctrl_match[] = {
        { .compatible = "socionext,uniphier-ld4-pinctrl" },
-       { .compatible = "socionext,ph1-ld4-pinctrl" },
        { /* sentinel */ }
 };
 MODULE_DEVICE_TABLE(of, uniphier_ld4_pinctrl_match);

diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld6b.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld6b.c
index 708e5100cf34ba892b91c528a1c35489dca741d8..73e044b97542fcbeb52d631a19d6da2e9d274468 100644 (file)
--- a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld6b.c
+++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld6b.c
@@ -1290,7 +1290,6 @@ static int uniphier_ld6b_pinctrl_probe(struct platform_device *pdev)
 
 static const struct of_device_id uniphier_ld6b_pinctrl_match[] = {
        { .compatible = "socionext,uniphier-ld6b-pinctrl" },
-       { .compatible = "socionext,ph1-ld6b-pinctrl" },
        { /* sentinel */ }
 };
 MODULE_DEVICE_TABLE(of, uniphier_ld6b_pinctrl_match);

diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-pro4.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-pro4.c
index c306e844f58461982379ce8309317c3f97b2bd07..6fe402c3a18f83a421d0e04bb33675ce21ed6f7e 100644 (file)
--- a/drivers/pinctrl/uniphier/pinctrl-uniphier-pro4.c
+++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-pro4.c
@@ -1600,7 +1600,6 @@ static int uniphier_pro4_pinctrl_probe(struct platform_device *pdev)
 
 static const struct of_device_id uniphier_pro4_pinctrl_match[] = {
        { .compatible = "socionext,uniphier-pro4-pinctrl" },
-       { .compatible = "socionext,ph1-pro4-pinctrl" },
        { /* sentinel */ }
 };
 MODULE_DEVICE_TABLE(of, uniphier_pro4_pinctrl_match);

diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c
index 55d4a12282a0da47a0912f490544e85afeb96eaf..f55457fa3d8f0c112b019f4dec9e7834c4a665af 100644 (file)
--- a/drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c
+++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c
@@ -1365,7 +1365,6 @@ static int uniphier_pro5_pinctrl_probe(struct platform_device *pdev)
 
 static const struct of_device_id uniphier_pro5_pinctrl_match[] = {
        { .compatible = "socionext,uniphier-pro5-pinctrl" },
-       { .compatible = "socionext,ph1-pro5-pinctrl" },
        { /* sentinel */ }
 };
 MODULE_DEVICE_TABLE(of, uniphier_pro5_pinctrl_match);

diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-pxs2.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-pxs2.c
index 85ca5e2d8a9c6b941c0889cb008c1b7b3a8cbe9a..93db82f91ce8d580644178f77f0af29450dedba7 100644 (file)
--- a/drivers/pinctrl/uniphier/pinctrl-uniphier-pxs2.c
+++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-pxs2.c
@@ -1277,7 +1277,6 @@ static int uniphier_pxs2_pinctrl_probe(struct platform_device *pdev)
 
 static const struct of_device_id uniphier_pxs2_pinctrl_match[] = {
        { .compatible = "socionext,uniphier-pxs2-pinctrl" },
-       { .compatible = "socionext,proxstream2-pinctrl" },
        { /* sentinel */ }
 };
 MODULE_DEVICE_TABLE(of, uniphier_pxs2_pinctrl_match);

diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-sld8.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-sld8.c
index da689d880f469af338fa66b6378dbd6d939107a4..3c673c2c39f2d8710c5f3d992e76bb3957f572f6 100644 (file)
--- a/drivers/pinctrl/uniphier/pinctrl-uniphier-sld8.c
+++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-sld8.c
@@ -856,7 +856,6 @@ static int uniphier_sld8_pinctrl_probe(struct platform_device *pdev)
 
 static const struct of_device_id uniphier_sld8_pinctrl_match[] = {
        { .compatible = "socionext,uniphier-sld8-pinctrl" },
-       { .compatible = "socionext,ph1-sld8-pinctrl" },
        { /* sentinel */ }
 };
 MODULE_DEVICE_TABLE(of, uniphier_sld8_pinctrl_match);

diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier.h b/drivers/pinctrl/uniphier/pinctrl-uniphier.h
index 923f36cb245da94a9d2cde3560d2b1a46481eabb..6f2f33bf788fccdb7c1a66c4d45d40c52c7bd3bb 100644 (file)
--- a/drivers/pinctrl/uniphier/pinctrl-uniphier.h
+++ b/drivers/pinctrl/uniphier/pinctrl-uniphier.h
@@ -1,5 +1,6 @@
 /*
- * Copyright (C) 2015 Masahiro Yamada <yamada.masahiro@socionext.com>
+ * Copyright (C) 2015-2017 Socionext Inc.
+ *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,14 +23,6 @@
 
 struct platform_device;
 
-#define UNIPHIER_PINCTRL_PINMUX_BASE   0x0
-#define UNIPHIER_PINCTRL_LOAD_PINMUX   0x700
-#define UNIPHIER_PINCTRL_DRVCTRL_BASE  0x800
-#define UNIPHIER_PINCTRL_DRV2CTRL_BASE 0x900
-#define UNIPHIER_PINCTRL_DRV3CTRL_BASE 0x980
-#define UNIPHIER_PINCTRL_PUPDCTRL_BASE 0xa00
-#define UNIPHIER_PINCTRL_IECTRL                0xd00
-
 /* input enable control register bit */
 #define UNIPHIER_PIN_IECTRL_SHIFT      0
 #define UNIPHIER_PIN_IECTRL_BITS       8