64 lines
2.2 KiB
Diff
64 lines
2.2 KiB
Diff
From caec69d5fc737f971439a1dae391c9b3d5ff4c31 Mon Sep 17 00:00:00 2001
|
|
From: Jonas Karlman <jonas@kwiboo.se>
|
|
Date: Wed, 10 Jan 2018 19:56:16 +0100
|
|
Subject: [PATCH] rk3328-evb: fix sdmmc vmmc-supply
|
|
|
|
---
|
|
arch/arm/dts/rk3328-evb.dts | 7 +++++--
|
|
arch/arm/dts/rk3328.dtsi | 10 ++++++----
|
|
2 files changed, 11 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/arch/arm/dts/rk3328-evb.dts b/arch/arm/dts/rk3328-evb.dts
|
|
index aafafec649..497b040f56 100644
|
|
--- a/arch/arm/dts/rk3328-evb.dts
|
|
+++ b/arch/arm/dts/rk3328-evb.dts
|
|
@@ -28,8 +28,10 @@
|
|
compatible = "regulator-fixed";
|
|
regulator-name = "vcc3v3";
|
|
gpio = <&gpio0 30 GPIO_ACTIVE_LOW>;
|
|
- regulator-always-on;
|
|
- regulator-boot-on;
|
|
+ pinctrl-names = "default";
|
|
+ pinctrl-0 = <&sdmmc0m1_gpio>;
|
|
+ regulator-min-microvolt = <3300000>;
|
|
+ regulator-max-microvolt = <3300000>;
|
|
};
|
|
|
|
vcc5v0_otg: vcc5v0-otg-drv {
|
|
@@ -75,6 +77,7 @@
|
|
num-slots = <1>;
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&sdmmc0_clk>, <&sdmmc0_cmd>, <&sdmmc0_dectn>, <&sdmmc0_bus4>;
|
|
+ vmmc-supply = <&vcc3v3_sdmmc>;
|
|
status = "okay";
|
|
};
|
|
|
|
diff --git a/arch/arm/dts/rk3328.dtsi b/arch/arm/dts/rk3328.dtsi
|
|
index 88cc185b96..e920d692ff 100644
|
|
--- a/arch/arm/dts/rk3328.dtsi
|
|
+++ b/arch/arm/dts/rk3328.dtsi
|
|
@@ -475,8 +475,9 @@
|
|
compatible = "rockchip,rk3328-dw-mshc", "rockchip,rk3288-dw-mshc";
|
|
reg = <0x0 0xff500000 0x0 0x4000>;
|
|
max-frequency = <150000000>;
|
|
- clocks = <&cru HCLK_SDMMC>, <&cru SCLK_SDMMC>;
|
|
- clock-names = "biu", "ciu";
|
|
+ clocks = <&cru HCLK_SDMMC>, <&cru SCLK_SDMMC>,
|
|
+ <&cru SCLK_SDMMC_DRV>, <&cru SCLK_SDMMC_SAMPLE>;
|
|
+ clock-names = "biu", "ciu", "ciu-drv", "ciu-sample";
|
|
fifo-depth = <0x100>;
|
|
interrupts = <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>;
|
|
status = "disabled";
|
|
@@ -498,8 +499,9 @@
|
|
compatible = "rockchip,rk3328-dw-mshc", "rockchip,rk3288-dw-mshc";
|
|
reg = <0x0 0xff520000 0x0 0x4000>;
|
|
max-frequency = <150000000>;
|
|
- clocks = <&cru HCLK_EMMC>, <&cru SCLK_EMMC>;
|
|
- clock-names = "biu", "ciu";
|
|
+ clocks = <&cru HCLK_EMMC>, <&cru SCLK_EMMC>,
|
|
+ <&cru SCLK_EMMC_DRV>, <&cru SCLK_EMMC_SAMPLE>;
|
|
+ clock-names = "biu", "ciu", "ciu-drv", "ciu-sample";
|
|
fifo-depth = <0x100>;
|
|
interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;
|
|
status = "disabled";
|