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

Gemini DTS changes for the v6.9 kernel:

Browse Source 
- Fix the node names of the DSA switch in DIR-685.
 - Fix the node names of the Vitesse DSA switches.
 - Fix up the Wiligear compatible strings
 - Use KEY_RESTART where applicable.
 -----BEGIN PGP SIGNATURE-----
 
 iQIyBAABCgAdFiEElDRnuGcz/wPCXQWMQRCzN7AZXXMFAmXV+ccACgkQQRCzN7AZ
 XXNVCw/3XFUYTCF9hxV68KfWa+ejm6JcSXq49QT4h7qoIxx3oP+DcqffYyJYrMOO
 CoEvRQP3PmGFix0PPGKXltiWnbS7qfG9KSL6dub7OKdMo3oX8I9ejw2KzGDDxrqR
 XmGiGIrQuVsBPD382mxXOND3RyweJ1AyUJ8FDLOQ2DlxKIoeCQaJPKru3YdLRvfV
 QlwEDxG014D1jdQ8Mv75is27ET932ggeeGs4ZrWFArFXD3768b0/5dXZkB9WPDNW
 oZDhEHzl4QL543XkAj0xUX0zRF23XO5m+QBYUP5JTkTz7yA3kZzN1GftGMsR+FE8
 jspNg8KARBYCN/mq3HFa0gFParN78Cm4mtF6LQRauiDwBFagZa2bBf3cPHCy7Cra
 +WWXPlllXgdJbYYz+qbktkZsZLk5skbojJmL2egN3y+dVCmJyniXSMbCRLZeXIT9
 0gmOjSGfqqxyWDumVPwG58nBvXhDU8fSq6Tf0esP5Y1VDAUhC9TcA6LD7rxDKFhs
 HWHNvMBT53h+pfAUxnQkqrcmPQaBoAdbDjSi4uETeXOyO3CVYJ6nU4A2pASNDqb5
 PIZ1kVXUuxsmZeM7b1RXe7ydiP8q3gs1Ros/uPBFA1bZoE+aCbwvv02pIJ2Pa9C9
 JhqLIMjAiG5Bpg8gcTiE0OOIaAMRwZ/uYVwWVgiY8CbnBtAl7w==
 =47BO
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEiK/NIGsWEZVxh/FrYKtH/8kJUicFAmXgoHYACgkQYKtH/8kJ
 UicudQ//Ssu30IGtfQUcqPNWTc/v3jBCUY+wtiedOQmk/DUtvCzVoREQ/ktT75HR
 TBDgkSQFVB38ha7EUwcej+Bcm8/SrImzDOLRxqn+nMaZcoclzbyZ5inxidCNhIf7
 Rf8xSmx3e8jltIyRP8oIPkFbaABpIsHraD9UqDr3DFXr/gUQzwYnT7vveol+xZ6p
 FSLQcbgd2jLRLEGPnfS4wstrOsPcyNAWz1doW7GTJoRRo8EFge4hdmqo/sN+grts
 0EBdqTlO9oZAmScfviR34StaWCMpAQ3Yn9knyQarEhIMTaWPS4QGpz3RstWGlL6/
 bbm7mkO4aCgN4LC8ZPNMkeMphhu98UJp5SfWFcWGI3CA77OT8/ewr0knoaZ7tXq9
 CtJw+bYxDO7TzJKO3oPx3W8M5jE3+7qupo5fA1ovXYBxTR2fXY8Qn1rcjanx3T+C
 bzV+z2q3sIn8XEby85uKGF2RHO30HZasf/e1vqeYrRF2LbEsptoE8V0p/rnEn6sb
 OvpPnMmYPNBWtceZ73iOXD5PDC83hfoLx3wguhUjy1B991UDRpt4i8ZPUeIWklRF
 6xl1RyPUKPw5k/VbS044y1Qna7rVI/urMNBXGbfrPIeKnZSKpsA3lCcCO1g1UI8b
 tvC9+j8ohQlCF9DMJXBkDnDGdXhKOe81/oitTBTXVSpbjbwySbY=
 =O15M
 -----END PGP SIGNATURE-----

Merge tag 'gemini-dts-v6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator into soc/dt

Gemini DTS changes for the v6.9 kernel:

- Fix the node names of the DSA switch in DIR-685.
- Fix the node names of the Vitesse DSA switches.
- Fix up the Wiligear compatible strings
- Use KEY_RESTART where applicable.

* tag 'gemini-dts-v6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator:
  ARM: dts: gemini: Fix switch node names on Vitesse switches
  ARM: dts: gemini: Map reset keys to KEY_RESTART
  ARM: dts: gemini: Fix wiligear compatible strings
  ARM: dts: gemini: Fix switch node names in the DIR-685

Link: https://lore.kernel.org/r/CACRpkdYQv9cyCZyjgQB4FTrxek9Hfu4EZ3syfHqHF7P6gzddvA@mail.gmail.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2024-02-29 16:19:17 +01:00
commit ca369f9628
6 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,10 +27,10 @@
gpio_keys {
compatible = "gpio-keys";
button-esc {
button-reset {
debounce-interval = <100>;
wakeup-source;
linux,code = <KEY_ESC>;
linux,code = <KEY_RESTART>;
label = "reset";
/* Collides with LPC_LAD[0], UART DCD, SSP 97RST */
gpios = <&gpio0 8 GPIO_ACTIVE_LOW>;
@ -187,7 +187,7 @@
};
/* This is a RealTek RTL8366RB switch and PHY using SMI over GPIO */
switch {
ethernet-switch {
compatible = "realtek,rtl8366rb";
/* 22 = MDIO (has input reads), 21 = MDC (clock, output only) */
mdc-gpios = <&gpio0 21 GPIO_ACTIVE_HIGH>;
@ -204,36 +204,36 @@
#interrupt-cells = <1>;
};
ports {
ethernet-ports {
#address-cells = <1>;
#size-cells = <0>;
port@0 {
ethernet-port@0 {
reg = <0>;
label = "lan0";
phy-handle = <&phy0>;
};
port@1 {
ethernet-port@1 {
reg = <1>;
label = "lan1";
phy-handle = <&phy1>;
};
port@2 {
ethernet-port@2 {
reg = <2>;
label = "lan2";
phy-handle = <&phy2>;
};
port@3 {
ethernet-port@3 {
reg = <3>;
label = "lan3";
phy-handle = <&phy3>;
};
port@4 {
ethernet-port@4 {
reg = <4>;
label = "wan";
phy-handle = <&phy4>;
};
rtl8366rb_cpu_port: port@5 {
rtl8366rb_cpu_port: ethernet-port@5 {
reg = <5>;
label = "cpu";
ethernet = <&gmac0>;
@ -252,27 +252,27 @@
#address-cells = <1>;
#size-cells = <0>;
phy0: phy@0 {
phy0: ethernet-phy@0 {
reg = <0>;
interrupt-parent = <&switch_intc>;
interrupts = <0>;
};
phy1: phy@1 {
phy1: ethernet-phy@1 {
reg = <1>;
interrupt-parent = <&switch_intc>;
interrupts = <1>;
};
phy2: phy@2 {
phy2: ethernet-phy@2 {
reg = <2>;
interrupt-parent = <&switch_intc>;
interrupts = <2>;
};
phy3: phy@3 {
phy3: ethernet-phy@3 {
reg = <3>;
interrupt-parent = <&switch_intc>;
interrupts = <3>;
};
phy4: phy@4 {
phy4: ethernet-phy@4 {
reg = <4>;
interrupt-parent = <&switch_intc>;
interrupts = <12>;

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

@ -33,10 +33,10 @@
gpio_keys {
compatible = "gpio-keys";
button-esc {
button-reset {
debounce-interval = <100>;
wakeup-source;
linux,code = <KEY_ESC>;
linux,code = <KEY_RESTART>;
label = "reset";
gpios = <&gpio1 31 GPIO_ACTIVE_LOW>;
};

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

@ -43,7 +43,7 @@
button-setup {
debounce-interval = <50>;
wakeup-source;
linux,code = <KEY_SETUP>;
linux,code = <KEY_RESTART>;
label = "factory reset";
/* Conflict with NAND flash */
gpios = <&gpio0 18 GPIO_ACTIVE_LOW>;
@ -93,7 +93,7 @@
cs-gpios = <&gpio1 31 GPIO_ACTIVE_HIGH>;
num-chipselects = <1>;
switch@0 {
ethernet-switch@0 {
compatible = "vitesse,vsc7385";
reg = <0>;
/* Specified for 2.5 MHz or below */
@ -101,27 +101,27 @@
gpio-controller;
#gpio-cells = <2>;
ports {
ethernet-ports {
#address-cells = <1>;
#size-cells = <0>;
port@0 {
ethernet-port@0 {
reg = <0>;
label = "lan1";
};
port@1 {
ethernet-port@1 {
reg = <1>;
label = "lan2";
};
port@2 {
ethernet-port@2 {
reg = <2>;
label = "lan3";
};
port@3 {
ethernet-port@3 {
reg = <3>;
label = "lan4";
};
vsc: port@6 {
vsc: ethernet-port@6 {
reg = <6>;
label = "cpu";
ethernet = <&gmac1>;

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

@ -30,7 +30,7 @@
button-setup {
debounce-interval = <100>;
wakeup-source;
linux,code = <KEY_SETUP>;
linux,code = <KEY_RESTART>;
label = "factory reset";
/* Conflict with NAND flash */
gpios = <&gpio0 18 GPIO_ACTIVE_LOW>;
@ -78,7 +78,7 @@
cs-gpios = <&gpio1 31 GPIO_ACTIVE_HIGH>;
num-chipselects = <1>;
switch@0 {
ethernet-switch@0 {
compatible = "vitesse,vsc7395";
reg = <0>;
/* Specified for 2.5 MHz or below */
@ -86,27 +86,27 @@
gpio-controller;
#gpio-cells = <2>;
ports {
ethernet-ports {
#address-cells = <1>;
#size-cells = <0>;
port@0 {
ethernet-port@0 {
reg = <0>;
label = "lan1";
};
port@1 {
ethernet-port@1 {
reg = <1>;
label = "lan2";
};
port@2 {
ethernet-port@2 {
reg = <2>;
label = "lan3";
};
port@3 {
ethernet-port@3 {
reg = <3>;
label = "lan4";
};
vsc: port@6 {
vsc: ethernet-port@6 {
reg = <6>;
label = "cpu";
ethernet = <&gmac1>;

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

@ -10,7 +10,7 @@
/ {
model = "Wiliboard WBD-111";
compatible = "wiliboard,wbd111", "cortina,gemini";
compatible = "wiligear,wiliboard-wbd111", "cortina,gemini";
#address-cells = <1>;
#size-cells = <1>;
@ -28,10 +28,10 @@
gpio_keys {
compatible = "gpio-keys";
button-setup {
button-reset {
debounce-interval = <100>;
wakeup-source;
linux,code = <KEY_SETUP>;
linux,code = <KEY_RESTART>;
label = "reset";
/* Conflict with ICE */
gpios = <&gpio0 5 GPIO_ACTIVE_LOW>;

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

@ -10,7 +10,7 @@
/ {
model = "Wiliboard WBD-222";
compatible = "wiliboard,wbd222", "cortina,gemini";
compatible = "wiligear,wiliboard-wbd222", "cortina,gemini";
#address-cells = <1>;
#size-cells = <1>;
@ -27,10 +27,10 @@
gpio_keys {
compatible = "gpio-keys";
button-setup {
button-reset {
debounce-interval = <100>;
wakeup-source;
linux,code = <KEY_SETUP>;
linux,code = <KEY_RESTART>;
label = "reset";
/* Conflict with ICE */
gpios = <&gpio0 5 GPIO_ACTIVE_LOW>;