Difuse/difos
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sunxi: fix mmc support on sun4i

Browse source 
Signed-off-by: Zoltan HERPAI <wigyori@uid0.hu>

SVN-Revision: 39943
This commit is contained in:
Zoltan Herpai 2014-03-17 22:32:42 +00:00
parent f960a1fdb0
commit 18ab115d89
2 changed files with 10 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
target/linux/sunxi/patches-3.13/173-1-dt-sun4i-add-mmc.patch
View file

@ -56,48 +56,52 @@ diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi
index 454077a..a8e0df3 100644 index 454077a..a8e0df3 100644
--- a/arch/arm/boot/dts/sun4i-a10.dtsi --- a/arch/arm/boot/dts/sun4i-a10.dtsi
+++ b/arch/arm/boot/dts/sun4i-a10.dtsi +++ b/arch/arm/boot/dts/sun4i-a10.dtsi
@@ -338,6 +338,46 @@ @@ -338,6 +338,50 @@
#size-cells = <0>; #size-cells = <0>;
}; };
+ mmc0: mmc@01c0f000 { + mmc0: mmc@01c0f000 {
+ compatible = "allwinner,sun5i-a13-mmc"; + compatible = "allwinner,sun4i-a10-mmc";
+ reg = <0x01c0f000 0x1000>; + reg = <0x01c0f000 0x1000>;
+ clocks = <&ahb_gates 8>, <&mmc0_clk>; + clocks = <&ahb_gates 8>, <&mmc0_clk>;
+ clock-names = "ahb", "mod"; + clock-names = "ahb", "mod";
+ interrupts = <32>; + interrupts = <32>;
+ bus-width = <4>; + bus-width = <4>;
+ status = "disabled"; + status = "disabled";
+ cd-inverted;
+ }; + };
+ +
+ mmc1: mmc@01c10000 { + mmc1: mmc@01c10000 {
+ compatible = "allwinner,sun5i-a13-mmc"; + compatible = "allwinner,sun4i-a10-mmc";
+ reg = <0x01c10000 0x1000>; + reg = <0x01c10000 0x1000>;
+ clocks = <&ahb_gates 9>, <&mmc1_clk>; + clocks = <&ahb_gates 9>, <&mmc1_clk>;
+ clock-names = "ahb", "mod"; + clock-names = "ahb", "mod";
+ interrupts = <33>; + interrupts = <33>;
+ bus-width = <4>; + bus-width = <4>;
+ status = "disabled"; + status = "disabled";
+ cd-inverted;
+ }; + };
+ +
+ mmc2: mmc@01c11000 { + mmc2: mmc@01c11000 {
+ compatible = "allwinner,sun5i-a13-mmc"; + compatible = "allwinner,sun4i-a10-mmc";
+ reg = <0x01c11000 0x1000>; + reg = <0x01c11000 0x1000>;
+ clocks = <&ahb_gates 10>, <&mmc2_clk>; + clocks = <&ahb_gates 10>, <&mmc2_clk>;
+ clock-names = "ahb", "mod"; + clock-names = "ahb", "mod";
+ interrupts = <34>; + interrupts = <34>;
+ bus-width = <4>; + bus-width = <4>;
+ status = "disabled"; + status = "disabled";
+ cd-inverted;
+ }; + };
+ +
+ mmc3: mmc@01c12000 { + mmc3: mmc@01c12000 {
+ compatible = "allwinner,sun5i-a13-mmc"; + compatible = "allwinner,sun4i-a10-mmc";
+ reg = <0x01c12000 0x1000>; + reg = <0x01c12000 0x1000>;
+ clocks = <&ahb_gates 11>, <&mmc3_clk>; + clocks = <&ahb_gates 11>, <&mmc3_clk>;
+ clock-names = "ahb", "mod"; + clock-names = "ahb", "mod";
+ interrupts = <35>; + interrupts = <35>;
+ bus-width = <4>; + bus-width = <4>;
+ status = "disabled"; + status = "disabled";
+ cd-inverted;
+ }; + };
+ +
ahci: sata@01c18000 { ahci: sata@01c18000 {
@ -111,7 +115,7 @@ index 454077a..a8e0df3 100644
+ mmc0_pins_a: mmc0@0 { + mmc0_pins_a: mmc0@0 {
+ allwinner,pins = "PF0","PF1","PF2","PF3","PF4","PF5"; + allwinner,pins = "PF0","PF1","PF2","PF3","PF4","PF5";
+ allwinner,function = "mmc0"; + allwinner,function = "mmc0";
+ allwinner,drive = <3>; + allwinner,drive = <2>;
+ allwinner,pull = <0>; + allwinner,pull = <0>;
+ }; + };
+ +

64
target/linux/sunxi/patches-3.13/173-4-dt-sun4i-fixup-mmc.patch
View file

@ -1,64 +0,0 @@
From 11347c2a116f36b95d6cc3b315a1f269da6d42a0 Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com>
Date: Mon, 17 Feb 2014 17:20:21 +0100
Subject: [PATCH] ARM: sun4i: dt: Fixup mmc bindings
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.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
arch/arm/boot/dts/sun4i-a10.dtsi | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi
index a8e0df3..ba05e6e 100644
--- a/arch/arm/boot/dts/sun4i-a10.dtsi
+++ b/arch/arm/boot/dts/sun4i-a10.dtsi
@@ -345,6 +345,7 @@
clock-names = "ahb", "mod";
interrupts = <32>;
bus-width = <4>;
+ cd-inverted;
status = "disabled";
};
@@ -355,6 +356,7 @@
clock-names = "ahb", "mod";
interrupts = <33>;
bus-width = <4>;
+ cd-inverted;
status = "disabled";
};
@@ -365,6 +367,7 @@
clock-names = "ahb", "mod";
interrupts = <34>;
bus-width = <4>;
+ cd-inverted;
status = "disabled";
};
@@ -375,6 +378,7 @@
clock-names = "ahb", "mod";
interrupts = <35>;
bus-width = <4>;
+ cd-inverted;
status = "disabled";
};
@@ -460,7 +464,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.5