diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2020-04-28 09:40:47 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2020-04-28 09:40:47 +0200 |
| commit | 02c6dac084e2421548a29fa2a5c2387d300c67ff (patch) | |
| tree | 8a4bc1487be9419cd110073f7ac3e716a360007e /arch | |
| parent | bf6985a0e1b00426aaee9f80fb971d3e14f9304c (diff) | |
| parent | 075179763a91b6fea4a4309227d73c75d760c7bd (diff) | |
| download | barebox-02c6dac084e2421548a29fa2a5c2387d300c67ff.tar.gz barebox-02c6dac084e2421548a29fa2a5c2387d300c67ff.tar.xz | |
Merge branch 'for-next/sdhci' into next
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/dts/at91-sama5d27_giantboard.dts | 2 | ||||
| -rw-r--r-- | arch/arm/dts/at91-sama5d27_som1_ek.dts | 1 | ||||
| -rw-r--r-- | arch/arm/dts/sama5d2.dtsi | 8 |
3 files changed, 11 insertions, 0 deletions
diff --git a/arch/arm/dts/at91-sama5d27_giantboard.dts b/arch/arm/dts/at91-sama5d27_giantboard.dts index 940379e430..7e48fa18ae 100644 --- a/arch/arm/dts/at91-sama5d27_giantboard.dts +++ b/arch/arm/dts/at91-sama5d27_giantboard.dts @@ -17,6 +17,8 @@ #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/regulator/active-semi,8945a-regulator.h> +#include "sama5d2.dtsi" + / { model = "Giant Board"; compatible = "groboards,sama5d27-giantboard", "atmel,sama5d27", "atmel,sama5d2", "atmel,sama5"; diff --git a/arch/arm/dts/at91-sama5d27_som1_ek.dts b/arch/arm/dts/at91-sama5d27_som1_ek.dts index 936f07eac4..cd038dc7c1 100644 --- a/arch/arm/dts/at91-sama5d27_som1_ek.dts +++ b/arch/arm/dts/at91-sama5d27_som1_ek.dts @@ -4,6 +4,7 @@ */ #include <arm/at91-sama5d27_som1_ek.dts> +#include "sama5d2.dtsi" / { chosen { diff --git a/arch/arm/dts/sama5d2.dtsi b/arch/arm/dts/sama5d2.dtsi index e69de29bb2..51e964fc0f 100644 --- a/arch/arm/dts/sama5d2.dtsi +++ b/arch/arm/dts/sama5d2.dtsi @@ -0,0 +1,8 @@ +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) + +/ { + aliases { + mmc0 = &sdmmc0; + mmc1 = &sdmmc1; + }; +}; |