diff options
| author | Tom Rini | 2024-04-01 09:08:13 -0400 |
|---|---|---|
| committer | Tom Rini | 2024-04-01 09:08:13 -0400 |
| commit | bc39e06778168a34bb4e0a34fbee4edbde4414d8 (patch) | |
| tree | 1a62e02df7db59fcffe3c57c24cf577039a4d389 /dts/upstream/src/arm/microchip | |
| parent | 27795dd717dadc73091e1b4d6c50952b93aaa819 (diff) | |
| parent | 93743d241c64bc1f7ecbf3262d1683176551e11f (diff) | |
Subtree merge tag 'v6.8-dts' of devicetree-rebasing repo [1] into dts/upstream
[1] https://git.kernel.org/pub/scm/linux/kernel/git/devicetree/devicetree-rebasing.git/
Diffstat (limited to 'dts/upstream/src/arm/microchip')
4 files changed, 6 insertions, 2 deletions
diff --git a/dts/upstream/src/arm/microchip/at91-sam9x60_curiosity.dts b/dts/upstream/src/arm/microchip/at91-sam9x60_curiosity.dts index 83372c1f291..c6fbdd29019 100644 --- a/dts/upstream/src/arm/microchip/at91-sam9x60_curiosity.dts +++ b/dts/upstream/src/arm/microchip/at91-sam9x60_curiosity.dts @@ -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 */ }; diff --git a/dts/upstream/src/arm/microchip/at91-sam9x60ek.dts b/dts/upstream/src/arm/microchip/at91-sam9x60ek.dts index 5cd593028af..f3cbb675cea 100644 --- a/dts/upstream/src/arm/microchip/at91-sam9x60ek.dts +++ b/dts/upstream/src/arm/microchip/at91-sam9x60ek.dts @@ -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 */ }; diff --git a/dts/upstream/src/arm/microchip/at91-sama5d27_som1_ek.dts b/dts/upstream/src/arm/microchip/at91-sama5d27_som1_ek.dts index d0a6dbd377d..f3ffb8f01d8 100644 --- a/dts/upstream/src/arm/microchip/at91-sama5d27_som1_ek.dts +++ b/dts/upstream/src/arm/microchip/at91-sama5d27_som1_ek.dts @@ -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"; diff --git a/dts/upstream/src/arm/microchip/at91-sama5d27_wlsom1_ek.dts b/dts/upstream/src/arm/microchip/at91-sama5d27_wlsom1_ek.dts index e055b9e2fe3..15239834d88 100644 --- a/dts/upstream/src/arm/microchip/at91-sama5d27_wlsom1_ek.dts +++ b/dts/upstream/src/arm/microchip/at91-sama5d27_wlsom1_ek.dts @@ -197,7 +197,6 @@ &sdmmc0 { bus-width = <4>; - mmc-ddr-3_3v; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_sdmmc0_default>; status = "okay"; |