pinctrl: uniphier: allow to have pinctrl node under syscon node

Currently, the UniPhier pinctrl driver itself is a syscon, but it
turned out much more reasonable to make it a child node of a syscon
because our syscon node consists of a bunch of system configuration
registers, not only pinctrl, but also phy, and misc registers.
It is difficult to split the node.  This commit allows to migrate to
the new DT structure.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-core.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-core.c
index b8e26d90e276082f78223a4400720f3196327927..fc8bbd292b899880fde3af605c7d5dbe2a1aac4c 100644 (file)
--- a/drivers/pinctrl/uniphier/pinctrl-uniphier-core.c
+++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-core.c
@@ -173,7 +173,7 @@ int uniphier_pinctrl_probe(struct udevice *dev,
        struct uniphier_pinctrl_priv *priv = dev_get_priv(dev);
        fdt_addr_t addr;
 
-       addr = dev_get_addr(dev);
+       addr = dev_get_addr(dev->parent);
        if (addr == FDT_ADDR_T_NONE)
                return -EINVAL;
 

diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c
index 7bc0b28256d0d22f0e2f5ec82784428a832df958..a39408126032da409e867a13b1332306baa44b14 100644 (file)
--- a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c
+++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c
@@ -95,8 +95,8 @@ static int uniphier_ld20_pinctrl_probe(struct udevice *dev)
 }
 
 static const struct udevice_id uniphier_ld20_pinctrl_match[] = {
-       { .compatible = "socionext,ph1-ld11-pinctrl" },
-       { .compatible = "socionext,ph1-ld20-pinctrl" },
+       { .compatible = "socionext,uniphier-ld11-pinctrl" },
+       { .compatible = "socionext,uniphier-ld20-pinctrl" },
        { /* sentinel */ }
 };
 

diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld4.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld4.c
index ca66dee957c6ac62fcd879ff7985ff35d9406850..79bc5404b1a4d26393d3a8ca9a438f0d7758245c 100644 (file)
--- a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld4.c
+++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld4.c
@@ -115,7 +115,7 @@ static int uniphier_ld4_pinctrl_probe(struct udevice *dev)
 }
 
 static const struct udevice_id uniphier_ld4_pinctrl_match[] = {
-       { .compatible = "socionext,ph1-ld4-pinctrl" },
+       { .compatible = "socionext,uniphier-ld4-pinctrl" },
        { /* sentinel */ }
 };
 

diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld6b.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld6b.c
index 0fd4dc421b61fc1aa8e4c706a8157a30d1d17767..861e74102b6dcdb19b6e00cfcb27ec17e0cdcaca 100644 (file)
--- a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld6b.c
+++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld6b.c
@@ -115,7 +115,7 @@ static int uniphier_ld6b_pinctrl_probe(struct udevice *dev)
 }
 
 static const struct udevice_id uniphier_ld6b_pinctrl_match[] = {
-       { .compatible = "socionext,ph1-ld6b-pinctrl" },
+       { .compatible = "socionext,uniphier-ld6b-pinctrl" },
        { /* sentinel */ }
 };
 

diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-pro4.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-pro4.c
index 9ed7c74293690cf3f0e871344b5cae6c1816f044..f5194b60b384abf90896e9542eed1656e616a66c 100644 (file)
--- a/drivers/pinctrl/uniphier/pinctrl-uniphier-pro4.c
+++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-pro4.c
@@ -112,7 +112,7 @@ static int uniphier_pro4_pinctrl_probe(struct udevice *dev)
 }
 
 static const struct udevice_id uniphier_pro4_pinctrl_match[] = {
-       { .compatible = "socionext,ph1-pro4-pinctrl" },
+       { .compatible = "socionext,uniphier-pro4-pinctrl" },
        { /* sentinel */ }
 };
 

diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c
index 6597f1cf048987f2de881342050a0bb8ebb9fb75..72b9b39884725b8ef1e9c72450ba5a55ad6c6efe 100644 (file)
--- a/drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c
+++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c
@@ -126,7 +126,7 @@ static int uniphier_pro5_pinctrl_probe(struct udevice *dev)
 }
 
 static const struct udevice_id uniphier_pro5_pinctrl_match[] = {
-       { .compatible = "socionext,ph1-pro5-pinctrl" },
+       { .compatible = "socionext,uniphier-pro5-pinctrl" },
        { /* sentinel */ }
 };
 

diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-pxs2.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-pxs2.c
index 0dbfdc750adfb7671db83557e6dc82492eeaa674..a1c4240038e15e7f855d6c48445540873e082b15 100644 (file)
--- a/drivers/pinctrl/uniphier/pinctrl-uniphier-pxs2.c
+++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-pxs2.c
@@ -120,7 +120,7 @@ static int uniphier_pxs2_pinctrl_probe(struct udevice *dev)
 }
 
 static const struct udevice_id uniphier_pxs2_pinctrl_match[] = {
-       { .compatible = "socionext,proxstream2-pinctrl" },
+       { .compatible = "socionext,uniphier-pxs2-pinctrl" },
        { /* sentinel */ }
 };
 

diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-sld8.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-sld8.c
index 5a733b3eb3ac043a683b6c896988e8b2070e0df7..6f4847aadd25f9a272fed63a9c7ca1fbd8a590b5 100644 (file)
--- a/drivers/pinctrl/uniphier/pinctrl-uniphier-sld8.c
+++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-sld8.c
@@ -123,7 +123,7 @@ static int uniphier_sld8_pinctrl_probe(struct udevice *dev)
 }
 
 static const struct udevice_id uniphier_sld8_pinctrl_match[] = {
-       { .compatible = "socionext,ph1-sld8-pinctrl" },
+       { .compatible = "socionext,uniphier-sld8-pinctrl" },
        { /* sentinel */ }
 };
 

diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier.h b/drivers/pinctrl/uniphier/pinctrl-uniphier.h
index 2b438482b12804ea6717016b4bf1652f5e738c21..200d743936939b123d2484bd7e4c5c2917e1adc5 100644 (file)
--- a/drivers/pinctrl/uniphier/pinctrl-uniphier.h
+++ b/drivers/pinctrl/uniphier/pinctrl-uniphier.h
@@ -12,9 +12,9 @@
 #include <linux/kernel.h>
 #include <linux/types.h>
 
-#define UNIPHIER_PINCTRL_PINMUX_BASE   0x0
-#define UNIPHIER_PINCTRL_LOAD_PINMUX   0x700
-#define UNIPHIER_PINCTRL_IECTRL                0xd00
+#define UNIPHIER_PINCTRL_PINMUX_BASE   0x1000
+#define UNIPHIER_PINCTRL_LOAD_PINMUX   0x1700
+#define UNIPHIER_PINCTRL_IECTRL                0x1d00
 
 #define UNIPHIER_PIN_ATTR_PACKED(iectrl)       (iectrl)