ARM: dts: Add #pinctrl-cells for pinctrl-single instances

Drivers using pinctrl-single,pins have #pinctrl-cells = <1>, while
pinctrl-single,bits need #pinctrl-cells = <2>.

Note that this patch can be optionally applied separately from the
driver changes as the driver supports also the legacy binding without
#pinctrl-cells.

Acked-by: Rob Herring <robh@kernel.org>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/Documentation/devicetree/bindings/pinctrl/pinctrl-single.txt b/Documentation/devicetree/bindings/pinctrl/pinctrl-single.txt
index 66dcaa9efd7401916d3ec8cc9e03c9ebaff50a22..e705acd3612ccc4c1ec487f79f3f2ed6fb46fc47 100644 (file)
--- a/Documentation/devicetree/bindings/pinctrl/pinctrl-single.txt
+++ b/Documentation/devicetree/bindings/pinctrl/pinctrl-single.txt
@@ -7,6 +7,9 @@ Required properties:
 
 - reg : offset and length of the register set for the mux registers
 
+- #pinctrl-cells : number of cells in addition to the index, set to 1
+  for pinctrl-single,pins and 2 for pinctrl-single,bits
+
 - pinctrl-single,register-width : pinmux register access width in bits
 
 - pinctrl-single,function-mask : mask of allowed pinmux function bits

diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi
index 194d884c9de13781f586ca5f8dbce474d8ffdebf..3a3fde1f84c7b92d2a689d35810281a637aa7580 100644 (file)
--- a/arch/arm/boot/dts/am33xx.dtsi
+++ b/arch/arm/boot/dts/am33xx.dtsi
@@ -130,6 +130,7 @@
                                reg = <0x210000 0x2000>;
                                #address-cells = <1>;
                                #size-cells = <1>;
+                               #pinctrl-cells = <1>;
                                ranges = <0 0x210000 0x2000>;
 
                                am33xx_pinmux: pinmux@800 {
@@ -137,6 +138,7 @@
                                        reg = <0x800 0x238>;
                                        #address-cells = <1>;
                                        #size-cells = <0>;
+                                       #pinctrl-cells = <1>;
                                        pinctrl-single,register-width = <32>;
                                        pinctrl-single,function-mask = <0x7f>;
                                };

diff --git a/arch/arm/boot/dts/am3517.dtsi b/arch/arm/boot/dts/am3517.dtsi
index 0db19d39d24c138a3b34a9ef983e840c47bfc8f6..9fe545dbfa89bb446b553506eb16bd51c4cc0f5f 100644 (file)
--- a/arch/arm/boot/dts/am3517.dtsi
+++ b/arch/arm/boot/dts/am3517.dtsi
@@ -66,6 +66,7 @@
                        reg = <0x480025d8 0x24>;
                        #address-cells = <1>;
                        #size-cells = <0>;
+                       #pinctrl-cells = <1>;
                        #interrupt-cells = <1>;
                        interrupt-controller;
                        pinctrl-single,register-width = <16>;

diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi
index a275fa956813df7a34d6505c97a52c578207e3aa..7b5ca1bbc6a92f94500b2c3b53e63b73d6df82f0 100644 (file)
--- a/arch/arm/boot/dts/am4372.dtsi
+++ b/arch/arm/boot/dts/am4372.dtsi
@@ -189,6 +189,7 @@
                                        reg = <0x800 0x31c>;
                                        #address-cells = <1>;
                                        #size-cells = <0>;
+                                       #pinctrl-cells = <1>;
                                        #interrupt-cells = <1>;
                                        interrupt-controller;
                                        pinctrl-single,register-width = <32>;

diff --git a/arch/arm/boot/dts/da850.dtsi b/arch/arm/boot/dts/da850.dtsi
index f79e1b91c68013cc2f5533a8e3894d746ced5691..a25a55387db395483f18a4818221ef73de6c6c54 100644 (file)
--- a/arch/arm/boot/dts/da850.dtsi
+++ b/arch/arm/boot/dts/da850.dtsi
@@ -36,6 +36,7 @@
                        reg = <0x14120 0x50>;
                        #address-cells = <1>;
                        #size-cells = <0>;
+                       #pinctrl-cells = <2>;
                        pinctrl-single,bit-per-mux;
                        pinctrl-single,register-width = <32>;
                        pinctrl-single,function-mask = <0xf>;

diff --git a/arch/arm/boot/dts/dm814x.dtsi b/arch/arm/boot/dts/dm814x.dtsi
index ff90a6ce6bdc248066e895cb03916e6b1d26ccc8..1facc5f12cef700acf90e0b2f2e8594096a9bf9a 100644 (file)
--- a/arch/arm/boot/dts/dm814x.dtsi
+++ b/arch/arm/boot/dts/dm814x.dtsi
@@ -373,6 +373,7 @@
                                        reg = <0x800 0x438>;
                                        #address-cells = <1>;
                                        #size-cells = <0>;
+                                       #pinctrl-cells = <1>;
                                        pinctrl-single,register-width = <32>;
                                        pinctrl-single,function-mask = <0x307ff>;
                                };

diff --git a/arch/arm/boot/dts/dm816x.dtsi b/arch/arm/boot/dts/dm816x.dtsi
index f1e0f771ff297df8cdde113f5237e03a63bee18e..61dd2f6b02bcfe47d7d6a5ddd5734de0e5687e89 100644 (file)
--- a/arch/arm/boot/dts/dm816x.dtsi
+++ b/arch/arm/boot/dts/dm816x.dtsi
@@ -83,6 +83,7 @@
                        reg = <0x48140000 0x21000>;
                        #address-cells = <1>;
                        #size-cells = <1>;
+                       #pinctrl-cells = <1>;
                        ranges = <0 0x48140000 0x21000>;
 
                        dm816x_pinmux: pinmux@800 {
@@ -90,6 +91,7 @@
                                reg = <0x800 0x50a>;
                                #address-cells = <1>;
                                #size-cells = <0>;
+                               #pinctrl-cells = <1>;
                                pinctrl-single,register-width = <16>;
                                pinctrl-single,function-mask = <0xf>;
                        };

diff --git a/arch/arm/boot/dts/dra7.dtsi b/arch/arm/boot/dts/dra7.dtsi
index d4fcd68f634966ac9e34361b8c677ee54b176783..addb7530cfbe0dcece696c2e84fbb5ea8896ceb2 100644 (file)
--- a/arch/arm/boot/dts/dra7.dtsi
+++ b/arch/arm/boot/dts/dra7.dtsi
@@ -171,6 +171,7 @@
                                        reg = <0x1400 0x0468>;
                                        #address-cells = <1>;
                                        #size-cells = <0>;
+                                       #pinctrl-cells = <1>;
                                        #interrupt-cells = <1>;
                                        interrupt-controller;
                                        pinctrl-single,register-width = <32>;

diff --git a/arch/arm/boot/dts/hi3620.dtsi b/arch/arm/boot/dts/hi3620.dtsi
index c85d07e6db6121c39870b3bb5f07f58700975901..45eea81678c0fd2a96953c85afdfa84dadfb6182 100644 (file)
--- a/arch/arm/boot/dts/hi3620.dtsi
+++ b/arch/arm/boot/dts/hi3620.dtsi
@@ -537,6 +537,7 @@
                        reg = <0x803000 0x188>;
                        #address-cells = <1>;
                        #size-cells = <1>;
+                       #pinctrl-cells = <1>;
                        #gpio-range-cells = <3>;
                        ranges;
 
@@ -558,6 +559,7 @@
                        reg = <0x803800 0x2dc>;
                        #address-cells = <1>;
                        #size-cells = <1>;
+                       #pinctrl-cells = <1>;
                        ranges;
 
                        pinctrl-single,register-width = <32>;

diff --git a/arch/arm/boot/dts/keystone-k2g.dtsi b/arch/arm/boot/dts/keystone-k2g.dtsi
index 2919c5190653dabffec16ddc6e36bd1c223c0705..63c7cf0c6b6dc36d762cc0ef3c1617f001b35a9b 100644 (file)
--- a/arch/arm/boot/dts/keystone-k2g.dtsi
+++ b/arch/arm/boot/dts/keystone-k2g.dtsi
@@ -72,6 +72,7 @@
        soc {
                #address-cells = <1>;
                #size-cells = <1>;
+               #pinctrl-cells = <1>;
                compatible = "ti,keystone","simple-bus";
                ranges = <0x0 0x0 0x0 0xc0000000>;
                dma-ranges = <0x80000000 0x8 0x00000000 0x80000000>;

diff --git a/arch/arm/boot/dts/keystone-k2l.dtsi b/arch/arm/boot/dts/keystone-k2l.dtsi
index 2ee3d0ac2816b956e9aa6ec21a80525d82bf77fa..0c5e74e79ba2d73163eea0f9eb3800a75499fa91 100644 (file)
--- a/arch/arm/boot/dts/keystone-k2l.dtsi
+++ b/arch/arm/boot/dts/keystone-k2l.dtsi
@@ -59,6 +59,7 @@
                        reg = <0x02620690 0xc>;
                        #address-cells = <1>;
                        #size-cells = <0>;
+                       #pinctrl-cells = <2>;
                        pinctrl-single,bit-per-mux;
                        pinctrl-single,register-width = <32>;
                        pinctrl-single,function-mask = <0x1>;

diff --git a/arch/arm/boot/dts/omap2420.dtsi b/arch/arm/boot/dts/omap2420.dtsi
index fb712b9aa87462bf0879dcc4331383fdb064e337..aba542d63d6d7cc9dc358236346961d5a486a3b8 100644 (file)
--- a/arch/arm/boot/dts/omap2420.dtsi
+++ b/arch/arm/boot/dts/omap2420.dtsi
@@ -38,6 +38,7 @@
                                reg = <0x0 0x1000>;
                                #address-cells = <1>;
                                #size-cells = <1>;
+                               #pinctrl-cells = <1>;
                                ranges = <0 0x0 0x1000>;
 
                                omap2420_pmx: pinmux@30 {
@@ -46,6 +47,7 @@
                                        reg = <0x30 0x0113>;
                                        #address-cells = <1>;
                                        #size-cells = <0>;
+                                       #pinctrl-cells = <1>;
                                        pinctrl-single,register-width = <8>;
                                        pinctrl-single,function-mask = <0x3f>;
                                };

diff --git a/arch/arm/boot/dts/omap2430.dtsi b/arch/arm/boot/dts/omap2430.dtsi
index 455aaea407ddeb1f34449bd917a07bd95d69e166..84635eeb99cd46ae4d7240dfffbe551cb20a6af8 100644 (file)
--- a/arch/arm/boot/dts/omap2430.dtsi
+++ b/arch/arm/boot/dts/omap2430.dtsi
@@ -38,6 +38,7 @@
                                reg = <0x2000 0x1000>;
                                #address-cells = <1>;
                                #size-cells = <1>;
+                               #pinctrl-cells = <1>;
                                ranges = <0 0x2000 0x1000>;
 
                                omap2430_pmx: pinmux@30 {
@@ -46,6 +47,7 @@
                                        reg = <0x30 0x0154>;
                                        #address-cells = <1>;
                                        #size-cells = <0>;
+                                       #pinctrl-cells = <1>;
                                        pinctrl-single,register-width = <8>;
                                        pinctrl-single,function-mask = <0x3f>;
                                };

diff --git a/arch/arm/boot/dts/omap3.dtsi b/arch/arm/boot/dts/omap3.dtsi
index 353d818ce5a6dc059488db7a842bd217b4836ff6..ecf5eb584c75058598b9c90bc3f3568bf3a7ce7e 100644 (file)
--- a/arch/arm/boot/dts/omap3.dtsi
+++ b/arch/arm/boot/dts/omap3.dtsi
@@ -106,6 +106,7 @@
                                        reg = <0x30 0x238>;
                                        #address-cells = <1>;
                                        #size-cells = <0>;
+                                       #pinctrl-cells = <1>;
                                        #interrupt-cells = <1>;
                                        interrupt-controller;
                                        pinctrl-single,register-width = <16>;
@@ -145,6 +146,7 @@
                                        reg = <0xa00 0x5c>;
                                        #address-cells = <1>;
                                        #size-cells = <0>;
+                                       #pinctrl-cells = <1>;
                                        #interrupt-cells = <1>;
                                        interrupt-controller;
                                        pinctrl-single,register-width = <16>;

diff --git a/arch/arm/boot/dts/omap34xx.dtsi b/arch/arm/boot/dts/omap34xx.dtsi
index e41c52d3b11312f3a57afc15851215d265440c36..834fdf13601feb261a3660491e3f0480f622c85b 100644 (file)
--- a/arch/arm/boot/dts/omap34xx.dtsi
+++ b/arch/arm/boot/dts/omap34xx.dtsi
@@ -34,6 +34,7 @@
                        reg = <0x480025d8 0x24>;
                        #address-cells = <1>;
                        #size-cells = <0>;
+                       #pinctrl-cells = <1>;
                        #interrupt-cells = <1>;
                        interrupt-controller;
                        pinctrl-single,register-width = <16>;

diff --git a/arch/arm/boot/dts/omap36xx.dtsi b/arch/arm/boot/dts/omap36xx.dtsi
index 718fa88407cdb4321bec1890a5893d8f9430ba8e..d1a3e56b50cebf80c64a243e499d648101a34ddf 100644 (file)
--- a/arch/arm/boot/dts/omap36xx.dtsi
+++ b/arch/arm/boot/dts/omap36xx.dtsi
@@ -66,6 +66,7 @@
                        reg = <0x480025a0 0x5c>;
                        #address-cells = <1>;
                        #size-cells = <0>;
+                       #pinctrl-cells = <1>;
                        #interrupt-cells = <1>;
                        interrupt-controller;
                        pinctrl-single,register-width = <16>;

diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi
index 0ced079b7ae3d715ff4dc1d20b6353c96f0ec224..8087456b5fbec60c9379e5937b299ce820a7cb03 100644 (file)
--- a/arch/arm/boot/dts/omap4.dtsi
+++ b/arch/arm/boot/dts/omap4.dtsi
@@ -184,6 +184,7 @@
                                        reg = <0x40 0x0196>;
                                        #address-cells = <1>;
                                        #size-cells = <0>;
+                                       #pinctrl-cells = <1>;
                                        #interrupt-cells = <1>;
                                        interrupt-controller;
                                        pinctrl-single,register-width = <16>;
@@ -256,6 +257,7 @@
                                        reg = <0x1e040 0x0038>;
                                        #address-cells = <1>;
                                        #size-cells = <0>;
+                                       #pinctrl-cells = <1>;
                                        #interrupt-cells = <1>;
                                        interrupt-controller;
                                        pinctrl-single,register-width = <16>;

diff --git a/arch/arm/boot/dts/omap5.dtsi b/arch/arm/boot/dts/omap5.dtsi
index 25262118ec3d042f01479daba0808b683d9976ff..968c67a49dbd158b3b3ca24ad2bd85b6f45687d6 100644 (file)
--- a/arch/arm/boot/dts/omap5.dtsi
+++ b/arch/arm/boot/dts/omap5.dtsi
@@ -171,6 +171,7 @@
                                        reg = <0x40 0x01b6>;
                                        #address-cells = <1>;
                                        #size-cells = <0>;
+                                       #pinctrl-cells = <1>;
                                        #interrupt-cells = <1>;
                                        interrupt-controller;
                                        pinctrl-single,register-width = <16>;
@@ -270,6 +271,7 @@
                                reg = <0xc840 0x003c>;
                                #address-cells = <1>;
                                #size-cells = <0>;
+                               #pinctrl-cells = <1>;
                                #interrupt-cells = <1>;
                                interrupt-controller;
                                pinctrl-single,register-width = <16>;

diff --git a/arch/arm/boot/dts/pxa3xx.dtsi b/arch/arm/boot/dts/pxa3xx.dtsi
index 9d6f3aacedb709e4cd086d0df0bcac4dd3e7586b..7a0cc4ea819adc4f6873f8a5c588d16a4d13ca9f 100644 (file)
--- a/arch/arm/boot/dts/pxa3xx.dtsi
+++ b/arch/arm/boot/dts/pxa3xx.dtsi
@@ -138,6 +138,7 @@
                        reg = <0x40e10000 0xffff>;
                        #address-cells = <1>;
                        #size-cells = <0>;
+                       #pinctrl-cells = <1>;
                        pinctrl-single,register-width = <32>;
                        pinctrl-single,function-mask = <0x7>;
                };

diff --git a/arch/arm64/boot/dts/hisilicon/hi6220.dtsi b/arch/arm64/boot/dts/hisilicon/hi6220.dtsi
index 17839db585d5c8ec16f88fc6b8b383741bdd6eb3..8b5d42a90e89e811d1c4d1a8a6a5faba48758068 100644 (file)
--- a/arch/arm64/boot/dts/hisilicon/hi6220.dtsi
+++ b/arch/arm64/boot/dts/hisilicon/hi6220.dtsi
@@ -364,6 +364,7 @@
                        reg = <0x0 0xf7010000  0x0 0x27c>;
                        #address-cells = <1>;
                        #size-cells = <1>;
+                       #pinctrl-cells = <1>;
                        #gpio-range-cells = <3>;
                        pinctrl-single,register-width = <32>;
                        pinctrl-single,function-mask = <7>;
@@ -402,6 +403,7 @@
                        reg = <0x0 0xf7010800 0x0 0x28c>;
                        #address-cells = <1>;
                        #size-cells = <1>;
+                       #pinctrl-cells = <1>;
                        pinctrl-single,register-width = <32>;
                };
 
@@ -410,6 +412,7 @@
                        reg = <0x0 0xf8001800 0x0 0x78>;
                        #address-cells = <1>;
                        #size-cells = <1>;
+                       #pinctrl-cells = <1>;
                        pinctrl-single,register-width = <32>;
                };