Commit be76fd31 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

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: default avatarRob Herring <robh@kernel.org>
Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 1001354c
...@@ -7,6 +7,9 @@ Required properties: ...@@ -7,6 +7,9 @@ Required properties:
- reg : offset and length of the register set for the mux registers - 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,register-width : pinmux register access width in bits
- pinctrl-single,function-mask : mask of allowed pinmux function bits - pinctrl-single,function-mask : mask of allowed pinmux function bits
......
...@@ -130,6 +130,7 @@ scm: scm@210000 { ...@@ -130,6 +130,7 @@ scm: scm@210000 {
reg = <0x210000 0x2000>; reg = <0x210000 0x2000>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
#pinctrl-cells = <1>;
ranges = <0 0x210000 0x2000>; ranges = <0 0x210000 0x2000>;
am33xx_pinmux: pinmux@800 { am33xx_pinmux: pinmux@800 {
...@@ -137,6 +138,7 @@ am33xx_pinmux: pinmux@800 { ...@@ -137,6 +138,7 @@ am33xx_pinmux: pinmux@800 {
reg = <0x800 0x238>; reg = <0x800 0x238>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
#pinctrl-cells = <1>;
pinctrl-single,register-width = <32>; pinctrl-single,register-width = <32>;
pinctrl-single,function-mask = <0x7f>; pinctrl-single,function-mask = <0x7f>;
}; };
......
...@@ -66,6 +66,7 @@ omap3_pmx_core2: pinmux@480025d8 { ...@@ -66,6 +66,7 @@ omap3_pmx_core2: pinmux@480025d8 {
reg = <0x480025d8 0x24>; reg = <0x480025d8 0x24>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
#pinctrl-cells = <1>;
#interrupt-cells = <1>; #interrupt-cells = <1>;
interrupt-controller; interrupt-controller;
pinctrl-single,register-width = <16>; pinctrl-single,register-width = <16>;
......
...@@ -189,6 +189,7 @@ am43xx_pinmux: pinmux@800 { ...@@ -189,6 +189,7 @@ am43xx_pinmux: pinmux@800 {
reg = <0x800 0x31c>; reg = <0x800 0x31c>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
#pinctrl-cells = <1>;
#interrupt-cells = <1>; #interrupt-cells = <1>;
interrupt-controller; interrupt-controller;
pinctrl-single,register-width = <32>; pinctrl-single,register-width = <32>;
......
...@@ -36,6 +36,7 @@ pmx_core: pinmux@14120 { ...@@ -36,6 +36,7 @@ pmx_core: pinmux@14120 {
reg = <0x14120 0x50>; reg = <0x14120 0x50>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
#pinctrl-cells = <2>;
pinctrl-single,bit-per-mux; pinctrl-single,bit-per-mux;
pinctrl-single,register-width = <32>; pinctrl-single,register-width = <32>;
pinctrl-single,function-mask = <0xf>; pinctrl-single,function-mask = <0xf>;
......
...@@ -373,6 +373,7 @@ pincntl: pinmux@800 { ...@@ -373,6 +373,7 @@ pincntl: pinmux@800 {
reg = <0x800 0x438>; reg = <0x800 0x438>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
#pinctrl-cells = <1>;
pinctrl-single,register-width = <32>; pinctrl-single,register-width = <32>;
pinctrl-single,function-mask = <0x307ff>; pinctrl-single,function-mask = <0x307ff>;
}; };
......
...@@ -83,6 +83,7 @@ scrm: scrm@48140000 { ...@@ -83,6 +83,7 @@ scrm: scrm@48140000 {
reg = <0x48140000 0x21000>; reg = <0x48140000 0x21000>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
#pinctrl-cells = <1>;
ranges = <0 0x48140000 0x21000>; ranges = <0 0x48140000 0x21000>;
dm816x_pinmux: pinmux@800 { dm816x_pinmux: pinmux@800 {
...@@ -90,6 +91,7 @@ dm816x_pinmux: pinmux@800 { ...@@ -90,6 +91,7 @@ dm816x_pinmux: pinmux@800 {
reg = <0x800 0x50a>; reg = <0x800 0x50a>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
#pinctrl-cells = <1>;
pinctrl-single,register-width = <16>; pinctrl-single,register-width = <16>;
pinctrl-single,function-mask = <0xf>; pinctrl-single,function-mask = <0xf>;
}; };
......
...@@ -171,6 +171,7 @@ dra7_pmx_core: pinmux@1400 { ...@@ -171,6 +171,7 @@ dra7_pmx_core: pinmux@1400 {
reg = <0x1400 0x0468>; reg = <0x1400 0x0468>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
#pinctrl-cells = <1>;
#interrupt-cells = <1>; #interrupt-cells = <1>;
interrupt-controller; interrupt-controller;
pinctrl-single,register-width = <32>; pinctrl-single,register-width = <32>;
......
...@@ -537,6 +537,7 @@ pmx0: pinmux@803000 { ...@@ -537,6 +537,7 @@ pmx0: pinmux@803000 {
reg = <0x803000 0x188>; reg = <0x803000 0x188>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
#pinctrl-cells = <1>;
#gpio-range-cells = <3>; #gpio-range-cells = <3>;
ranges; ranges;
...@@ -558,6 +559,7 @@ pmx1: pinmux@803800 { ...@@ -558,6 +559,7 @@ pmx1: pinmux@803800 {
reg = <0x803800 0x2dc>; reg = <0x803800 0x2dc>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
#pinctrl-cells = <1>;
ranges; ranges;
pinctrl-single,register-width = <32>; pinctrl-single,register-width = <32>;
......
...@@ -72,6 +72,7 @@ pmu { ...@@ -72,6 +72,7 @@ pmu {
soc { soc {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
#pinctrl-cells = <1>;
compatible = "ti,keystone","simple-bus"; compatible = "ti,keystone","simple-bus";
ranges = <0x0 0x0 0x0 0xc0000000>; ranges = <0x0 0x0 0x0 0xc0000000>;
dma-ranges = <0x80000000 0x8 0x00000000 0x80000000>; dma-ranges = <0x80000000 0x8 0x00000000 0x80000000>;
......
...@@ -59,6 +59,7 @@ k2l_pmx: pinmux@02620690 { ...@@ -59,6 +59,7 @@ k2l_pmx: pinmux@02620690 {
reg = <0x02620690 0xc>; reg = <0x02620690 0xc>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
#pinctrl-cells = <2>;
pinctrl-single,bit-per-mux; pinctrl-single,bit-per-mux;
pinctrl-single,register-width = <32>; pinctrl-single,register-width = <32>;
pinctrl-single,function-mask = <0x1>; pinctrl-single,function-mask = <0x1>;
......
...@@ -38,6 +38,7 @@ scm: scm@0 { ...@@ -38,6 +38,7 @@ scm: scm@0 {
reg = <0x0 0x1000>; reg = <0x0 0x1000>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
#pinctrl-cells = <1>;
ranges = <0 0x0 0x1000>; ranges = <0 0x0 0x1000>;
omap2420_pmx: pinmux@30 { omap2420_pmx: pinmux@30 {
...@@ -46,6 +47,7 @@ omap2420_pmx: pinmux@30 { ...@@ -46,6 +47,7 @@ omap2420_pmx: pinmux@30 {
reg = <0x30 0x0113>; reg = <0x30 0x0113>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
#pinctrl-cells = <1>;
pinctrl-single,register-width = <8>; pinctrl-single,register-width = <8>;
pinctrl-single,function-mask = <0x3f>; pinctrl-single,function-mask = <0x3f>;
}; };
......
...@@ -38,6 +38,7 @@ scm: scm@2000 { ...@@ -38,6 +38,7 @@ scm: scm@2000 {
reg = <0x2000 0x1000>; reg = <0x2000 0x1000>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
#pinctrl-cells = <1>;
ranges = <0 0x2000 0x1000>; ranges = <0 0x2000 0x1000>;
omap2430_pmx: pinmux@30 { omap2430_pmx: pinmux@30 {
...@@ -46,6 +47,7 @@ omap2430_pmx: pinmux@30 { ...@@ -46,6 +47,7 @@ omap2430_pmx: pinmux@30 {
reg = <0x30 0x0154>; reg = <0x30 0x0154>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
#pinctrl-cells = <1>;
pinctrl-single,register-width = <8>; pinctrl-single,register-width = <8>;
pinctrl-single,function-mask = <0x3f>; pinctrl-single,function-mask = <0x3f>;
}; };
......
...@@ -106,6 +106,7 @@ omap3_pmx_core: pinmux@30 { ...@@ -106,6 +106,7 @@ omap3_pmx_core: pinmux@30 {
reg = <0x30 0x238>; reg = <0x30 0x238>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
#pinctrl-cells = <1>;
#interrupt-cells = <1>; #interrupt-cells = <1>;
interrupt-controller; interrupt-controller;
pinctrl-single,register-width = <16>; pinctrl-single,register-width = <16>;
...@@ -145,6 +146,7 @@ omap3_pmx_wkup: pinmux@a00 { ...@@ -145,6 +146,7 @@ omap3_pmx_wkup: pinmux@a00 {
reg = <0xa00 0x5c>; reg = <0xa00 0x5c>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
#pinctrl-cells = <1>;
#interrupt-cells = <1>; #interrupt-cells = <1>;
interrupt-controller; interrupt-controller;
pinctrl-single,register-width = <16>; pinctrl-single,register-width = <16>;
......
...@@ -34,6 +34,7 @@ omap3_pmx_core2: pinmux@480025d8 { ...@@ -34,6 +34,7 @@ omap3_pmx_core2: pinmux@480025d8 {
reg = <0x480025d8 0x24>; reg = <0x480025d8 0x24>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
#pinctrl-cells = <1>;
#interrupt-cells = <1>; #interrupt-cells = <1>;
interrupt-controller; interrupt-controller;
pinctrl-single,register-width = <16>; pinctrl-single,register-width = <16>;
......
...@@ -66,6 +66,7 @@ omap3_pmx_core2: pinmux@480025a0 { ...@@ -66,6 +66,7 @@ omap3_pmx_core2: pinmux@480025a0 {
reg = <0x480025a0 0x5c>; reg = <0x480025a0 0x5c>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
#pinctrl-cells = <1>;
#interrupt-cells = <1>; #interrupt-cells = <1>;
interrupt-controller; interrupt-controller;
pinctrl-single,register-width = <16>; pinctrl-single,register-width = <16>;
......
...@@ -184,6 +184,7 @@ omap4_pmx_core: pinmux@40 { ...@@ -184,6 +184,7 @@ omap4_pmx_core: pinmux@40 {
reg = <0x40 0x0196>; reg = <0x40 0x0196>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
#pinctrl-cells = <1>;
#interrupt-cells = <1>; #interrupt-cells = <1>;
interrupt-controller; interrupt-controller;
pinctrl-single,register-width = <16>; pinctrl-single,register-width = <16>;
...@@ -256,6 +257,7 @@ omap4_pmx_wkup: pinmux@1e040 { ...@@ -256,6 +257,7 @@ omap4_pmx_wkup: pinmux@1e040 {
reg = <0x1e040 0x0038>; reg = <0x1e040 0x0038>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
#pinctrl-cells = <1>;
#interrupt-cells = <1>; #interrupt-cells = <1>;
interrupt-controller; interrupt-controller;
pinctrl-single,register-width = <16>; pinctrl-single,register-width = <16>;
......
...@@ -171,6 +171,7 @@ omap5_pmx_core: pinmux@40 { ...@@ -171,6 +171,7 @@ omap5_pmx_core: pinmux@40 {
reg = <0x40 0x01b6>; reg = <0x40 0x01b6>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
#pinctrl-cells = <1>;
#interrupt-cells = <1>; #interrupt-cells = <1>;
interrupt-controller; interrupt-controller;
pinctrl-single,register-width = <16>; pinctrl-single,register-width = <16>;
...@@ -270,6 +271,7 @@ omap5_pmx_wkup: pinmux@c840 { ...@@ -270,6 +271,7 @@ omap5_pmx_wkup: pinmux@c840 {
reg = <0xc840 0x003c>; reg = <0xc840 0x003c>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
#pinctrl-cells = <1>;
#interrupt-cells = <1>; #interrupt-cells = <1>;
interrupt-controller; interrupt-controller;
pinctrl-single,register-width = <16>; pinctrl-single,register-width = <16>;
......
...@@ -138,6 +138,7 @@ pinctrl: pinctrl@40e10000 { ...@@ -138,6 +138,7 @@ pinctrl: pinctrl@40e10000 {
reg = <0x40e10000 0xffff>; reg = <0x40e10000 0xffff>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
#pinctrl-cells = <1>;
pinctrl-single,register-width = <32>; pinctrl-single,register-width = <32>;
pinctrl-single,function-mask = <0x7>; pinctrl-single,function-mask = <0x7>;
}; };
......
...@@ -364,6 +364,7 @@ pmx0: pinmux@f7010000 { ...@@ -364,6 +364,7 @@ pmx0: pinmux@f7010000 {
reg = <0x0 0xf7010000 0x0 0x27c>; reg = <0x0 0xf7010000 0x0 0x27c>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
#pinctrl-cells = <1>;
#gpio-range-cells = <3>; #gpio-range-cells = <3>;
pinctrl-single,register-width = <32>; pinctrl-single,register-width = <32>;
pinctrl-single,function-mask = <7>; pinctrl-single,function-mask = <7>;
...@@ -402,6 +403,7 @@ pmx1: pinmux@f7010800 { ...@@ -402,6 +403,7 @@ pmx1: pinmux@f7010800 {
reg = <0x0 0xf7010800 0x0 0x28c>; reg = <0x0 0xf7010800 0x0 0x28c>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
#pinctrl-cells = <1>;
pinctrl-single,register-width = <32>; pinctrl-single,register-width = <32>;
}; };
...@@ -410,6 +412,7 @@ pmx2: pinmux@f8001800 { ...@@ -410,6 +412,7 @@ pmx2: pinmux@f8001800 {
reg = <0x0 0xf8001800 0x0 0x78>; reg = <0x0 0xf8001800 0x0 0x78>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
#pinctrl-cells = <1>;
pinctrl-single,register-width = <32>; pinctrl-single,register-width = <32>;
}; };
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment