iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adapt gpio subnode names to match the yaml binding and removal

Browse Source 
of the actually non-matching fallback-string for usb-phys
 on rk3066/rk3188 (most-specific compatible is and must always
 be used).
 -----BEGIN PGP SIGNATURE-----
 
 iQFEBAABCAAuFiEE7v+35S2Q1vLNA3Lx86Z5yZzRHYEFAmFv1y4QHGhlaWtvQHNu
 dGVjaC5kZQAKCRDzpnnJnNEdge5FB/9goi0XtyuwiVDSV9r0Ala7Q5+iMrUj0Qtv
 9Vzh28CUodSUVJqY0VTbGfzZeb1mpw/Mf6vt0JwatKcYe3wwl88+noca1JERYMST
 2iZDeCMF1sx++8/7fM0Dn1+1mOF7yZR7yoi4ybFDG4LHdJE6wNCkB48LVK5jDu7t
 NvkPYGtYJG3Qdfaezw/cwVel/h4EwCY5Mh4Pdn6MXKKVafKZpDo0nuI0MjCKz+Gd
 7cfSpP4QtwX78gles0IhwNXhvbvxPkrOulLDBCk/AEEvOWqNXKoDc3m66yCBBzsB
 3xrlDLnpNvSutFajKEcwpQCZJVrnp3dYbzhHOcC343sMLzoJm2yb
 =MOmw
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmFwG7MACgkQmmx57+YA
 GNmmyRAAjeLWN2hNqQrYuSKoaPbubst6JrdNl7D8ULAK0r0qXHBRz1VMsw/3lG5F
 Tcf8bUxooaoQvd6FKNdBJbKG15kKE8ku/WMr6ZXVe4oWmHWgSm4L/Kwd/gFuuTfp
 uF+/I9DlZ4omVIMmks3c/ylYL3El0DPSb4QkuaRfnZ8UWmIZNjE6ie+ZEwsYD3Sp
 Hyz7x1L0g0ZP93C8nAqNdKU7TYkWC6n7n7VdgeLUra4+1LveIkFUEBvDjWiqJsU/
 cZ8gBjyDs5rbpfPk3Z8Yxv97POj89XYg2JBsVF38+A8g+s8XyBarOipgnpxJlTVn
 mXM5bG8sYrXq3qXrU22ODQ71gIOc/S6amBWRBKLRiAISqr7vh3Y/boD2TFfJ8UPN
 97+gXvibHAU9/W+ak7WdS7GGcdtKTUPWmzpKDavZ3aZS6kkuv5iWIpS7cPnRPv/5
 cqExqGyFgnHLMGsApuSyjG7tYf3JiV4alLsU+dhNNOoWcqUKhCE/krtcMH/jB13D
 5y+F+WWo3GNR2HH4Ky0t/xNzU/HX5airKhuy5C1UW8YIOLl5+NWVVJ40Gg1x43eQ
 iCKVre9bfMQqEPTNu/naTtNVZc4j2wkjTh5GmziWn+/Xb2BtDurRwWwVuWvQjWxn
 sVAd3W0+Nih53vNkCFv+82AZbm5nY7GDiCtJipqt6fO97smaIZw=
 =rYMJ
 -----END PGP SIGNATURE-----

Merge tag 'v5.16-rockchip-dts32-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into arm/dt

Adapt gpio subnode names to match the yaml binding and removal
of the actually non-matching fallback-string for usb-phys
on rk3066/rk3188 (most-specific compatible is and must always
be used).

* tag 'v5.16-rockchip-dts32-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  ARM: dts: rockchip: remove usb-phy fallback string from rk3066a/rk3188
  ARM: dts: rockchip: change gpio nodenames

Link: https://lore.kernel.org/r/3630369.N7QejLDta5@phil
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2021-10-20 15:37:54 +02:00
commit fcd9d3469b
6 changed files with 32 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm/boot/dts/rk3036.dtsi
View File

@ -575,7 +575,7 @@
#size-cells = <1>;
ranges;
gpio0: gpio0@2007c000 {
gpio0: gpio@2007c000 {
compatible = "rockchip,gpio-bank";
reg = <0x2007c000 0x100>;
interrupts = <GIC_SPI 36 IRQ_TYPE_LEVEL_HIGH>;
@ -588,7 +588,7 @@
#interrupt-cells = <2>;
};
gpio1: gpio1@20080000 {
gpio1: gpio@20080000 {
compatible = "rockchip,gpio-bank";
reg = <0x20080000 0x100>;
interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>;
@ -601,7 +601,7 @@
#interrupt-cells = <2>;
};
gpio2: gpio2@20084000 {
gpio2: gpio@20084000 {
compatible = "rockchip,gpio-bank";
reg = <0x20084000 0x100>;
interrupts = <GIC_SPI 38 IRQ_TYPE_LEVEL_HIGH>;

15
arch/arm/boot/dts/rk3066a.dtsi
View File

@ -272,7 +272,7 @@
#size-cells = <1>;
ranges;
gpio0: gpio0@20034000 {
gpio0: gpio@20034000 {
compatible = "rockchip,gpio-bank";
reg = <0x20034000 0x100>;
interrupts = <GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH>;
@ -285,7 +285,7 @@
#interrupt-cells = <2>;
};
gpio1: gpio1@2003c000 {
gpio1: gpio@2003c000 {
compatible = "rockchip,gpio-bank";
reg = <0x2003c000 0x100>;
interrupts = <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>;
@ -298,7 +298,7 @@
#interrupt-cells = <2>;
};
gpio2: gpio2@2003e000 {
gpio2: gpio@2003e000 {
compatible = "rockchip,gpio-bank";
reg = <0x2003e000 0x100>;
interrupts = <GIC_SPI 56 IRQ_TYPE_LEVEL_HIGH>;
@ -311,7 +311,7 @@
#interrupt-cells = <2>;
};
gpio3: gpio3@20080000 {
gpio3: gpio@20080000 {
compatible = "rockchip,gpio-bank";
reg = <0x20080000 0x100>;
interrupts = <GIC_SPI 57 IRQ_TYPE_LEVEL_HIGH>;
@ -324,7 +324,7 @@
#interrupt-cells = <2>;
};
gpio4: gpio4@20084000 {
gpio4: gpio@20084000 {
compatible = "rockchip,gpio-bank";
reg = <0x20084000 0x100>;
interrupts = <GIC_SPI 58 IRQ_TYPE_LEVEL_HIGH>;
@ -337,7 +337,7 @@
#interrupt-cells = <2>;
};
gpio6: gpio6@2000a000 {
gpio6: gpio@2000a000 {
compatible = "rockchip,gpio-bank";
reg = <0x2000a000 0x100>;
interrupts = <GIC_SPI 60 IRQ_TYPE_LEVEL_HIGH>;
@ -681,8 +681,7 @@
compatible = "rockchip,rk3066-grf", "syscon", "simple-mfd";
usbphy: usbphy {
compatible = "rockchip,rk3066a-usb-phy",
"rockchip,rk3288-usb-phy";
compatible = "rockchip,rk3066a-usb-phy";
#address-cells = <1>;
#size-cells = <0>;
status = "disabled";

11
arch/arm/boot/dts/rk3188.dtsi
View File

@ -223,7 +223,7 @@
#size-cells = <1>;
ranges;
gpio0: gpio0@2000a000 {
gpio0: gpio@2000a000 {
compatible = "rockchip,rk3188-gpio-bank0";
reg = <0x2000a000 0x100>;
interrupts = <GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH>;
@ -236,7 +236,7 @@
#interrupt-cells = <2>;
};
gpio1: gpio1@2003c000 {
gpio1: gpio@2003c000 {
compatible = "rockchip,gpio-bank";
reg = <0x2003c000 0x100>;
interrupts = <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>;
@ -249,7 +249,7 @@
#interrupt-cells = <2>;
};
gpio2: gpio2@2003e000 {
gpio2: gpio@2003e000 {
compatible = "rockchip,gpio-bank";
reg = <0x2003e000 0x100>;
interrupts = <GIC_SPI 56 IRQ_TYPE_LEVEL_HIGH>;
@ -262,7 +262,7 @@
#interrupt-cells = <2>;
};
gpio3: gpio3@20080000 {
gpio3: gpio@20080000 {
compatible = "rockchip,gpio-bank";
reg = <0x20080000 0x100>;
interrupts = <GIC_SPI 57 IRQ_TYPE_LEVEL_HIGH>;
@ -647,8 +647,7 @@
};
usbphy: usbphy {
compatible = "rockchip,rk3188-usb-phy",
"rockchip,rk3288-usb-phy";
compatible = "rockchip,rk3188-usb-phy";
#address-cells = <1>;
#size-cells = <0>;
status = "disabled";

8
arch/arm/boot/dts/rk322x.dtsi
View File

@ -946,7 +946,7 @@
#size-cells = <1>;
ranges;
gpio0: gpio0@11110000 {
gpio0: gpio@11110000 {
compatible = "rockchip,gpio-bank";
reg = <0x11110000 0x100>;
interrupts = <GIC_SPI 51 IRQ_TYPE_LEVEL_HIGH>;
@ -959,7 +959,7 @@
#interrupt-cells = <2>;
};
gpio1: gpio1@11120000 {
gpio1: gpio@11120000 {
compatible = "rockchip,gpio-bank";
reg = <0x11120000 0x100>;
interrupts = <GIC_SPI 52 IRQ_TYPE_LEVEL_HIGH>;
@ -972,7 +972,7 @@
#interrupt-cells = <2>;
};
gpio2: gpio2@11130000 {
gpio2: gpio@11130000 {
compatible = "rockchip,gpio-bank";
reg = <0x11130000 0x100>;
interrupts = <GIC_SPI 53 IRQ_TYPE_LEVEL_HIGH>;
@ -985,7 +985,7 @@
#interrupt-cells = <2>;
};
gpio3: gpio3@11140000 {
gpio3: gpio@11140000 {
compatible = "rockchip,gpio-bank";
reg = <0x11140000 0x100>;
interrupts = <GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH>;

18
arch/arm/boot/dts/rk3288.dtsi
View File

@ -1422,7 +1422,7 @@
#size-cells = <2>;
ranges;
gpio0: gpio0@ff750000 {
gpio0: gpio@ff750000 {
compatible = "rockchip,gpio-bank";
reg = <0x0 0xff750000 0x0 0x100>;
interrupts = <GIC_SPI 81 IRQ_TYPE_LEVEL_HIGH>;
@ -1435,7 +1435,7 @@
#interrupt-cells = <2>;
};
gpio1: gpio1@ff780000 {
gpio1: gpio@ff780000 {
compatible = "rockchip,gpio-bank";
reg = <0x0 0xff780000 0x0 0x100>;
interrupts = <GIC_SPI 82 IRQ_TYPE_LEVEL_HIGH>;
@ -1448,7 +1448,7 @@
#interrupt-cells = <2>;
};
gpio2: gpio2@ff790000 {
gpio2: gpio@ff790000 {
compatible = "rockchip,gpio-bank";
reg = <0x0 0xff790000 0x0 0x100>;
interrupts = <GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH>;
@ -1461,7 +1461,7 @@
#interrupt-cells = <2>;
};
gpio3: gpio3@ff7a0000 {
gpio3: gpio@ff7a0000 {
compatible = "rockchip,gpio-bank";
reg = <0x0 0xff7a0000 0x0 0x100>;
interrupts = <GIC_SPI 84 IRQ_TYPE_LEVEL_HIGH>;
@ -1474,7 +1474,7 @@
#interrupt-cells = <2>;
};
gpio4: gpio4@ff7b0000 {
gpio4: gpio@ff7b0000 {
compatible = "rockchip,gpio-bank";
reg = <0x0 0xff7b0000 0x0 0x100>;
interrupts = <GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>;
@ -1487,7 +1487,7 @@
#interrupt-cells = <2>;
};
gpio5: gpio5@ff7c0000 {
gpio5: gpio@ff7c0000 {
compatible = "rockchip,gpio-bank";
reg = <0x0 0xff7c0000 0x0 0x100>;
interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>;
@ -1500,7 +1500,7 @@
#interrupt-cells = <2>;
};
gpio6: gpio6@ff7d0000 {
gpio6: gpio@ff7d0000 {
compatible = "rockchip,gpio-bank";
reg = <0x0 0xff7d0000 0x0 0x100>;
interrupts = <GIC_SPI 87 IRQ_TYPE_LEVEL_HIGH>;
@ -1513,7 +1513,7 @@
#interrupt-cells = <2>;
};
gpio7: gpio7@ff7e0000 {
gpio7: gpio@ff7e0000 {
compatible = "rockchip,gpio-bank";
reg = <0x0 0xff7e0000 0x0 0x100>;
interrupts = <GIC_SPI 88 IRQ_TYPE_LEVEL_HIGH>;
@ -1526,7 +1526,7 @@
#interrupt-cells = <2>;
};
gpio8: gpio8@ff7f0000 {
gpio8: gpio@ff7f0000 {
compatible = "rockchip,gpio-bank";
reg = <0x0 0xff7f0000 0x0 0x100>;
interrupts = <GIC_SPI 89 IRQ_TYPE_LEVEL_HIGH>;

8
arch/arm/boot/dts/rv1108.dtsi
View File

@ -600,7 +600,7 @@
#size-cells = <1>;
ranges;
gpio0: gpio0@20030000 {
gpio0: gpio@20030000 {
compatible = "rockchip,gpio-bank";
reg = <0x20030000 0x100>;
interrupts = <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>;
@ -613,7 +613,7 @@
#interrupt-cells = <2>;
};
gpio1: gpio1@10310000 {
gpio1: gpio@10310000 {
compatible = "rockchip,gpio-bank";
reg = <0x10310000 0x100>;
interrupts = <GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>;
@ -626,7 +626,7 @@
#interrupt-cells = <2>;
};
gpio2: gpio2@10320000 {
gpio2: gpio@10320000 {
compatible = "rockchip,gpio-bank";
reg = <0x10320000 0x100>;
interrupts = <GIC_SPI 42 IRQ_TYPE_LEVEL_HIGH>;
@ -639,7 +639,7 @@
#interrupt-cells = <2>;
};
gpio3: gpio3@10330000 {
gpio3: gpio@10330000 {
compatible = "rockchip,gpio-bank";
reg = <0x10330000 0x100>;
interrupts = <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>;