1) Now that we're no longer overriding the caps set by mmc_of_parse we need to set cd-inverted for our card detection to work.
2) Now that we no longer claim UHS modes support we will never use any DDR modes, so drive-strength 2 is enough for the mmc data pins. 3) mmc1 on the A13 is not routed to any pins, and thus unusable, remove it from the dtsi Signed-off-by: Hans de Goede <[email protected]> --- arch/arm/boot/dts/sun5i-a10s.dtsi | 7 +++++-- arch/arm/boot/dts/sun5i-a13.dtsi | 14 +++----------- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/arch/arm/boot/dts/sun5i-a10s.dtsi b/arch/arm/boot/dts/sun5i-a10s.dtsi index 2fde295..4cecf5a 100644 --- a/arch/arm/boot/dts/sun5i-a10s.dtsi +++ b/arch/arm/boot/dts/sun5i-a10s.dtsi @@ -315,6 +315,7 @@ clock-names = "ahb", "mod"; interrupts = <32>; bus-width = <4>; + cd-inverted; status = "disabled"; }; @@ -325,6 +326,7 @@ clock-names = "ahb", "mod"; interrupts = <33>; bus-width = <4>; + cd-inverted; status = "disabled"; }; @@ -335,6 +337,7 @@ clock-names = "ahb", "mod"; interrupts = <34>; bus-width = <4>; + cd-inverted; status = "disabled"; }; @@ -443,14 +446,14 @@ mmc0_pins_a: mmc0@0 { allwinner,pins = "PF0","PF1","PF2","PF3","PF4","PF5"; allwinner,function = "mmc0"; - allwinner,drive = <3>; + allwinner,drive = <2>; allwinner,pull = <0>; }; mmc1_pins_a: mmc1@0 { allwinner,pins = "PG3","PG4","PG5","PG6","PG7","PG8"; allwinner,function = "mmc1"; - allwinner,drive = <3>; + allwinner,drive = <2>; allwinner,pull = <0>; }; }; diff --git a/arch/arm/boot/dts/sun5i-a13.dtsi b/arch/arm/boot/dts/sun5i-a13.dtsi index 044538c..be14b2c 100644 --- a/arch/arm/boot/dts/sun5i-a13.dtsi +++ b/arch/arm/boot/dts/sun5i-a13.dtsi @@ -297,16 +297,7 @@ clock-names = "ahb", "mod"; interrupts = <32>; bus-width = <4>; - status = "disabled"; - }; - - mmc1: mmc@01c10000 { - compatible = "allwinner,sun5i-a13-mmc"; - reg = <0x01c10000 0x1000>; - clocks = <&ahb_gates 9>, <&mmc1_clk>; - clock-names = "ahb", "mod"; - interrupts = <33>; - bus-width = <4>; + cd-inverted; status = "disabled"; }; @@ -317,6 +308,7 @@ clock-names = "ahb", "mod"; interrupts = <34>; bus-width = <4>; + cd-inverted; status = "disabled"; }; @@ -407,7 +399,7 @@ mmc0_pins_a: mmc0@0 { allwinner,pins = "PF0","PF1","PF2","PF3","PF4","PF5"; allwinner,function = "mmc0"; - allwinner,drive = <3>; + allwinner,drive = <2>; allwinner,pull = <0>; }; }; -- 1.8.5.3 -- You received this message because you are subscribed to the Google Groups "linux-sunxi" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/groups/opt_out.
