From 1aaae59938e99ada70171b32a492d30354ab1e73 Mon Sep 17 00:00:00 2001 From: James Deng Date: Thu, 30 Aug 2018 19:25:34 +0800 Subject: [PATCH] Revert "arch:arm:sun8iw12p1: update dts" This reverts commit ad0293534d1bc9b171879a4328ff9c6625a3f4f5. --- arch/arm/boot/dts/sun8iw12p1.dtsi | 126 +++++++++++++++--------------- 1 file changed, 63 insertions(+), 63 deletions(-) diff --git a/arch/arm/boot/dts/sun8iw12p1.dtsi b/arch/arm/boot/dts/sun8iw12p1.dtsi index 5fa11d8e..dd44004b 100644 --- a/arch/arm/boot/dts/sun8iw12p1.dtsi +++ b/arch/arm/boot/dts/sun8iw12p1.dtsi @@ -913,6 +913,69 @@ status = "disabled"; }; + sdc2: sdmmc@04022000 { + compatible = "allwinner,sunxi-mmc-v4p5x"; + device_type = "sdc2"; + reg = <0x0 0x04022000 0x0 0x1000>; + interrupts = ; + clocks = <&clk_hosc>, + <&clk_pll_periph0x2>, + <&clk_sdmmc2_mod>, + <&clk_sdmmc2_bus>, + <&clk_sdmmc2_rst>; + clock-names = "osc24m","pll_periph","mmc","ahb","rst"; + pinctrl-names = "default","sleep"; + pinctrl-0 = <&sdc2_pins_a>; + pinctrl-1 = <&sdc2_pins_b>; + bus-width = <8>; + /*mmc-ddr-1_8v;*/ + /*mmc-hs200-1_8v;*/ + /*mmc-hs400-1_8v;*/ + cap-sd-highspeed; + cap-mmc-highspeed; + cap-wait-while-busy; + mmc-high-capacity-erase-size; + cap-erase; + /*non-removable;*/ + /*max-frequency = <200000000>;*/ + max-frequency = <50000000>; + + /*-- speed mode --*/ + /*sm0: DS26_SDR12*/ + /*sm1: HSSDR52_SDR25*/ + /*sm2: HSDDR52_DDR50*/ + /*sm3: HS200_SDR104*/ + /*sm4: HS400*/ + /*-- frequency point --*/ + /*f0: CLK_400K*/ + /*f1: CLK_25M*/ + /*f2: CLK_50M*/ + /*f3: CLK_100M*/ + /*f4: CLK_150M*/ + /*f5: CLK_200M*/ + + sdc_tm4_sm0_freq0 = <0>; + sdc_tm4_sm0_freq1 = <0>; + sdc_tm4_sm1_freq0 = <0x00000000>; + sdc_tm4_sm1_freq1 = <0>; + sdc_tm4_sm2_freq0 = <0x00000000>; + sdc_tm4_sm2_freq1 = <0>; + sdc_tm4_sm3_freq0 = <0x05000000>; + sdc_tm4_sm3_freq1 = <0x00000005>; + sdc_tm4_sm4_freq0 = <0x00050000>; + sdc_tm4_sm4_freq1 = <0x00000004>; + + /*vmmc-supply = <®_3p3v>;*/ + /*vqmc-supply = <®_3p3v>;*/ + /*vdmc-supply = <®_3p3v>;*/ + /*vmmc = "vcc-card";*/ + /*vqmc = "";*/ + /*vdmc = "";*/ + /*sunxi-power-save-mode;*/ + /*status = "disabled";*/ + status = "okay"; + }; + sdc0: sdmmc@04020000 { compatible = "allwinner,sunxi-mmc-v4p1x"; device_type = "sdc0"; @@ -1010,69 +1073,6 @@ status = "disabled"; }; - sdc2: sdmmc@04022000 { - compatible = "allwinner,sunxi-mmc-v4p5x"; - device_type = "sdc2"; - reg = <0x0 0x04022000 0x0 0x1000>; - interrupts = ; - clocks = <&clk_hosc>, - <&clk_pll_periph0x2>, - <&clk_sdmmc2_mod>, - <&clk_sdmmc2_bus>, - <&clk_sdmmc2_rst>; - clock-names = "osc24m","pll_periph","mmc","ahb","rst"; - pinctrl-names = "default","sleep"; - pinctrl-0 = <&sdc2_pins_a>; - pinctrl-1 = <&sdc2_pins_b>; - bus-width = <8>; - /*mmc-ddr-1_8v;*/ - /*mmc-hs200-1_8v;*/ - /*mmc-hs400-1_8v;*/ - cap-sd-highspeed; - cap-mmc-highspeed; - cap-wait-while-busy; - mmc-high-capacity-erase-size; - cap-erase; - /*non-removable;*/ - /*max-frequency = <200000000>;*/ - max-frequency = <50000000>; - - /*-- speed mode --*/ - /*sm0: DS26_SDR12*/ - /*sm1: HSSDR52_SDR25*/ - /*sm2: HSDDR52_DDR50*/ - /*sm3: HS200_SDR104*/ - /*sm4: HS400*/ - /*-- frequency point --*/ - /*f0: CLK_400K*/ - /*f1: CLK_25M*/ - /*f2: CLK_50M*/ - /*f3: CLK_100M*/ - /*f4: CLK_150M*/ - /*f5: CLK_200M*/ - - sdc_tm4_sm0_freq0 = <0>; - sdc_tm4_sm0_freq1 = <0>; - sdc_tm4_sm1_freq0 = <0x00000000>; - sdc_tm4_sm1_freq1 = <0>; - sdc_tm4_sm2_freq0 = <0x00000000>; - sdc_tm4_sm2_freq1 = <0>; - sdc_tm4_sm3_freq0 = <0x05000000>; - sdc_tm4_sm3_freq1 = <0x00000005>; - sdc_tm4_sm4_freq0 = <0x00050000>; - sdc_tm4_sm4_freq1 = <0x00000004>; - - /*vmmc-supply = <®_3p3v>;*/ - /*vqmc-supply = <®_3p3v>;*/ - /*vdmc-supply = <®_3p3v>;*/ - /*vmmc = "vcc-card";*/ - /*vqmc = "";*/ - /*vdmc = "";*/ - /*sunxi-power-save-mode;*/ - /*status = "disabled";*/ - status = "okay"; - }; - disp: disp@01000000 { compatible = "allwinner,sunxi-disp"; reg = <0x0 0x01000000 0x0 0x3fffff>,/*de*/