Merge remote-tracking branch 'ftrace/for-next'

[deliverable/linux.git] / arch / arm / boot / dts / sun8i-a33-ga10h-v1.1.dts

diff --git a/arch/arm/boot/dts/sun8i-a33-ga10h-v1.1.dts b/arch/arm/boot/dts/sun8i-a33-ga10h-v1.1.dts
index 65660324005c703718fa98946d45c890a5c5c69b..de6269dcac3aba95782e825a26ac5e691e5b9fe0 100644 (file)
--- a/arch/arm/boot/dts/sun8i-a33-ga10h-v1.1.dts
+++ b/arch/arm/boot/dts/sun8i-a33-ga10h-v1.1.dts
@@ -47,6 +47,11 @@
 / {
        model = "Allwinner GA10H Quad Core Tablet (v1.1)";
        compatible = "allwinner,ga10h-v1.1", "allwinner,sun8i-a33";
+
+       aliases {
+               /* Make u-boot set mac-address for rtl8703as (no eeprom) */
+               ethernet0 = &rtl8703as;
+       };
 };
 
 &ehci0 {
@@ -62,6 +67,19 @@
        };
 };
 
+&mmc1 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&mmc1_pins_a>;
+       vmmc-supply = <&reg_dldo1>;
+       bus-width = <4>;
+       non-removable;
+       status = "okay";
+
+       rtl8703as: sdio_wifi@1 {
+               reg = <1>;
+       };
+};
+
 &ohci0 {
        status = "okay";
 };