mmc: core: rk_sdmmc: prepare for next Soc(s)

	fix commit-sha1 4ae0cc94: cherry-pick wrong commit from experimental branch

diff --git a/arch/arm/boot/dts/rk3036-fpga.dts b/arch/arm/boot/dts/rk3036-fpga.dts
index ff6af44f2dec83f5f7307c2e1c93b86c573d6b5b..b78f2805988854cd1c694aac6248fa869abdad2c 100644 (file)
--- a/arch/arm/boot/dts/rk3036-fpga.dts
+++ b/arch/arm/boot/dts/rk3036-fpga.dts
@@ -18,17 +18,5 @@
                status = "okay";
        };
 
-       &sdmmc {
-               clock-frequency = <50000000>;
-               clock-freq-min-max = <400000 50000000>;
-               supports-highspeed;
-               supports-sd;
-               broken-cd;
-               card-detect-delay = <200>;
-               ignore-pm-notify;
-               keep-power-in-suspend;
-               //vmmc-supply = <&rk808_ldo5_reg>;
-               status = "okay";
-       };
 
 };

diff --git a/arch/arm/boot/dts/rk3036.dtsi b/arch/arm/boot/dts/rk3036.dtsi
index 3a6f915e142da71e2ef64b4eff8b82f3261760eb..2d5a8e2fc60645aca985b70c470fbaaed8a9c9d4 100644 (file)
--- a/arch/arm/boot/dts/rk3036.dtsi
+++ b/arch/arm/boot/dts/rk3036.dtsi
@@ -281,8 +281,8 @@
                //pinctrl-names = "default", "idle";
                //pinctrl-0 = <&sdmmc0_clk &sdmmc0_cmd &sdmmc0_dectn &sdmmc0_bus4>;
                //pinctrl-1 = <&sdmmc0_gpio>;
-               cd-gpios = <&gpio1 GPIO_C1 GPIO_ACTIVE_HIGH>;/*CD GPIO*/
-               clocks = <&clk_sdmmc>, <&clk_gates2 11>;
+               //cd-gpios = <&gpio1 GPIO_C1 GPIO_ACTIVE_HIGH>;/*CD GPIO*/
+               clocks = <&clk_sdmmc0>, <&clk_gates2 11>;
                clock-names = "clk_mmc", "hclk_mmc";
                num-slots = <1>;
                fifo-depth = <0x100>;