Merge remote-tracking branches 'asoc/fix/rt5665', 'asoc/fix/simple', 'asoc/fix/sti...

[linux-2.6-block.git] / arch / arm / boot / dts / rk3288-miqi.dts

diff --git a/arch/arm/boot/dts/rk3288-miqi.dts b/arch/arm/boot/dts/rk3288-miqi.dts
index 441d450fd15115050b3af5c48bae983d0ee49545..21326f3e8564ab141a8f4a9d0534bd51a3ef3b58 100644 (file)
--- a/arch/arm/boot/dts/rk3288-miqi.dts
+++ b/arch/arm/boot/dts/rk3288-miqi.dts
@@ -68,7 +68,7 @@
                compatible = "gpio-leds";
 
                work {
-                       gpios = <&gpio7 4 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio7 RK_PA4 GPIO_ACTIVE_LOW>;
                        label = "miqi:green:user";
                        linux,default-trigger = "default-on";
                        pinctrl-names = "default";
@@ -87,7 +87,7 @@
        vcc_host: usb-host-regulator {
                compatible = "regulator-fixed";
                enable-active-high;
-               gpio = <&gpio0 14 GPIO_ACTIVE_HIGH>;
+               gpio = <&gpio0 RK_PB6 GPIO_ACTIVE_HIGH>;
                pinctrl-names = "default";
                pinctrl-0 = <&host_vbus_drv>;
                regulator-name = "vcc_host";
@@ -99,7 +99,7 @@
 
        vcc_sd: sdmmc-regulator {
                compatible = "regulator-fixed";
-               gpio = <&gpio7 11 GPIO_ACTIVE_LOW>;
+               gpio = <&gpio7 RK_PB3 GPIO_ACTIVE_LOW>;
                pinctrl-names = "default";
                pinctrl-0 = <&sdmmc_pwr>;
                regulator-name = "vcc_sd";
@@ -146,7 +146,7 @@
        phy-mode = "rgmii";
        snps,reset-active-low;
        snps,reset-delays-us = <0 10000 1000000>;
-       snps,reset-gpio = <&gpio4 8 GPIO_ACTIVE_LOW>;
+       snps,reset-gpio = <&gpio4 RK_PB0 GPIO_ACTIVE_LOW>;
        tx_delay = <0x30>;
        rx_delay = <0x10>;
        status = "ok";