Skip to content

Commit 8f311c0

Browse files
arndbarndb
committed
Merge tag 'at91-dt-5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux into arm/dt
AT91 & LAN966 DT #1 for 5.19: - at91: DT compliance updates to gic and dataflash nodes - lan966: addition to many basic nodes for various peripherals - lan966: Kontron KSwitch D10: support for this new board and its network switch * tag 'at91-dt-5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux: ARM: dts: kswitch-d10: enable networking ARM: dts: lan966x: add switch node ARM: dts: lan966x: add serdes node ARM: dts: lan966x: add reset switch reset node ARM: dts: lan966x: add MIIM nodes ARM: dts: lan966x: add hwmon node ARM: dts: lan966x: add basic Kontron KSwitch D10 support ARM: dts: lan966x: add flexcom I2C nodes ARM: dts: lan966x: add flexcom SPI nodes ARM: dts: lan966x: add all flexcom usart nodes ARM: dts: lan966x: add missing uart DMA channel ARM: dts: lan966x: add sgpio node ARM: dts: lan966x: swap dma channels for crypto node ARM: dts: lan966x: rename pinctrl nodes ARM: dts: at91: sama7g5: remove interrupt-parent from gic node ARM: dts: at91: use generic node name for dataflash Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 7213d3a + 46a9556 commit 8f311c0

16 files changed

+687
-16
lines changed

‎Documentation/devicetree/bindings/mfd/atmel-flexcom.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ flexcom@f8034000 {
5454
clock-names = "spi_clk";
5555
atmel,fifo-size = <32>;
5656

57-
mtd_dataflash@0 {
57+
flash@0 {
5858
compatible = "atmel,at25f512b";
5959
reg = <0>;
6060
spi-max-frequency = <20000000>;

‎arch/arm/boot/dts/Makefile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -768,7 +768,9 @@ dtb-$(CONFIG_SOC_IMX7ULP) += \
768768
dtb-$(CONFIG_SOC_IMXRT) += \
769769
imxrt1050-evk.dtb
770770
dtb-$(CONFIG_SOC_LAN966) += \
771-
lan966x-pcb8291.dtb
771+
lan966x-pcb8291.dtb \
772+
lan966x-kontron-kswitch-d10-mmt-6g-2gs.dtb \
773+
lan966x-kontron-kswitch-d10-mmt-8g.dtb
772774
dtb-$(CONFIG_SOC_LS1021A) += \
773775
ls1021a-iot.dtb \
774776
ls1021a-moxa-uc-8410a.dtb \

‎arch/arm/boot/dts/at91rm9200ek.dts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
spi0: spi@fffe0000 {
7474
status = "okay";
7575
cs-gpios = <&pioA 3 0>, <0>, <0>, <0>;
76-
mtd_dataflash@0 {
76+
flash@0 {
7777
compatible = "atmel,at45", "atmel,dataflash";
7878
spi-max-frequency = <15000000>;
7979
reg = <0>;
@@ -94,7 +94,7 @@
9494
status = "okay";
9595
};
9696

97-
nor_flash@10000000 {
97+
flash@10000000 {
9898
compatible = "cfi-flash";
9999
reg = <0x10000000 0x800000>;
100100
linux,mtd-name = "physmap-flash.0";

‎arch/arm/boot/dts/at91sam9260ek.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292

9393
spi0: spi@fffc8000 {
9494
cs-gpios = <0>, <&pioC 11 0>, <0>, <0>;
95-
mtd_dataflash@1 {
95+
flash@1 {
9696
compatible = "atmel,at45", "atmel,dataflash";
9797
spi-max-frequency = <50000000>;
9898
reg = <1>;

‎arch/arm/boot/dts/at91sam9261ek.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@
145145
cs-gpios = <&pioA 3 0>, <0>, <&pioA 28 0>, <0>;
146146
status = "okay";
147147

148-
mtd_dataflash@0 {
148+
flash@0 {
149149
compatible = "atmel,at45", "atmel,dataflash";
150150
reg = <0>;
151151
spi-max-frequency = <15000000>;

‎arch/arm/boot/dts/at91sam9263ek.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@
9595
spi0: spi@fffa4000 {
9696
status = "okay";
9797
cs-gpios = <&pioA 5 0>, <0>, <0>, <0>;
98-
mtd_dataflash@0 {
98+
flash@0 {
9999
compatible = "atmel,at45", "atmel,dataflash";
100100
spi-max-frequency = <50000000>;
101101
reg = <0>;

‎arch/arm/boot/dts/at91sam9g20ek_common.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@
110110

111111
spi0: spi@fffc8000 {
112112
cs-gpios = <0>, <&pioC 11 0>, <0>, <0>;
113-
mtd_dataflash@1 {
113+
flash@1 {
114114
compatible = "atmel,at45", "atmel,dataflash";
115115
spi-max-frequency = <50000000>;
116116
reg = <1>;

‎arch/arm/boot/dts/at91sam9m10g45ek.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@
167167
spi0: spi@fffa4000{
168168
status = "okay";
169169
cs-gpios = <&pioB 3 0>, <0>, <0>, <0>;
170-
mtd_dataflash@0 {
170+
flash@0 {
171171
compatible = "atmel,at45", "atmel,dataflash";
172172
spi-max-frequency = <13000000>;
173173
reg = <0>;

‎arch/arm/boot/dts/at91sam9rlek.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@
180180
spi0: spi@fffcc000 {
181181
status = "okay";
182182
cs-gpios = <&pioA 28 0>, <0>, <0>, <0>;
183-
mtd_dataflash@0 {
183+
flash@0 {
184184
compatible = "atmel,at45", "atmel,dataflash";
185185
spi-max-frequency = <15000000>;
186186
reg = <0>;

‎arch/arm/boot/dts/lan966x-kontron-kswitch-d10-mmt-6g-2gs.dts

Lines changed: 94 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,94 @@
1+
// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
2+
/*
3+
* Device Tree file for the Kontron KSwitch D10 MMT 6G-2GS
4+
*/
5+
6+
/dts-v1/;
7+
#include "lan966x-kontron-kswitch-d10-mmt.dtsi"
8+
9+
/ {
10+
model = "Kontron KSwitch D10 MMT 6G-2GS";
11+
compatible = "kontron,kswitch-d10-mmt-6g-2gs", "kontron,s1921",
12+
"microchip,lan9668", "microchip,lan966";
13+
14+
aliases {
15+
i2c0 = &i2c4;
16+
i2c1 = &i2c1;
17+
};
18+
19+
sfp0: sfp0 {
20+
compatible = "sff,sfp";
21+
i2c-bus = <&i2c4>;
22+
los-gpios = <&sgpio_in 1 0 GPIO_ACTIVE_HIGH>;
23+
mod-def0-gpios = <&sgpio_in 1 1 GPIO_ACTIVE_LOW>;
24+
maximum-power-milliwatt = <2500>;
25+
tx-disable-gpios = <&sgpio_out 3 0 GPIO_ACTIVE_LOW>;
26+
tx-fault-gpios = <&sgpio_in 0 2 GPIO_ACTIVE_HIGH>;
27+
rate-select0-gpios = <&sgpio_out 2 0 GPIO_ACTIVE_HIGH>;
28+
rate-select1-gpios = <&sgpio_out 2 1 GPIO_ACTIVE_HIGH>;
29+
};
30+
31+
sfp1: sfp1 {
32+
compatible = "sff,sfp";
33+
i2c-bus = <&i2c1>;
34+
los-gpios = <&sgpio_in 1 2 GPIO_ACTIVE_HIGH>;
35+
mod-def0-gpios = <&sgpio_in 1 3 GPIO_ACTIVE_LOW>;
36+
maximum-power-milliwatt = <2500>;
37+
tx-disable-gpios = <&sgpio_out 3 1 GPIO_ACTIVE_LOW>;
38+
tx-fault-gpios = <&sgpio_in 0 3 GPIO_ACTIVE_HIGH>;
39+
rate-select0-gpios = <&sgpio_out 2 2 GPIO_ACTIVE_HIGH>;
40+
rate-select1-gpios = <&sgpio_out 2 3 GPIO_ACTIVE_HIGH>;
41+
};
42+
};
43+
44+
&flx1 {
45+
atmel,flexcom-mode = <ATMEL_FLEXCOM_MODE_TWI>;
46+
status = "okay";
47+
48+
i2c1: i2c@600 {
49+
pinctrl-0 = <&fc1_c_pins>;
50+
pinctrl-names = "default";
51+
status = "okay";
52+
};
53+
};
54+
55+
&flx4 {
56+
atmel,flexcom-mode = <ATMEL_FLEXCOM_MODE_TWI>;
57+
status = "okay";
58+
59+
i2c4: i2c@600 {
60+
pinctrl-0 = <&fc4_b_pins>;
61+
pinctrl-names = "default";
62+
status = "okay";
63+
};
64+
};
65+
66+
&gpio {
67+
fc1_c_pins: fc1-c-i2c-pins {
68+
/* SCL, SDA */
69+
pins = "GPIO_47", "GPIO_48";
70+
function = "fc1_c";
71+
};
72+
73+
fc4_b_pins: fc4-b-i2c-pins {
74+
/* SCL, SDA */
75+
pins = "GPIO_57", "GPIO_58";
76+
function = "fc4_b";
77+
};
78+
};
79+
80+
&port2 {
81+
phys = <&serdes 2 SERDES6G(0)>;
82+
sfp = <&sfp0>;
83+
managed = "in-band-status";
84+
phy-mode = "sgmii";
85+
status = "okay";
86+
};
87+
88+
&port3 {
89+
phys = <&serdes 3 SERDES6G(1)>;
90+
sfp = <&sfp1>;
91+
managed = "in-band-status";
92+
phy-mode = "sgmii";
93+
status = "okay";
94+
};

0 commit comments

Comments
 (0)