tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

Tony Lindgren be76fd31 1001354c

+32
+3
Documentation/devicetree/bindings/pinctrl/pinctrl-single.txt
··· 7 7 8 8 - reg : offset and length of the register set for the mux registers 9 9 10 + - #pinctrl-cells : number of cells in addition to the index, set to 1 11 + for pinctrl-single,pins and 2 for pinctrl-single,bits 12 + 10 13 - pinctrl-single,register-width : pinmux register access width in bits 11 14 12 15 - pinctrl-single,function-mask : mask of allowed pinmux function bits
+2
arch/arm/boot/dts/am33xx.dtsi
··· 130 130 reg = <0x210000 0x2000>; 131 131 #address-cells = <1>; 132 132 #size-cells = <1>; 133 + #pinctrl-cells = <1>; 133 134 ranges = <0 0x210000 0x2000>; 134 135 135 136 am33xx_pinmux: pinmux@800 { ··· 138 137 reg = <0x800 0x238>; 139 138 #address-cells = <1>; 140 139 #size-cells = <0>; 140 + #pinctrl-cells = <1>; 141 141 pinctrl-single,register-width = <32>; 142 142 pinctrl-single,function-mask = <0x7f>; 143 143 };
+1
arch/arm/boot/dts/am3517.dtsi
··· 66 66 reg = <0x480025d8 0x24>; 67 67 #address-cells = <1>; 68 68 #size-cells = <0>; 69 + #pinctrl-cells = <1>; 69 70 #interrupt-cells = <1>; 70 71 interrupt-controller; 71 72 pinctrl-single,register-width = <16>;
+1
arch/arm/boot/dts/am4372.dtsi
··· 189 189 reg = <0x800 0x31c>; 190 190 #address-cells = <1>; 191 191 #size-cells = <0>; 192 + #pinctrl-cells = <1>; 192 193 #interrupt-cells = <1>; 193 194 interrupt-controller; 194 195 pinctrl-single,register-width = <32>;
+1
arch/arm/boot/dts/da850.dtsi
··· 36 36 reg = <0x14120 0x50>; 37 37 #address-cells = <1>; 38 38 #size-cells = <0>; 39 + #pinctrl-cells = <2>; 39 40 pinctrl-single,bit-per-mux; 40 41 pinctrl-single,register-width = <32>; 41 42 pinctrl-single,function-mask = <0xf>;
+1
arch/arm/boot/dts/dm814x.dtsi
··· 373 373 reg = <0x800 0x438>; 374 374 #address-cells = <1>; 375 375 #size-cells = <0>; 376 + #pinctrl-cells = <1>; 376 377 pinctrl-single,register-width = <32>; 377 378 pinctrl-single,function-mask = <0x307ff>; 378 379 };
+2
arch/arm/boot/dts/dm816x.dtsi
··· 83 83 reg = <0x48140000 0x21000>; 84 84 #address-cells = <1>; 85 85 #size-cells = <1>; 86 + #pinctrl-cells = <1>; 86 87 ranges = <0 0x48140000 0x21000>; 87 88 88 89 dm816x_pinmux: pinmux@800 { ··· 91 90 reg = <0x800 0x50a>; 92 91 #address-cells = <1>; 93 92 #size-cells = <0>; 93 + #pinctrl-cells = <1>; 94 94 pinctrl-single,register-width = <16>; 95 95 pinctrl-single,function-mask = <0xf>; 96 96 };
+1
arch/arm/boot/dts/dra7.dtsi
··· 171 171 reg = <0x1400 0x0468>; 172 172 #address-cells = <1>; 173 173 #size-cells = <0>; 174 + #pinctrl-cells = <1>; 174 175 #interrupt-cells = <1>; 175 176 interrupt-controller; 176 177 pinctrl-single,register-width = <32>;
+2
arch/arm/boot/dts/hi3620.dtsi
··· 537 537 reg = <0x803000 0x188>; 538 538 #address-cells = <1>; 539 539 #size-cells = <1>; 540 + #pinctrl-cells = <1>; 540 541 #gpio-range-cells = <3>; 541 542 ranges; 542 543 ··· 559 558 reg = <0x803800 0x2dc>; 560 559 #address-cells = <1>; 561 560 #size-cells = <1>; 561 + #pinctrl-cells = <1>; 562 562 ranges; 563 563 564 564 pinctrl-single,register-width = <32>;
+1
arch/arm/boot/dts/keystone-k2g.dtsi
··· 72 72 soc { 73 73 #address-cells = <1>; 74 74 #size-cells = <1>; 75 + #pinctrl-cells = <1>; 75 76 compatible = "ti,keystone","simple-bus"; 76 77 ranges = <0x0 0x0 0x0 0xc0000000>; 77 78 dma-ranges = <0x80000000 0x8 0x00000000 0x80000000>;
+1
arch/arm/boot/dts/keystone-k2l.dtsi
··· 59 59 reg = <0x02620690 0xc>; 60 60 #address-cells = <1>; 61 61 #size-cells = <0>; 62 + #pinctrl-cells = <2>; 62 63 pinctrl-single,bit-per-mux; 63 64 pinctrl-single,register-width = <32>; 64 65 pinctrl-single,function-mask = <0x1>;
+2
arch/arm/boot/dts/omap2420.dtsi
··· 38 38 reg = <0x0 0x1000>; 39 39 #address-cells = <1>; 40 40 #size-cells = <1>; 41 + #pinctrl-cells = <1>; 41 42 ranges = <0 0x0 0x1000>; 42 43 43 44 omap2420_pmx: pinmux@30 { ··· 47 46 reg = <0x30 0x0113>; 48 47 #address-cells = <1>; 49 48 #size-cells = <0>; 49 + #pinctrl-cells = <1>; 50 50 pinctrl-single,register-width = <8>; 51 51 pinctrl-single,function-mask = <0x3f>; 52 52 };
+2
arch/arm/boot/dts/omap2430.dtsi
··· 38 38 reg = <0x2000 0x1000>; 39 39 #address-cells = <1>; 40 40 #size-cells = <1>; 41 + #pinctrl-cells = <1>; 41 42 ranges = <0 0x2000 0x1000>; 42 43 43 44 omap2430_pmx: pinmux@30 { ··· 47 46 reg = <0x30 0x0154>; 48 47 #address-cells = <1>; 49 48 #size-cells = <0>; 49 + #pinctrl-cells = <1>; 50 50 pinctrl-single,register-width = <8>; 51 51 pinctrl-single,function-mask = <0x3f>; 52 52 };
+2
arch/arm/boot/dts/omap3.dtsi
··· 106 106 reg = <0x30 0x238>; 107 107 #address-cells = <1>; 108 108 #size-cells = <0>; 109 + #pinctrl-cells = <1>; 109 110 #interrupt-cells = <1>; 110 111 interrupt-controller; 111 112 pinctrl-single,register-width = <16>; ··· 146 145 reg = <0xa00 0x5c>; 147 146 #address-cells = <1>; 148 147 #size-cells = <0>; 148 + #pinctrl-cells = <1>; 149 149 #interrupt-cells = <1>; 150 150 interrupt-controller; 151 151 pinctrl-single,register-width = <16>;
+1
arch/arm/boot/dts/omap34xx.dtsi
··· 34 34 reg = <0x480025d8 0x24>; 35 35 #address-cells = <1>; 36 36 #size-cells = <0>; 37 + #pinctrl-cells = <1>; 37 38 #interrupt-cells = <1>; 38 39 interrupt-controller; 39 40 pinctrl-single,register-width = <16>;
+1
arch/arm/boot/dts/omap36xx.dtsi
··· 66 66 reg = <0x480025a0 0x5c>; 67 67 #address-cells = <1>; 68 68 #size-cells = <0>; 69 + #pinctrl-cells = <1>; 69 70 #interrupt-cells = <1>; 70 71 interrupt-controller; 71 72 pinctrl-single,register-width = <16>;
+2
arch/arm/boot/dts/omap4.dtsi
··· 184 184 reg = <0x40 0x0196>; 185 185 #address-cells = <1>; 186 186 #size-cells = <0>; 187 + #pinctrl-cells = <1>; 187 188 #interrupt-cells = <1>; 188 189 interrupt-controller; 189 190 pinctrl-single,register-width = <16>; ··· 257 256 reg = <0x1e040 0x0038>; 258 257 #address-cells = <1>; 259 258 #size-cells = <0>; 259 + #pinctrl-cells = <1>; 260 260 #interrupt-cells = <1>; 261 261 interrupt-controller; 262 262 pinctrl-single,register-width = <16>;
+2
arch/arm/boot/dts/omap5.dtsi
··· 171 171 reg = <0x40 0x01b6>; 172 172 #address-cells = <1>; 173 173 #size-cells = <0>; 174 + #pinctrl-cells = <1>; 174 175 #interrupt-cells = <1>; 175 176 interrupt-controller; 176 177 pinctrl-single,register-width = <16>; ··· 271 270 reg = <0xc840 0x003c>; 272 271 #address-cells = <1>; 273 272 #size-cells = <0>; 273 + #pinctrl-cells = <1>; 274 274 #interrupt-cells = <1>; 275 275 interrupt-controller; 276 276 pinctrl-single,register-width = <16>;
+1
arch/arm/boot/dts/pxa3xx.dtsi
··· 138 138 reg = <0x40e10000 0xffff>; 139 139 #address-cells = <1>; 140 140 #size-cells = <0>; 141 + #pinctrl-cells = <1>; 141 142 pinctrl-single,register-width = <32>; 142 143 pinctrl-single,function-mask = <0x7>; 143 144 };
+3
arch/arm64/boot/dts/hisilicon/hi6220.dtsi
··· 364 364 reg = <0x0 0xf7010000 0x0 0x27c>; 365 365 #address-cells = <1>; 366 366 #size-cells = <1>; 367 + #pinctrl-cells = <1>; 367 368 #gpio-range-cells = <3>; 368 369 pinctrl-single,register-width = <32>; 369 370 pinctrl-single,function-mask = <7>; ··· 403 402 reg = <0x0 0xf7010800 0x0 0x28c>; 404 403 #address-cells = <1>; 405 404 #size-cells = <1>; 405 + #pinctrl-cells = <1>; 406 406 pinctrl-single,register-width = <32>; 407 407 }; 408 408 ··· 412 410 reg = <0x0 0xf8001800 0x0 0x78>; 413 411 #address-cells = <1>; 414 412 #size-cells = <1>; 413 + #pinctrl-cells = <1>; 415 414 pinctrl-single,register-width = <32>; 416 415 }; 417 416