Skip to content

Commit 3ef47a0

Browse files
arndbarndb
committed
Merge tag 'at91-dt-6.15' of https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux into soc/dt
Microchip AT91 device tree updates for v6.15 This update includes: - more controllers enabled for SAMA7D65 SoC (DMA, reset controller, shutdown controller, RTC, watchdog) - power monitor device enabled for SAMA7D65 Curiosity board - device tree cleanups * tag 'at91-dt-6.15' of https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux: ARM: dts: microchip: sama7g5: add ADC hw trigger edge type ARM: dts: microchip: sama7d65: Add watchdog for sama7d65 ARM: dts: microchip: sama7d65: Enable shutdown controller ARM: dts: microchip: sama7d65: Add SFRBU support to sama7d65 ARM: dts: microchip: sama7d65: Add RTC support for sama7d65 ARM: dts: microchip: sama7d65: Add Shutdown controller support ARM: dts: microchip: sama7d65: Add Reset Controller to sama7d65 SoC ARM: dts: microchip: fix faulty ohci/ehci node names ARM: dts: microchip: usb_a9263: fix wrong vendor ARM: dts: microchip: sama7d65: Enable DMAs ARM: dts: microchip: sama7d65: Add DMAs to sama7d65 SoC ARM: dts: microchip: sama7d65: Add chipID for sama7d65 ARM: dts: microchip: sama7d65_curiosity: Add power monitor support ARM: dts: microchip: sama7d65: Add flexcom 10 node ARM: dts: at91: usb_a9g20_lpw: use proper mmc node name ARM: dts: at91: calao_usb: fix button nodes ARM: dts: at91: use correct vendor name for Calao boards ARM: dts: at91: calao_usb: remove heartbeat for User LEDs ARM: dts: at91: calao_usb: fix wrong polarity for LED Link: https://lore.kernel.org/r/20250312173755.975074-1-claudiu.beznea@tuxon.dev Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents fc7136e + 6aafec3 commit 3ef47a0

50 files changed

Lines changed: 243 additions & 82 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎arch/arm/boot/dts/microchip/aks-cdu.dts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
};
5757
};
5858

59-
usb0: ohci@500000 {
59+
usb0: usb@500000 {
6060
num-ports = <2>;
6161
status = "okay";
6262
};

‎arch/arm/boot/dts/microchip/animeo_ip.dts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@
136136
};
137137
};
138138

139-
usb0: ohci@500000 {
139+
usb0: usb@500000 {
140140
num-ports = <2>;
141141
atmel,vbus-gpio = <&pioB 15 GPIO_ACTIVE_LOW>;
142142
status = "okay";

‎arch/arm/boot/dts/microchip/at91-foxg20.dts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@
131131
};
132132
};
133133

134-
usb0: ohci@500000 {
134+
usb0: usb@500000 {
135135
num-ports = <2>;
136136
status = "okay";
137137
};

‎arch/arm/boot/dts/microchip/at91-qil_a9260.dts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@
114114
};
115115
};
116116

117-
usb0: ohci@500000 {
117+
usb0: usb@500000 {
118118
num-ports = <2>;
119119
status = "okay";
120120
};

‎arch/arm/boot/dts/microchip/at91-sam9_l9260.dts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@
105105
status = "okay";
106106
};
107107

108-
usb0: ohci@500000 {
108+
usb0: usb@500000 {
109109
status = "okay";
110110
};
111111

‎arch/arm/boot/dts/microchip/at91-sama5d27_som1_ek.dts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
status = "okay";
3838
};
3939

40-
usb1: ohci@400000 {
40+
usb1: usb@400000 {
4141
num-ports = <3>;
4242
atmel,vbus-gpio = <0 /* &pioA PIN_PD20 GPIO_ACTIVE_HIGH */
4343
&pioA PIN_PA27 GPIO_ACTIVE_HIGH
@@ -48,7 +48,7 @@
4848
status = "okay";
4949
};
5050

51-
usb2: ehci@500000 {
51+
usb2: usb@500000 {
5252
status = "okay";
5353
};
5454

‎arch/arm/boot/dts/microchip/at91-sama5d2_ptc_ek.dts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
status = "okay";
4848
};
4949

50-
usb1: ohci@400000 {
50+
usb1: usb@400000 {
5151
num-ports = <3>;
5252
atmel,vbus-gpio = <0
5353
&pioA PIN_PB12 GPIO_ACTIVE_HIGH
@@ -58,7 +58,7 @@
5858
status = "okay";
5959
};
6060

61-
usb2: ehci@500000 {
61+
usb2: usb@500000 {
6262
status = "okay";
6363
};
6464

‎arch/arm/boot/dts/microchip/at91-sama5d2_xplained.dts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
status = "okay";
4747
};
4848

49-
usb1: ohci@400000 {
49+
usb1: usb@400000 {
5050
num-ports = <3>;
5151
atmel,vbus-gpio = <0 /* &pioA PIN_PB9 GPIO_ACTIVE_HIGH */
5252
&pioA PIN_PB10 GPIO_ACTIVE_HIGH
@@ -57,7 +57,7 @@
5757
status = "okay";
5858
};
5959

60-
usb2: ehci@500000 {
60+
usb2: usb@500000 {
6161
status = "okay";
6262
};
6363

‎arch/arm/boot/dts/microchip/at91-sama5d3_xplained.dts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@
283283
status = "okay";
284284
};
285285

286-
usb1: ohci@600000 {
286+
usb1: usb@600000 {
287287
num-ports = <3>;
288288
atmel,vbus-gpio = <0
289289
&pioE 3 GPIO_ACTIVE_LOW
@@ -294,7 +294,7 @@
294294
status = "okay";
295295
};
296296

297-
usb2: ehci@700000 {
297+
usb2: usb@700000 {
298298
status = "okay";
299299
};
300300

‎arch/arm/boot/dts/microchip/at91-sama5d4_ma5d4evk.dts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
status = "okay";
2323
};
2424

25-
usb1: ohci@500000 {
25+
usb1: usb@500000 {
2626
num-ports = <3>;
2727
atmel,vbus-gpio = <0
2828
&pioE 11 GPIO_ACTIVE_LOW
@@ -31,7 +31,7 @@
3131
status = "okay";
3232
};
3333

34-
usb2: ehci@600000 {
34+
usb2: usb@600000 {
3535
status = "okay";
3636
};
3737

0 commit comments

Comments
 (0)