diff options
| author | Caesar Wang <wxt@rock-chips.com> | 2016-01-15 21:49:54 +0800 |
|---|---|---|
| committer | Caesar Wang <wxt@rock-chips.com> | 2016-01-25 23:19:59 +0800 |
| commit | 546f69f10331420f35e8beeceba75bb4f7bf926a (patch) | |
| tree | edd0d1db6237b89b7fb915baeb4be5e59e3ecdfb | |
| parent | 2de00cd979a36beee7103e408c1a43b837296cc8 (diff) | |
| download | v4.1-546f69f10331420f35e8beeceba75bb4f7bf926a.tar.gz | |
BACKPORT: ARM: dts: rockchip: add the sdmmc for kylin board
Although We can add the sdmmc node, shouldn't enable it.
Since the sdmmc is reusing the same pin with uart2.
Unfortunately, the uart2 is used by the debug port, so that will cause
the debug information can't display on console if enabling the sdmmc.
As we have supported the sdmmc (sd card) on hardware for kylin board.
So, maybe we can have the sdmmc node in kylin dts, not to enable it.
Anyway, you only need add the okay status if someone want to enable the
sdmmc.
e.g.
if you use the adb to debug with android os.
You can add the
status = "okay" to enable the sdmmc for sd card working.
The default status is disabling it.
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Bug: 25923642
Patchset: rk3036 kylin bring up with sd card.
Conflicts:
arch/arm/boot/dts/rk3036-kylin.dts
(cherry picked from commit 082cdf76163ad445fb3c399b63eeb9d034583263)
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
Change-Id: I3bde4136dcc7c084a708e06b1b1914067699e8e9
| -rw-r--r-- | arch/arm/boot/dts/rk3036-kylin.dts | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/rk3036-kylin.dts b/arch/arm/boot/dts/rk3036-kylin.dts index 7f9d91f5df1..d9b5ca31215 100644 --- a/arch/arm/boot/dts/rk3036-kylin.dts +++ b/arch/arm/boot/dts/rk3036-kylin.dts @@ -379,6 +379,25 @@ num-slots = <1>; pinctrl-names = "default"; pinctrl-0 = <&sdio_clk &sdio_cmd &sdio_bus4 &bt_wake_h>; + sd-uhs-sdr12; + sd-uhs-sdr25; + sd-uhs-sdr50; + sd-uhs-sdr104; +}; + +&sdmmc { + bus-width = <4>; + cap-mmc-highspeed; + cap-sd-highspeed; + card-detect-delay = <200>; + disable-wp; + num-slots = <1>; + pinctrl-names = "default"; + pinctrl-0 = <&sdmmc_clk>, <&sdmmc_cmd>, <&sdmmc_cd>, <&sdmmc_bus4>; +}; + +&uart0 { + status = "okay"; }; &uart2 { @@ -429,6 +448,12 @@ }; }; + sdmmc { + sdmmc_pwr: sdmmc-pwr { + rockchip,pins = <2 28 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; + sleep { global_pwroff: global-pwroff { rockchip,pins = <2 7 RK_FUNC_1 &pcfg_pull_none>; |