95 lines
2.8 KiB
Diff
95 lines
2.8 KiB
Diff
From c621183c203affa526c15e46432c24f31afed997 Mon Sep 17 00:00:00 2001
|
|
From: Hans de Goede <hdegoede@redhat.com>
|
|
Date: Fri, 2 May 2014 17:57:28 +0200
|
|
Subject: [PATCH 11/12] ARM: dts: sun7i: Enable mmc controller on various A20
|
|
boards
|
|
|
|
The cd pin settings have been taken from the original firmware fex files,
|
|
and have been confirmed to work on the actual boards.
|
|
|
|
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
|
|
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
|
|
---
|
|
arch/arm/boot/dts/sun7i-a20-cubieboard2.dts | 9 +++++++++
|
|
arch/arm/boot/dts/sun7i-a20-cubietruck.dts | 9 +++++++++
|
|
arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts | 25 +++++++++++++++++++++++++
|
|
3 files changed, 43 insertions(+)
|
|
|
|
--- a/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
|
|
+++ b/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
|
|
@@ -20,6 +20,15 @@
|
|
compatible = "cubietech,cubieboard2", "allwinner,sun7i-a20";
|
|
|
|
soc@01c00000 {
|
|
+ mmc0: mmc@01c0f000 {
|
|
+ pinctrl-names = "default";
|
|
+ pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_reference_design>;
|
|
+ bus-width = <4>;
|
|
+ cd-gpios = <&pio 7 1 0>; /* PH1 */
|
|
+ cd-inverted;
|
|
+ status = "okay";
|
|
+ };
|
|
+
|
|
usbphy: phy@01c13400 {
|
|
usb1_vbus-supply = <®_usb1_vbus>;
|
|
usb2_vbus-supply = <®_usb2_vbus>;
|
|
--- a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
|
|
+++ b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
|
|
@@ -20,6 +20,15 @@
|
|
compatible = "cubietech,cubietruck", "allwinner,sun7i-a20";
|
|
|
|
soc@01c00000 {
|
|
+ mmc0: mmc@01c0f000 {
|
|
+ pinctrl-names = "default";
|
|
+ pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_reference_design>;
|
|
+ bus-width = <4>;
|
|
+ cd-gpios = <&pio 7 1 0>; /* PH1 */
|
|
+ cd-inverted;
|
|
+ status = "okay";
|
|
+ };
|
|
+
|
|
usbphy: phy@01c13400 {
|
|
usb1_vbus-supply = <®_usb1_vbus>;
|
|
usb2_vbus-supply = <®_usb2_vbus>;
|
|
--- a/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts
|
|
+++ b/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts
|
|
@@ -31,6 +31,24 @@
|
|
status = "okay";
|
|
};
|
|
|
|
+ mmc0: mmc@01c0f000 {
|
|
+ pinctrl-names = "default";
|
|
+ pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_reference_design>;
|
|
+ bus-width = <4>;
|
|
+ cd-gpios = <&pio 7 1 0>; /* PH1 */
|
|
+ cd-inverted;
|
|
+ status = "okay";
|
|
+ };
|
|
+
|
|
+ mmc3: mmc@01c12000 {
|
|
+ pinctrl-names = "default";
|
|
+ pinctrl-0 = <&mmc3_pins_a>, <&mmc3_cd_pin_olinuxinom>;
|
|
+ bus-width = <4>;
|
|
+ cd-gpios = <&pio 7 11 0>; /* PH11 */
|
|
+ cd-inverted;
|
|
+ status = "okay";
|
|
+ };
|
|
+
|
|
usbphy: phy@01c13400 {
|
|
usb1_vbus-supply = <®_usb1_vbus>;
|
|
usb2_vbus-supply = <®_usb2_vbus>;
|
|
@@ -65,6 +83,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";
|