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

Merge tag 'at91-dt-6.8' of https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux into soc/dt

Browse Source 
Microchip AT91 device tree updates for v6.8

It contains:
- IRQ support for Ethernet PHYs on SAM9X60-EK and SAM9X60-Curiosity
  boards
- removal of the mmc-ddr-3_3v property from SD controllers connected to SD
  slots, for SAMA5D27-WLSOM1-EK and SAMA5D27-SOM1-EK boards, as this
  property is for eMMC devices

* tag 'at91-dt-6.8' of https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux:
  ARM: dts: microchip: sama5d27_som1_ek: Remove mmc-ddr-3_3v property from sdmmc0 node
  ARM: dts: microchip: sama5d27_wlsom1_ek: Remove mmc-ddr-3_3v property from sdmmc0 node
  ARM: dts: microchip: sam9x60ek: Add IRQ support for ethernet PHY
  ARM: dts: microchip: sam9x60_curiosity: Add IRQ support for ethernet PHY

Link: https://lore.kernel.org/r/20231214174954.3045355-1-claudiu.beznea@tuxon.dev
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann
2023-12-21 15:57:59 +00:00
parent 7b0ddbf748 abe1817526
commit 210e1a339f
4 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/arm/boot/dts/microchip/at91-sam9x60_curiosity.dts
+3
View File
@@ -249,6 +249,8 @@
ethernet-phy@0 {
reg = <0x0>;
interrupt-parent = <&pioB>;
interrupts = <8 IRQ_TYPE_LEVEL_LOW>;
};
};
@@ -353,6 +355,7 @@
AT91_PIOB 5 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB5 periph A */
AT91_PIOB 6 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB6 periph A */
AT91_PIOB 7 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB7 periph A */
AT91_PIOB 8 AT91_PERIPH_GPIO AT91_PINCTRL_NONE /* PB8 IRQ GPIO */
AT91_PIOB 9 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB9 periph A */
AT91_PIOB 10 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB10 periph A */
};
arch/arm/boot/dts/microchip/at91-sam9x60ek.dts
+3
View File
@@ -292,6 +292,8 @@
ethernet-phy@0 {
reg = <0x0>;
interrupt-parent = <&pioB>;
interrupts = <8 IRQ_TYPE_LEVEL_LOW>;
};
};
@@ -465,6 +467,7 @@
AT91_PIOB 5 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB5 periph A */
AT91_PIOB 6 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB6 periph A */
AT91_PIOB 7 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB7 periph A */
AT91_PIOB 8 AT91_PERIPH_GPIO AT91_PINCTRL_NONE /* PB8 IRQ GPIO */
AT91_PIOB 9 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB9 periph A */
AT91_PIOB 10 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB10 periph A */
};
arch/arm/boot/dts/microchip/at91-sama5d27_som1_ek.dts
-1
View File
@@ -54,7 +54,6 @@
sdmmc0: sdio-host@a0000000 {
bus-width = <8>;
mmc-ddr-3_3v;
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_sdmmc0_default>;
status = "okay";
arch/arm/boot/dts/microchip/at91-sama5d27_wlsom1_ek.dts
-1
View File
@@ -197,7 +197,6 @@
&sdmmc0 {
bus-width = <4>;
mmc-ddr-3_3v;
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_sdmmc0_default>;
status = "okay";