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

v5.11-berlin-dts64

Browse Source 
-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEE2MW6uuYZ+0zBfpF41kg+k28NbwgFAl/SzxUACgkQ1kg+k28N
 bwgVtw//SFpdJmx26PTv1OaRv0JzuL6A2Zrf/a2d6GoG+COATEsjs3ofjnC1mVNl
 P8DUIau2uwrN0o5ecNZoD7QEnEPcccvxiP2hXs1EtZSnk58T+WZOsmRsnFBa4uvs
 wOXq4KJH5oS9vfI3NVPJiTkZh1tZiIcn5GX+U4QGefgMMQTeHN2XY8b8VXXGRqrz
 3B0utyLkYt0grr/w/h+WQMyTIxcxdOO8dKiudKGAfR6TCpcuOWA7oCFZfj5XXV64
 phAqyE/MHHyzoFNUqXD/pI/O/UiR1cppCVMiFZZcD7bsz5GwElbt9Pgt9S7jVlAr
 LRHWzcswRmNrb5iN0fHfNeCv1Un6Qh1ag6WXIyANruOTeR0MOsgnsylW7jF5FFI1
 wae1JrF3Or66USTVZvpimqBUsT9cssTxe9pEVAYF7Ws6gWvP9RsYD02hbjNT/VGC
 GyKiycCWnAXx/IogkgPlvZmHwYIuHyqpf7QFW/0wEYEFxGHYYo7DtKQHgyfF8XOw
 AtBcbMzPoV92x0g13tTkZT++ZtUl8GXwF2io+CG+Ns0bGwcvrGmyDMcyLnxWudx0
 muVtCTbfeN6YG2Iqs4yiMXdkmKoGx6cjcUrAd7tXhjTXaigRocQHeO0b6ky2Hze2
 gpGT1kdHRppBimCMaRalwHd1W7I5gYRxGtwOUxm7eLEZ4PKvlWk=
 =T6hR
 -----END PGP SIGNATURE-----

Merge tag 'v5.11-berlin-dts64' of git://git.kernel.org/pub/scm/linux/kernel/git/jszhang/linux-berlin into arm/dt

v5.11-berlin-dts64

* tag 'v5.11-berlin-dts64' of git://git.kernel.org/pub/scm/linux/kernel/git/jszhang/linux-berlin:
  arm64: dts: synaptics: Use generic "ngpios" rather than "snps,nr-gpios"

Link: https://lore.kernel.org/r/20201211100235.2b0b795b@xhacker.debian
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2021-01-08 16:58:49 +01:00
commit 35d09d1ad4
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm64/boot/dts/synaptics/as370.dtsi
View File

@ -143,7 +143,7 @@
compatible = "snps,dw-apb-gpio-port";
gpio-controller;
#gpio-cells = <2>;
snps,nr-gpios = <32>;
ngpios = <32>;
reg = <0>;
interrupt-controller;
#interrupt-cells = <2>;
@ -161,7 +161,7 @@
compatible = "snps,dw-apb-gpio-port";
gpio-controller;
#gpio-cells = <2>;
snps,nr-gpios = <32>;
ngpios = <32>;
reg = <0>;
interrupt-controller;
#interrupt-cells = <2>;

12
arch/arm64/boot/dts/synaptics/berlin4ct.dtsi
View File

@ -140,7 +140,7 @@
compatible = "snps,dw-apb-gpio-port";
gpio-controller;
#gpio-cells = <2>;
snps,nr-gpios = <32>;
ngpios = <32>;
reg = <0>;
interrupt-controller;
#interrupt-cells = <2>;
@ -158,7 +158,7 @@
compatible = "snps,dw-apb-gpio-port";
gpio-controller;
#gpio-cells = <2>;
snps,nr-gpios = <32>;
ngpios = <32>;
reg = <0>;
interrupt-controller;
#interrupt-cells = <2>;
@ -176,7 +176,7 @@
compatible = "snps,dw-apb-gpio-port";
gpio-controller;
#gpio-cells = <2>;
snps,nr-gpios = <32>;
ngpios = <32>;
reg = <0>;
interrupt-controller;
#interrupt-cells = <2>;
@ -194,7 +194,7 @@
compatible = "snps,dw-apb-gpio-port";
gpio-controller;
#gpio-cells = <2>;
snps,nr-gpios = <32>;
ngpios = <32>;
reg = <0>;
interrupt-controller;
#interrupt-cells = <2>;
@ -269,7 +269,7 @@
compatible = "snps,dw-apb-gpio-port";
gpio-controller;
#gpio-cells = <2>;
snps,nr-gpios = <32>;
ngpios = <32>;
reg = <0>;
};
};
@ -284,7 +284,7 @@
compatible = "snps,dw-apb-gpio-port";
gpio-controller;
#gpio-cells = <2>;
snps,nr-gpios = <32>;
ngpios = <32>;
reg = <0>;
};
};