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

Gemini device tree updates for the v5.14 kernel:

Browse Source 
- MAINTAINERS fix for the DTS files
 - Drop a duplicate ethernet node on the RUT1xx DTS
 - Add device_type to the PCI node
 - Fix up some DTS syntax so it agrees with the schemas merged
   for the v5.14 merge window
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEElDRnuGcz/wPCXQWMQRCzN7AZXXMFAmC1/9kACgkQQRCzN7AZ
 XXMSLBAAugeri80b/5oax7hracTYZrk3+H6t7dWOjkn1nq8xTgyg2hvykM12xOQU
 RQQC0WjD3zkX2LUY1CBWPiz1m5+9RUZKQUX+TKhkWHD9qyOAa3m/TPBS0dTTVocy
 OsEX/cxlbZu3up7y0KEUBdinuMY1BuhPCzsGS1bwB+COLYpxRkeNgjJMi9ntAsch
 XvvVhv83UytoCg7Eqg3Yz78DuQCOGAL27stRxxZ4KRKs5APH5YieiMLVtlkAtAtW
 BfaGQhkcx7kyZFE3EfHsWrEBHE9XRtkQ1DEFc88ZcNu51mBNHxGDUXmJEtVxdHli
 q2FUn7Ajy+YSFsHQcHCZytR/7tj4d6xjsi19RijMKCr4HZOkqbkruPAwv+vs6FWz
 Os68LWBLf3IljAlccdfuibQ6gHBgIUSL4uPROpp2hmJjP/sB9CJQWHaAqYuoxtEB
 inUcNNQcZMvP4oJLd2pO4dnV/Emvh3twlxi0+m/oKyt25ztBjZK0LIiYii6Ncx/J
 2ItkfhfbCzatr7h5YygHOHSDwolW3HYz0VuzFeo8bZuNnevTIPeh3FH2LMv70fmK
 SNssNYVVMhpD2k/xjmutrF3X3AE+Isvom7vCfTT1y4jMPFPc3E1qmKI9S415dTkh
 sWpVNNvre9g/8AuH0qFAEDXVpcmejvISUU1nlomj5SReAmS7ga0=
 =/Twf
 -----END PGP SIGNATURE-----

Merge tag 'gemini-dts-v5.14-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik into arm/dt

Gemini device tree updates for the v5.14 kernel:
- MAINTAINERS fix for the DTS files
- Drop a duplicate ethernet node on the RUT1xx DTS
- Add device_type to the PCI node
- Fix up some DTS syntax so it agrees with the schemas merged
  for the v5.14 merge window

* tag 'gemini-dts-v5.14-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik:
  ARM: dts: gemini: remove xxx-cells from display
  ARM: dts: gemini-dlink-dir-685: Remove address from display port
  ARM: dts: gemini-dlink-dir-685: rename gpio-i2c to i2c
  ARM: dts: gemini-dlink-dns-313: rename gpio-i2c to i2c
  ARM: dts: gemini: convert obsolete SPI properties
  ARM: dts: gemini: use the right rtc compatible
  ARM: dts: gemini: add device_type on pci
  ARM: dts: gemini-rut1xx: remove duplicate ethernet node
  ARM: dts: gemini: rename mdio to the right name
  MAINTAINERS: gemini: add missing dts pattern

Link: https://lore.kernel.org/r/CACRpkdZWpLAcAStq8dEyGL_d9Bvp-WNPu-2EuJw1eTL4kyvgig@mail.gmail.com
Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2021-06-12 08:25:17 -07:00
commit b7c8bde730
10 changed files with 20 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
MAINTAINERS
View File

@ -1810,6 +1810,7 @@ F: Documentation/devicetree/bindings/arm/gemini.txt
F: Documentation/devicetree/bindings/net/cortina,gemini-ethernet.txt
F: Documentation/devicetree/bindings/pinctrl/cortina,gemini-pinctrl.txt
F: Documentation/devicetree/bindings/rtc/faraday,ftrtc010.txt
F: arch/arm/boot/dts/gemini*
F: arch/arm/mach-gemini/
F: drivers/net/ethernet/cortina/
F: drivers/pinctrl/pinctrl-gemini.c

11
arch/arm/boot/dts/gemini-dlink-dir-685.dts
View File

@ -61,9 +61,9 @@
#size-cells = <0>;
/* Collides with IDE pins, that's cool (we do not use them) */
gpio-sck = <&gpio1 5 GPIO_ACTIVE_HIGH>;
gpio-miso = <&gpio1 8 GPIO_ACTIVE_HIGH>;
gpio-mosi = <&gpio1 7 GPIO_ACTIVE_HIGH>;
sck-gpios = <&gpio1 5 GPIO_ACTIVE_HIGH>;
miso-gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>;
mosi-gpios = <&gpio1 7 GPIO_ACTIVE_HIGH>;
cs-gpios = <&gpio0 20 GPIO_ACTIVE_LOW>;
num-chipselects = <1>;
@ -169,7 +169,7 @@
* The touchpad input is connected to a GPIO bit-banged
* I2C bus.
*/
gpio-i2c {
i2c {
compatible = "i2c-gpio";
/* Collides with ICE */
sda-gpios = <&gpio0 5 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;
@ -492,8 +492,7 @@
display-controller@6a000000 {
status = "okay";
port@0 {
reg = <0>;
port {
display_out: endpoint {
remote-endpoint = <&panel_in>;
};

4
arch/arm/boot/dts/gemini-dlink-dns-313.dts
View File

@ -82,7 +82,7 @@
/* Global Mixed-Mode Technology G751 mounted on GPIO I2C */
gpio-i2c {
i2c {
compatible = "i2c-gpio";
sda-gpios = <&gpio0 15 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;
scl-gpios = <&gpio0 16 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;
@ -140,7 +140,7 @@
};
};
mdio0: ethernet-phy {
mdio0: mdio {
compatible = "virtual,mdio-gpio";
/* Uses MDC and MDIO */
gpios = <&gpio0 22 GPIO_ACTIVE_HIGH>, /* MDC */

2
arch/arm/boot/dts/gemini-nas4220b.dts
View File

@ -62,7 +62,7 @@
};
};
mdio0: ethernet-phy {
mdio0: mdio {
compatible = "virtual,mdio-gpio";
gpios = <&gpio0 22 GPIO_ACTIVE_HIGH>, /* MDC */
<&gpio0 21 GPIO_ACTIVE_HIGH>; /* MDIO */

14
arch/arm/boot/dts/gemini-rut1xx.dts
View File

@ -56,7 +56,7 @@
};
};
mdio0: ethernet-phy {
mdio0: mdio {
compatible = "virtual,mdio-gpio";
gpios = <&gpio0 22 GPIO_ACTIVE_HIGH>, /* MDC */
<&gpio0 21 GPIO_ACTIVE_HIGH>; /* MDIO */
@ -125,18 +125,6 @@
};
};
ethernet@60000000 {
status = "okay";
ethernet-port@0 {
phy-mode = "rgmii";
phy-handle = <&phy0>;
};
ethernet-port@1 {
/* Not used in this platform */
};
};
usb@68000000 {
status = "okay";
};

6
arch/arm/boot/dts/gemini-sl93512r.dts
View File

@ -87,9 +87,9 @@
#address-cells = <1>;
#size-cells = <0>;
/* Check pin collisions */
gpio-sck = <&gpio1 28 GPIO_ACTIVE_HIGH>;
gpio-miso = <&gpio1 30 GPIO_ACTIVE_HIGH>;
gpio-mosi = <&gpio1 29 GPIO_ACTIVE_HIGH>;
sck-gpios = <&gpio1 28 GPIO_ACTIVE_HIGH>;
miso-gpios = <&gpio1 30 GPIO_ACTIVE_HIGH>;
mosi-gpios = <&gpio1 29 GPIO_ACTIVE_HIGH>;
cs-gpios = <&gpio1 31 GPIO_ACTIVE_HIGH>;
num-chipselects = <1>;

6
arch/arm/boot/dts/gemini-sq201.dts
View File

@ -72,9 +72,9 @@
#address-cells = <1>;
#size-cells = <0>;
/* Check pin collisions */
gpio-sck = <&gpio1 28 GPIO_ACTIVE_HIGH>;
gpio-miso = <&gpio1 30 GPIO_ACTIVE_HIGH>;
gpio-mosi = <&gpio1 29 GPIO_ACTIVE_HIGH>;
sck-gpios = <&gpio1 28 GPIO_ACTIVE_HIGH>;
miso-gpios = <&gpio1 30 GPIO_ACTIVE_HIGH>;
mosi-gpios = <&gpio1 29 GPIO_ACTIVE_HIGH>;
cs-gpios = <&gpio1 31 GPIO_ACTIVE_HIGH>;
num-chipselects = <1>;

2
arch/arm/boot/dts/gemini-wbd111.dts
View File

@ -68,7 +68,7 @@
};
};
mdio0: ethernet-phy {
mdio0: mdio {
compatible = "virtual,mdio-gpio";
gpios = <&gpio0 22 GPIO_ACTIVE_HIGH>, /* MDC */
<&gpio0 21 GPIO_ACTIVE_HIGH>; /* MDIO */

2
arch/arm/boot/dts/gemini-wbd222.dts
View File

@ -67,7 +67,7 @@
};
};
mdio0: ethernet-phy {
mdio0: mdio {
compatible = "virtual,mdio-gpio";
gpios = <&gpio0 22 GPIO_ACTIVE_HIGH>, /* MDC */
<&gpio0 21 GPIO_ACTIVE_HIGH>; /* MDIO */

5
arch/arm/boot/dts/gemini.dtsi
View File

@ -191,7 +191,7 @@
};
rtc@45000000 {
compatible = "cortina,gemini-rtc";
compatible = "cortina,gemini-rtc", "faraday,ftrtc010";
reg = <0x45000000 0x100>;
interrupts = <17 IRQ_TYPE_LEVEL_HIGH>;
resets = <&syscon GEMINI_RESET_RTC>;
@ -286,6 +286,7 @@
clock-names = "PCLK", "PCICLK";
pinctrl-names = "default";
pinctrl-0 = <&pci_default_pins>;
device_type = "pci";
#address-cells = <3>;
#size-cells = <2>;
#interrupt-cells = <1>;
@ -409,8 +410,6 @@
clock-names = "PCLK", "TVE";
pinctrl-names = "default";
pinctrl-0 = <&tvc_default_pins>;
#address-cells = <1>;
#size-cells = <0>;
status = "disabled";
};