From 1fbea5f4a8aa10862d5c6876ca508d006fc3b02c Mon Sep 17 00:00:00 2001 From: femto Date: Mon, 9 Dec 2019 18:19:08 +0900 Subject: [PATCH] ODROID-C4: Enable UHS mode for uSD, added hw-reset-gpio(rev_0.4) Signed-off-by: femto Change-Id: Ib06d13685eaad974815157f4c6222f7a6aa05e45 --- .../boot/dts/amlogic/meson64_odroidc4.dts | 22 ++++++++++++++++--- arch/arm64/boot/dts/amlogic/mesonsm1.dtsi | 2 +- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/meson64_odroidc4.dts b/arch/arm64/boot/dts/amlogic/meson64_odroidc4.dts index 657a7b220422..09da10759bfc 100644 --- a/arch/arm64/boot/dts/amlogic/meson64_odroidc4.dts +++ b/arch/arm64/boot/dts/amlogic/meson64_odroidc4.dts @@ -775,14 +775,30 @@ status = "okay"; }; +&reboot { + sd_volsw_gpio = <&gpio_ao GPIOAO_6 GPIO_ACTIVE_HIGH>; + sd_power_gpio = <&gpio_ao GPIOAO_8 GPIO_ACTIVE_HIGH>; + sd_vddio_gpio = <&gpio_ao GPIOE_2 GPIO_ACTIVE_HIGH>; +}; + &sd_emmc_b { status = "okay"; + sd-uhs-sdr25; + sd-uhs-sdr50; + sd-uhs-sdr104; + max-frequency = <200000000>; sd { caps = "MMC_CAP_4_BIT_DATA", - "MMC_CAP_MMC_HIGHSPEED", - "MMC_CAP_SD_HIGHSPEED"; + "MMC_CAP_MMC_HIGHSPEED", + "MMC_CAP_SD_HIGHSPEED", + "MMC_CAP_UHS_SDR25", + "MMC_CAP_UHS_SDR50", + "MMC_CAP_UHS_SDR104"; + vol_switch = <&gpio_ao GPIOAO_6 GPIO_ACTIVE_HIGH>; + gpio_power = <&gpio_ao GPIOAO_8 GPIO_ACTIVE_HIGH>; + vol_switch_18 = <1>; f_min = <400000>; - f_max = <50000000>; + f_max = <200000000>; }; }; diff --git a/arch/arm64/boot/dts/amlogic/mesonsm1.dtsi b/arch/arm64/boot/dts/amlogic/mesonsm1.dtsi index c1bb351e75a0..11f3b2abd8f8 100644 --- a/arch/arm64/boot/dts/amlogic/mesonsm1.dtsi +++ b/arch/arm64/boot/dts/amlogic/mesonsm1.dtsi @@ -288,7 +288,7 @@ cpuinfo_cmd = <0x82000044>; }; - aml_reboot{ + reboot: aml_reboot{ compatible = "aml, reboot"; sys_reset = <0x84000009>; sys_poweroff = <0x84000008>;