diff options
| author | Tom Rini <trini@konsulko.com> | 2020-01-29 05:10:32 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-01-29 05:10:32 +0300 |
| commit | 3e12744a90241b08788ab7f20b5437381dbc9f68 (patch) | |
| tree | cd06563bd79c890e6221aaa330fd145133e57e64 /arch | |
| parent | b00c3c995bf2293e32cd2be3cb4be7eb39c4ac26 (diff) | |
| parent | 51521e43603d37e6be2ffd1ad2607361650500e9 (diff) | |
| download | u-boot-3e12744a90241b08788ab7f20b5437381dbc9f68.tar.xz | |
Merge branch 'master' of https://gitlab.denx.de/u-boot/custodians/u-boot-samsung
- Various exynos fixes
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/dts/exynos4412-odroid.dts | 3 | ||||
| -rw-r--r-- | arch/arm/dts/exynos5422-odroidxu3.dts | 2 | ||||
| -rw-r--r-- | arch/arm/mach-exynos/include/mach/cpu.h | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/dts/exynos4412-odroid.dts b/arch/arm/dts/exynos4412-odroid.dts index cc8e0dd041..ce08e8dc1e 100644 --- a/arch/arm/dts/exynos4412-odroid.dts +++ b/arch/arm/dts/exynos4412-odroid.dts @@ -17,7 +17,7 @@ serial0 = "/serial@13800000"; console = "/serial@13810000"; mmc0 = &mshc_0; - mmc1 = &sdhci2; + mmc2 = &sdhci2; }; serial@13810000 { @@ -236,6 +236,7 @@ &sdhci2 { samsung,bus-width = <4>; samsung,timing = <1 2 3>; + cd-inverted; cd-gpios = <&gpk2 2 0>; status = "okay"; }; diff --git a/arch/arm/dts/exynos5422-odroidxu3.dts b/arch/arm/dts/exynos5422-odroidxu3.dts index 6df6be9181..256df6d6c2 100644 --- a/arch/arm/dts/exynos5422-odroidxu3.dts +++ b/arch/arm/dts/exynos5422-odroidxu3.dts @@ -10,7 +10,7 @@ #include "exynos54xx.dtsi" / { - model = "Odroid XU3 based on EXYNOS5422"; + model = "Odroid XU3/XU4/HC1/HC2 based on Exynos5422"; compatible = "samsung,odroidxu3", "samsung,exynos5"; aliases { diff --git a/arch/arm/mach-exynos/include/mach/cpu.h b/arch/arm/mach-exynos/include/mach/cpu.h index 766edeeb29..fb5fdaf3ba 100644 --- a/arch/arm/mach-exynos/include/mach/cpu.h +++ b/arch/arm/mach-exynos/include/mach/cpu.h @@ -17,6 +17,7 @@ #define EXYNOS4_GPIO_PART3_BASE 0x03860000 #define EXYNOS4_PRO_ID 0x10000000 +#define EXYNOS4_OP_MODE 0x10000008 #define EXYNOS4_SYSREG_BASE 0x10010000 #define EXYNOS4_POWER_BASE 0x10020000 #define EXYNOS4_SWRESET 0x10020400 |