diff options
| author | Tom Rini | 2018-10-03 12:09:19 -0400 |
|---|---|---|
| committer | Tom Rini | 2018-10-03 12:09:19 -0400 |
| commit | a1588ac8228881f9fe65539fa8e31f0ee3556864 (patch) | |
| tree | 43ff751a16974f31453566de2600b5a02a553801 /arch/arm | |
| parent | 94228a9188803473206544c8f33649ea72bf1ee1 (diff) | |
| parent | e4d5fa3db0b9ad6551752f90b153d64706bbddef (diff) | |
Merge tag 'rockchip-for-v2018.11' of git://git.denx.de/u-boot-rockchip
Rockchip changes for 2018.11
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/dts/rk3188-radxarock-u-boot.dtsi | 15 | ||||
| -rw-r--r-- | arch/arm/dts/rk3188-radxarock.dts | 8 |
2 files changed, 23 insertions, 0 deletions
diff --git a/arch/arm/dts/rk3188-radxarock-u-boot.dtsi b/arch/arm/dts/rk3188-radxarock-u-boot.dtsi index 013535abcd2..1bb5408592e 100644 --- a/arch/arm/dts/rk3188-radxarock-u-boot.dtsi +++ b/arch/arm/dts/rk3188-radxarock-u-boot.dtsi @@ -11,6 +11,21 @@ u-boot,dm-spl; }; +&mmc0 { + fifo-mode; + max-frequency = <16000000>; +}; + +&mmc1 { + fifo-mode; + max-frequency = <16000000>; +}; + +&emmc { + fifo-mode; + max-frequency = <16000000>; +}; + &uart2 { status = "okay"; u-boot,dm-spl; diff --git a/arch/arm/dts/rk3188-radxarock.dts b/arch/arm/dts/rk3188-radxarock.dts index ac931e14af1..61367126ba8 100644 --- a/arch/arm/dts/rk3188-radxarock.dts +++ b/arch/arm/dts/rk3188-radxarock.dts @@ -104,6 +104,8 @@ regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; gpio = <&gpio3 1 GPIO_ACTIVE_LOW>; + pinctrl-names = "default"; + pinctrl-0 = <&sdmmc_pwr>; startup-delay-us = <100000>; vin-supply = <&vcc_io>; }; @@ -334,6 +336,12 @@ }; }; + sd0 { + sdmmc_pwr: sdmmc-pwr { + rockchip,pins = <RK_GPIO3 1 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; + usb { host_vbus_drv: host-vbus-drv { rockchip,pins = <0 3 RK_FUNC_GPIO &pcfg_pull_none>; |