summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakob Unterwurzacher <jakob.unterwurzacher@theobroma-systems.com>2015-07-29 14:11:37 +0200
committerKlaus Goger <klaus.goger@theobroma-systems.com>2015-07-30 18:56:31 +0200
commit53e071d2b9d1329022af7a133f4377d0e2d23d90 (patch)
treea2f029ea5cbf443bddd8e360ebd31214480a8bb7
parent1f405e8d76e2d6ad3f723be13f066cdc565afe8f (diff)
ARM: dts: pangolin: Redefine mmc0 to change probing order
This makes sure the eMMC always is found as mmcblk0
-rw-r--r--arch/arm/boot/dts/sun6i-a31-pangolin.dts35
1 files changed, 26 insertions, 9 deletions
diff --git a/arch/arm/boot/dts/sun6i-a31-pangolin.dts b/arch/arm/boot/dts/sun6i-a31-pangolin.dts
index 059ce65eac7..fd77ec9ebd1 100644
--- a/arch/arm/boot/dts/sun6i-a31-pangolin.dts
+++ b/arch/arm/boot/dts/sun6i-a31-pangolin.dts
@@ -77,6 +77,32 @@
linux,default-trigger = "mmc0";
};
};
+
+ /* Redefines mmc0 under new name so that the sd card is probed after the emmc */
+ soc@01c00000 {
+ sdcard: sdcard@01c0f000 {
+ compatible = "allwinner,sun5i-a13-mmc";
+ reg = <0x01c0f000 0x1000>;
+ clocks = <&ahb1_gates 8>,
+ <&mmc0_clk 0>,
+ <&mmc0_clk 1>,
+ <&mmc0_clk 2>;
+ clock-names = "ahb",
+ "mmc",
+ "output",
+ "sample";
+ resets = <&ahb1_rst 8>;
+ reset-names = "ahb";
+ interrupts = <GIC_SPI 60 IRQ_TYPE_LEVEL_HIGH>;
+
+ pinctrl-names = "default";
+ pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_pangolin>;
+ vmmc-supply = <&reg_vcc3v0>;
+ bus-width = <4>;
+ cd-gpios = <&pio 2 19 GPIO_ACTIVE_LOW>; /* PC19 */
+ status = "okay";
+ };
+ };
};
&cpu0 {
@@ -229,15 +255,6 @@
status = "okay";
};
-&mmc0 {
- pinctrl-names = "default";
- pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_pangolin>;
- vmmc-supply = <&reg_vcc3v0>;
- bus-width = <4>;
- cd-gpios = <&pio 2 19 GPIO_ACTIVE_LOW>; /* PC19 */
- status = "okay";
-};
-
&mmc0_pins_a {
/* external pull-ups missing for some pins */
allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;