hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Tony Lindgren 2016-11-07 08:27:49 -07:00
parent 1001354ca3
commit be76fd3197
20 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Documentation/devicetree/bindings/pinctrl/pinctrl-single.txt
View File

@ -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

2
arch/arm/boot/dts/am33xx.dtsi
View File

@ -130,6 +130,7 @@
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 @@
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>;
}; };

1
arch/arm/boot/dts/am3517.dtsi
View File

@ -66,6 +66,7 @@
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>;

1
arch/arm/boot/dts/am4372.dtsi
View File

@ -189,6 +189,7 @@
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>;

1
arch/arm/boot/dts/da850.dtsi
View File

@ -36,6 +36,7 @@
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>;

1
arch/arm/boot/dts/dm814x.dtsi
View File

@ -373,6 +373,7 @@
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>;
}; };

2
arch/arm/boot/dts/dm816x.dtsi
View File

@ -83,6 +83,7 @@
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 @@
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>;
}; };

1
arch/arm/boot/dts/dra7.dtsi
View File

@ -171,6 +171,7 @@
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>;

2
arch/arm/boot/dts/hi3620.dtsi
View File

@ -537,6 +537,7 @@
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 @@
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>;

1
arch/arm/boot/dts/keystone-k2g.dtsi
View File

@ -72,6 +72,7 @@
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>;

1
arch/arm/boot/dts/keystone-k2l.dtsi
View File

@ -59,6 +59,7 @@
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>;

2
arch/arm/boot/dts/omap2420.dtsi
View File

@ -38,6 +38,7 @@
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 @@
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>;
}; };

2
arch/arm/boot/dts/omap2430.dtsi
View File

@ -38,6 +38,7 @@
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 @@
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>;
}; };

2
arch/arm/boot/dts/omap3.dtsi
View File

@ -106,6 +106,7 @@
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 @@
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>;

1
arch/arm/boot/dts/omap34xx.dtsi
View File

@ -34,6 +34,7 @@
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>;

1
arch/arm/boot/dts/omap36xx.dtsi
View File

@ -66,6 +66,7 @@
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>;

2
arch/arm/boot/dts/omap4.dtsi
View File

@ -184,6 +184,7 @@
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 @@
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>;

2
arch/arm/boot/dts/omap5.dtsi
View File

@ -171,6 +171,7 @@
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 @@
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>;

1
arch/arm/boot/dts/pxa3xx.dtsi
View File

@ -138,6 +138,7 @@
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>;
}; };

3
arch/arm64/boot/dts/hisilicon/hi6220.dtsi
View File

@ -364,6 +364,7 @@
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 @@
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 @@
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>;
}; };