sunxi: initial 3.14 patchset

[openwrt/openwrt.git] / target / linux / sunxi / patches-3.14 / 203-dt-sun7i-add-mmc-nodes.patch

diff --git a/target/linux/sunxi/patches-3.14/203-dt-sun7i-add-mmc-nodes.patch b/target/linux/sunxi/patches-3.14/203-dt-sun7i-add-mmc-nodes.patch
new file mode 100644 (file)
index 0000000..daa6a91
--- /dev/null
+++ b/target/linux/sunxi/patches-3.14/203-dt-sun7i-add-mmc-nodes.patch
@@ -0,0 +1,182 @@
+From 33654facee61ebbd88684c9cf482ec2ea41f575e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?David=20Lanzend=C3=B6rfer?= <david.lanzendoerfer@o2s.ch>
+Date: Sat, 15 Feb 2014 14:02:01 +0100
+Subject: [PATCH] ARM: dts: sun7i: Add support for mmc
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: David Lanzendörfer <david.lanzendoerfer@o2s.ch>
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+---
+ arch/arm/boot/dts/sun7i-a20-cubieboard2.dts     |  8 +++
+ arch/arm/boot/dts/sun7i-a20-cubietruck.dts      |  8 +++
+ arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts | 23 +++++++++
+ arch/arm/boot/dts/sun7i-a20.dtsi                | 65 +++++++++++++++++++++++++
+ 4 files changed, 104 insertions(+)
+
+diff --git a/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts b/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
+index 68de89f..cd9d3c2 100644
+--- a/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
++++ b/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
+@@ -20,6 +20,14 @@
+       compatible = "cubietech,cubieboard2", "allwinner,sun7i-a20";
+ 
+       soc@01c00000 {
++              mmc0: mmc@01c0f000 {
++                      pinctrl-names = "default", "default";
++                      pinctrl-0 = <&mmc0_pins_a>;
++                      pinctrl-1 = <&mmc0_cd_pin_reference_design>;
++                      cd-gpios = <&pio 7 1 0>; /* PH1 */
++                      status = "okay";
++              };
++
+               usbphy: phy@01c13400 {
+                       usb1_vbus-supply = <&reg_usb1_vbus>;
+                       usb2_vbus-supply = <&reg_usb2_vbus>;
+diff --git a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
+index cb25d3c..66bb3ef 100644
+--- a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
++++ b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
+@@ -20,6 +20,14 @@
+       compatible = "cubietech,cubietruck", "allwinner,sun7i-a20";
+ 
+       soc@01c00000 {
++              mmc0: mmc@01c0f000 {
++                      pinctrl-names = "default", "default";
++                      pinctrl-0 = <&mmc0_pins_a>;
++                      pinctrl-1 = <&mmc0_cd_pin_reference_design>;
++                      cd-gpios = <&pio 7 1 0>; /* PH1 */
++                      status = "okay";
++              };
++
+               usbphy: phy@01c13400 {
+                       usb1_vbus-supply = <&reg_usb1_vbus>;
+                       usb2_vbus-supply = <&reg_usb2_vbus>;
+diff --git a/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts b/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts
+index eeadf76..822cbe2 100644
+--- a/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts
++++ b/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts
+@@ -31,6 +31,22 @@
+                       status = "okay";
+               };
+ 
++              mmc0: mmc@01c0f000 {
++                      pinctrl-names = "default", "default";
++                      pinctrl-0 = <&mmc0_pins_a>;
++                      pinctrl-1 = <&mmc0_cd_pin_reference_design>;
++                      cd-gpios = <&pio 7 1 0>; /* PH1 */
++                      status = "okay";
++              };
++
++              mmc3: mmc@01c12000 {
++                      pinctrl-names = "default", "default";
++                      pinctrl-0 = <&mmc3_pins_a>;
++                      pinctrl-1 = <&mmc3_cd_pin_olinuxinom>;
++                      cd-gpios = <&pio 7 11 0>; /* PH11 */
++                      status = "okay";
++              };
++
+               usbphy: phy@01c13400 {
+                       usb1_vbus-supply = <&reg_usb1_vbus>;
+                       usb2_vbus-supply = <&reg_usb2_vbus>;
+@@ -65,6 +81,13 @@
+               };
+ 
+               pinctrl@01c20800 {
++                      mmc3_cd_pin_olinuxinom: mmc3_cd_pin@0 {
++                              allwinner,pins = "PH11";
++                              allwinner,function = "gpio_in";
++                              allwinner,drive = <0>;
++                              allwinner,pull = <1>;
++                      };
++
+                       led_pins_olinuxino: led_pins@0 {
+                               allwinner,pins = "PH2";
+                               allwinner,function = "gpio_out";
+diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi
+index 4cc2f5f..1d9b314 100644
+--- a/arch/arm/boot/dts/sun7i-a20.dtsi
++++ b/arch/arm/boot/dts/sun7i-a20.dtsi
+@@ -439,6 +439,50 @@
+                       #size-cells = <0>;
+               };
+ 
++              mmc0: mmc@01c0f000 {
++                      compatible = "allwinner,sun5i-a13-mmc";
++                      reg = <0x01c0f000 0x1000>;
++                      clocks = <&ahb_gates 8>, <&mmc0_clk>;
++                      clock-names = "ahb", "mod";
++                      interrupts = <0 32 4>;
++                      bus-width = <4>;
++                      cd-inverted;
++                      status = "disabled";
++              };
++
++              mmc1: mmc@01c10000 {
++                      compatible = "allwinner,sun5i-a13-mmc";
++                      reg = <0x01c10000 0x1000>;
++                      clocks = <&ahb_gates 9>, <&mmc1_clk>;
++                      clock-names = "ahb", "mod";
++                      interrupts = <0 33 4>;
++                      bus-width = <4>;
++                      cd-inverted;
++                      status = "disabled";
++              };
++
++              mmc2: mmc@01c11000 {
++                      compatible = "allwinner,sun5i-a13-mmc";
++                      reg = <0x01c11000 0x1000>;
++                      clocks = <&ahb_gates 10>, <&mmc2_clk>;
++                      clock-names = "ahb", "mod";
++                      interrupts = <0 34 4>;
++                      bus-width = <4>;
++                      cd-inverted;
++                      status = "disabled";
++              };
++
++              mmc3: mmc@01c12000 {
++                      compatible = "allwinner,sun5i-a13-mmc";
++                      reg = <0x01c12000 0x1000>;
++                      clocks = <&ahb_gates 11>, <&mmc3_clk>;
++                      clock-names = "ahb", "mod";
++                      interrupts = <0 35 4>;
++                      bus-width = <4>;
++                      cd-inverted;
++                      status = "disabled";
++              };
++
+               usbphy: phy@01c13400 {
+                       #phy-cells = <1>;
+                       compatible = "allwinner,sun7i-a20-usb-phy";
+@@ -645,6 +689,27 @@
+                               allwinner,drive = <0>;
+                               allwinner,pull = <0>;
+                       };
++
++                      mmc0_pins_a: mmc0@0 {
++                              allwinner,pins = "PF0","PF1","PF2","PF3","PF4","PF5";
++                              allwinner,function = "mmc0";
++                              allwinner,drive = <2>;
++                              allwinner,pull = <0>;
++                      };
++
++                      mmc0_cd_pin_reference_design: mmc0_cd_pin@0 {
++                              allwinner,pins = "PH1";
++                              allwinner,function = "gpio_in";
++                              allwinner,drive = <0>;
++                              allwinner,pull = <1>;
++                      };
++
++                      mmc3_pins_a: mmc3@0 {
++                              allwinner,pins = "PI4","PI5","PI6","PI7","PI8","PI9";
++                              allwinner,function = "mmc3";
++                              allwinner,drive = <2>;
++                              allwinner,pull = <0>;
++                      };
+               };
+ 
+               timer@01c20c00 {
+-- 
+2.0.3
+