ARM: dts: rockchip: use pin constants to describe gpios

Use macros to describe gpios will make the dts easier to
read and write.

All the modifications done with sed:

sed -i -e 's/ 0  GPIO_ACTIVE_/ RK_PA0 GPIO_ACTIVE_/' arch/arm/boot/dts/rk*
sed -i -e 's/ 1  GPIO_ACTIVE_/ RK_PA1 GPIO_ACTIVE_/' arch/arm/boot/dts/rk*
sed -i -e 's/ 2  GPIO_ACTIVE_/ RK_PA2 GPIO_ACTIVE_/' arch/arm/boot/dts/rk*
.......
.......
sed -i -e 's/ 30 GPIO_ACTIVE_/ RK_PD6 GPIO_ACTIVE_/' arch/arm/boot/dts/rk*
sed -i -e 's/ 31 GPIO_ACTIVE_/ RK_PD7 GPIO_ACTIVE_/' arch/arm/boot/dts/rk*

Tested with:

for i in dts-old/*dtb; do scripts/dtc/dtx_diff $i dts-new/$(basename $i);  done

Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
[also adapted the gpio interrupts]
Signed-off-by: Heiko Stuebner <heiko@sntech.de>

diff --git a/arch/arm/boot/dts/rk3036-evb.dts b/arch/arm/boot/dts/rk3036-evb.dts
index 2f5f15524fbaec1d63193638948185405cc0ca05..c0953410121ba4c2494a52dfd3094371e960af21 100644 (file)
--- a/arch/arm/boot/dts/rk3036-evb.dts
+++ b/arch/arm/boot/dts/rk3036-evb.dts
@@ -56,7 +56,7 @@
        pinctrl-names = "default";
        pinctrl-0 = <&emac_xfer>, <&emac_mdio>;
        phy = <&phy0>;
-       phy-reset-gpios = <&gpio2 22 GPIO_ACTIVE_LOW>; /* PHY_RST */
+       phy-reset-gpios = <&gpio2 RK_PC6 GPIO_ACTIVE_LOW>; /* PHY_RST */
        phy-reset-duration = <10>; /* millisecond */
 
        status = "okay";

diff --git a/arch/arm/boot/dts/rk3036-kylin.dts b/arch/arm/boot/dts/rk3036-kylin.dts
index 3de958ec29c0e618b019917a2e45b7235d4d730c..5726135b7f8a89e1ff0620205c667baaef7f5ea7 100644 (file)
--- a/arch/arm/boot/dts/rk3036-kylin.dts
+++ b/arch/arm/boot/dts/rk3036-kylin.dts
@@ -55,7 +55,7 @@
                compatible = "gpio-leds";
 
                work {
-                       gpios = <&gpio2 30 GPIO_ACTIVE_HIGH>;
+                       gpios = <&gpio2 RK_PD6 GPIO_ACTIVE_HIGH>;
                        label = "kylin:red:led";
                        pinctrl-names = "default";
                        pinctrl-0 = <&led_ctl>;
@@ -74,9 +74,9 @@
                 * - SDIO_RESET_L_WL_RST
                 * - SDIO_RESET_L_BT_EN
                 */
-               reset-gpios = <&gpio0 26 GPIO_ACTIVE_LOW>, /* WL_REG_ON */
-                             <&gpio0 27 GPIO_ACTIVE_LOW>, /* WL_RST */
-                             <&gpio2 9  GPIO_ACTIVE_LOW>; /* BT_EN */
+               reset-gpios = <&gpio0 RK_PD2 GPIO_ACTIVE_LOW>, /* WL_REG_ON */
+                             <&gpio0 RK_PD3 GPIO_ACTIVE_LOW>, /* WL_RST */
+                             <&gpio2 RK_PB1 GPIO_ACTIVE_LOW>; /* BT_EN */
        };
 
        sound {
@@ -121,7 +121,7 @@
        pinctrl-names = "default";
        pinctrl-0 = <&emac_xfer>, <&emac_mdio>;
        phy = <&phy0>;
-       phy-reset-gpios = <&gpio2 22 GPIO_ACTIVE_LOW>; /* PHY_RST */
+       phy-reset-gpios = <&gpio2 RK_PC6 GPIO_ACTIVE_LOW>; /* PHY_RST */
        phy-reset-duration = <10>; /* millisecond */
 
        status = "okay";
@@ -148,7 +148,7 @@
                compatible = "rockchip,rk808";
                reg = <0x1b>;
                interrupt-parent = <&gpio2>;
-               interrupts = <2 IRQ_TYPE_LEVEL_LOW>;
+               interrupts = <RK_PA2 IRQ_TYPE_LEVEL_LOW>;
                pinctrl-names = "default";
                pinctrl-0 = <&pmic_int &global_pwroff>;
                rockchip,system-power-controller;

diff --git a/arch/arm/boot/dts/rk3066a-bqcurie2.dts b/arch/arm/boot/dts/rk3066a-bqcurie2.dts
index c0d8b5446ba78a529931f87d47e438379c8b3271..e1f5198723b22de9dc2cb47a9b46a1a72f11a134 100644 (file)
--- a/arch/arm/boot/dts/rk3066a-bqcurie2.dts
+++ b/arch/arm/boot/dts/rk3066a-bqcurie2.dts
@@ -71,7 +71,7 @@
                regulator-name = "sdmmc-supply";
                regulator-min-microvolt = <3000000>;
                regulator-max-microvolt = <3000000>;
-               gpio = <&gpio3 7 GPIO_ACTIVE_LOW>;
+               gpio = <&gpio3 RK_PA7 GPIO_ACTIVE_LOW>;
                startup-delay-us = <100000>;
                vin-supply = <&vcc_io>;
        };
@@ -81,7 +81,7 @@
                autorepeat;
 
                power {
-                       gpios = <&gpio6 2 GPIO_ACTIVE_LOW>; /* GPIO6_A2 */
+                       gpios = <&gpio6 RK_PA2 GPIO_ACTIVE_LOW>; /* GPIO6_A2 */
                        linux,code = <KEY_POWER>;
                        label = "GPIO Key Power";
                        linux,input-type = <1>;
@@ -89,7 +89,7 @@
                        debounce-interval = <100>;
                };
                volume-down {
-                       gpios = <&gpio4 21 GPIO_ACTIVE_LOW>; /* GPIO4_C5 */
+                       gpios = <&gpio4 RK_PC5 GPIO_ACTIVE_LOW>; /* GPIO4_C5 */
                        linux,code = <KEY_VOLUMEDOWN>;
                        label = "GPIO Key Vol-";
                        linux,input-type = <1>;
@@ -111,7 +111,7 @@
                reg = <0x2d>;
 
                interrupt-parent = <&gpio6>;
-               interrupts = <6 IRQ_TYPE_LEVEL_LOW>;
+               interrupts = <RK_PA6 IRQ_TYPE_LEVEL_LOW>;
 
                vcc5-supply = <&vcc_io>;
                vcc6-supply = <&vcc_io>;

diff --git a/arch/arm/boot/dts/rk3066a-marsboard.dts b/arch/arm/boot/dts/rk3066a-marsboard.dts
index 0a54c4beff8d94d2ae1fc65c170104791f472015..c6d92c25df42d5a673e991df58f86f566df73679 100644 (file)
--- a/arch/arm/boot/dts/rk3066a-marsboard.dts
+++ b/arch/arm/boot/dts/rk3066a-marsboard.dts
@@ -69,7 +69,7 @@
                regulator-name = "sdmmc-supply";
                regulator-min-microvolt = <3000000>;
                regulator-max-microvolt = <3000000>;
-               gpio = <&gpio3 7 GPIO_ACTIVE_LOW>;
+               gpio = <&gpio3 RK_PA7 GPIO_ACTIVE_LOW>;
                startup-delay-us = <100000>;
                vin-supply = <&vcc_io>;
        };
@@ -91,7 +91,7 @@
                reg = <0x2d>;
 
                interrupt-parent = <&gpio6>;
-               interrupts = <4 IRQ_TYPE_LEVEL_LOW>;
+               interrupts = <RK_PA4 IRQ_TYPE_LEVEL_LOW>;
 
                vcc1-supply = <&vsys>;
                vcc2-supply = <&vsys>;
@@ -186,7 +186,7 @@
        phy0: ethernet-phy@0 {
                reg = <0>;
                interrupt-parent = <&gpio1>;
-               interrupts = <26 IRQ_TYPE_LEVEL_LOW>;
+               interrupts = <RK_PD2 IRQ_TYPE_LEVEL_LOW>;
        };
 };
 

diff --git a/arch/arm/boot/dts/rk3066a-mk808.dts b/arch/arm/boot/dts/rk3066a-mk808.dts
index 658eb7ddeaf5fe1fe9515cd016f11714fbb055b0..7ca1cf5241e036c9a5b56f8b6988bef1fd043c0a 100644 (file)
--- a/arch/arm/boot/dts/rk3066a-mk808.dts
+++ b/arch/arm/boot/dts/rk3066a-mk808.dts
@@ -61,7 +61,7 @@
 
                blue {
                        label = "mk808:blue:power";
-                       gpios = <&gpio0 3 GPIO_ACTIVE_HIGH>;
+                       gpios = <&gpio0 RK_PA3 GPIO_ACTIVE_HIGH>;
                        default-state = "off";
                        linux,default-trigger = "default-on";
                };
@@ -77,7 +77,7 @@
        vcc_host: usb-host-regulator {
                compatible = "regulator-fixed";
                enable-active-high;
-               gpio = <&gpio0 6 GPIO_ACTIVE_HIGH>;
+               gpio = <&gpio0 RK_PA6 GPIO_ACTIVE_HIGH>;
                pinctrl-0 = <&host_drv>;
                pinctrl-names = "default";
                regulator-always-on;
@@ -91,7 +91,7 @@
        vcc_otg: usb-otg-regulator {
                compatible = "regulator-fixed";
                enable-active-high;
-               gpio = <&gpio0 5 GPIO_ACTIVE_HIGH>;
+               gpio = <&gpio0 RK_PA5 GPIO_ACTIVE_HIGH>;
                pinctrl-0 = <&otg_drv>;
                pinctrl-names = "default";
                regulator-always-on;
@@ -104,7 +104,7 @@
 
        vcc_sd: sdmmc-regulator {
                compatible = "regulator-fixed";
-               gpio = <&gpio3 7 GPIO_ACTIVE_LOW>;
+               gpio = <&gpio3 RK_PA7 GPIO_ACTIVE_LOW>;
                pinctrl-0 = <&sdmmc_pwr>;
                pinctrl-names = "default";
                regulator-name = "vcc_sd";
@@ -117,7 +117,7 @@
        vcc_wifi: sdio-regulator {
                compatible = "regulator-fixed";
                enable-active-high;
-               gpio = <&gpio3 24 GPIO_ACTIVE_HIGH>;
+               gpio = <&gpio3 RK_PD0 GPIO_ACTIVE_HIGH>;
                pinctrl-0 = <&wifi_pwr>;
                pinctrl-names = "default";
                regulator-name = "vcc_wifi";

diff --git a/arch/arm/boot/dts/rk3066a-rayeager.dts b/arch/arm/boot/dts/rk3066a-rayeager.dts
index 82465b6444435ad7ce8f9800066e8a353d165e91..8907deaab18e30038fc094607bfcc1b6faf1044f 100644 (file)
--- a/arch/arm/boot/dts/rk3066a-rayeager.dts
+++ b/arch/arm/boot/dts/rk3066a-rayeager.dts
@@ -55,7 +55,7 @@
 
        ir: ir-receiver {
                compatible = "gpio-ir-receiver";
-               gpios = <&gpio6 1 GPIO_ACTIVE_LOW>;
+               gpios = <&gpio6 RK_PA1 GPIO_ACTIVE_LOW>;
                pinctrl-names = "default";
                pinctrl-0 = <&ir_int>;
        };
@@ -65,7 +65,7 @@
 
                power {
                        wakeup-source;
-                       gpios = <&gpio6 2 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio6 RK_PA2 GPIO_ACTIVE_LOW>;
                        label = "GPIO Power";
                        linux,code = <KEY_POWER>;
                        pinctrl-names = "default";
@@ -115,7 +115,7 @@
        vcc_sata: sata-regulator {
                compatible = "regulator-fixed";
                enable-active-high;
-               gpio = <&gpio4 22 GPIO_ACTIVE_HIGH>;
+               gpio = <&gpio4 RK_PC6 GPIO_ACTIVE_HIGH>;
                pinctrl-names = "default";
                pinctrl-0 = <&sata_pwr>;
                regulator-name = "usb_5v";
@@ -127,7 +127,7 @@
 
        vcc_sd: sdmmc-regulator {
                compatible = "regulator-fixed";
-               gpio = <&gpio3 7 GPIO_ACTIVE_LOW>;
+               gpio = <&gpio3 RK_PA7 GPIO_ACTIVE_LOW>;
                pinctrl-names = "default";
                pinctrl-0 = <&sdmmc_pwr>;
                regulator-name = "vcc_sd";
@@ -140,7 +140,7 @@
        vcc_host: usb-host-regulator {
                compatible = "regulator-fixed";
                enable-active-high;
-               gpio = <&gpio0 6 GPIO_ACTIVE_HIGH>;
+               gpio = <&gpio0 RK_PA6 GPIO_ACTIVE_HIGH>;
                pinctrl-names = "default";
                pinctrl-0 = <&host_drv>;
                regulator-name = "host-pwr";
@@ -153,7 +153,7 @@
        vcc_otg: usb-otg-regulator {
                compatible = "regulator-fixed";
                enable-active-high;
-               gpio = <&gpio0 5 GPIO_ACTIVE_HIGH>;
+               gpio = <&gpio0 RK_PA5 GPIO_ACTIVE_HIGH>;
                pinctrl-names = "default";
                pinctrl-0 = <&otg_drv>;
                regulator-name = "vcc_otg";
@@ -201,7 +201,7 @@
                compatible = "asahi-kasei,ak8975";
                reg = <0x0d>;
                interrupt-parent = <&gpio4>;
-               interrupts = <17 IRQ_TYPE_EDGE_RISING>;
+               interrupts = <RK_PC1 IRQ_TYPE_EDGE_RISING>;
                pinctrl-names = "default";
                pinctrl-0 = <&comp_int>;
        };
@@ -210,7 +210,7 @@
                compatible = "fsl,mma8452";
                reg = <0x1d>;
                interrupt-parent = <&gpio4>;
-               interrupts = <16 IRQ_TYPE_EDGE_RISING>;
+               interrupts = <RK_PC0 IRQ_TYPE_EDGE_RISING>;
                pinctrl-names = "default";
                pinctrl-0 = <&gsensor_int>;
        };
@@ -223,7 +223,7 @@
        tps: tps@2d {
                reg = <0x2d>;
                interrupt-parent = <&gpio6>;
-               interrupts = <4 IRQ_TYPE_EDGE_RISING>;
+               interrupts = <RK_PA4 IRQ_TYPE_EDGE_RISING>;
                pinctrl-names = "default";
                pinctrl-0 = <&pmic_int>, <&pwr_hold>;
 

diff --git a/arch/arm/boot/dts/rk3188-px3-evb.dts b/arch/arm/boot/dts/rk3188-px3-evb.dts
index df727bafd6dcd438c346f5a062641538fcaa7760..5b2a0b6885cd0790d663ab3ba2d87927b9b32742 100644 (file)
--- a/arch/arm/boot/dts/rk3188-px3-evb.dts
+++ b/arch/arm/boot/dts/rk3188-px3-evb.dts
@@ -62,7 +62,7 @@
                autorepeat;
 
                power {
-                       gpios = <&gpio0 4 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_POWER>;
                        label = "GPIO Key Power";
                        linux,input-type = <1>;
@@ -102,7 +102,7 @@
                compatible = "bosch,bma250";
                reg = <0x18>;
                interrupt-parent = <&gpio0>;
-               interrupts = <15 IRQ_TYPE_LEVEL_LOW>;
+               interrupts = <RK_PB7 IRQ_TYPE_LEVEL_LOW>;
        };
 };
 
@@ -114,7 +114,7 @@
                compatible = "rockchip,rk818";
                reg = <0x1c>;
                interrupt-parent = <&gpio0>;
-               interrupts = <11 IRQ_TYPE_LEVEL_LOW>;
+               interrupts = <RK_PB3 IRQ_TYPE_LEVEL_LOW>;
                rockchip,system-power-controller;
                wakeup-source;
                #clock-cells = <1>;
@@ -247,8 +247,8 @@
                compatible = "silead,gsl1680";
                reg = <0x40>;
                interrupt-parent = <&gpio1>;
-               interrupts = <15 IRQ_TYPE_EDGE_FALLING>;
-               power-gpios = <&gpio0 14 GPIO_ACTIVE_HIGH>;
+               interrupts = <RK_PB7 IRQ_TYPE_EDGE_FALLING>;
+               power-gpios = <&gpio0 RK_PB6 GPIO_ACTIVE_HIGH>;
                touchscreen-size-x = <800>;
                touchscreen-size-y = <1280>;
                silead,max-fingers = <5>;

diff --git a/arch/arm/boot/dts/rk3188-radxarock.dts b/arch/arm/boot/dts/rk3188-radxarock.dts
index 5e8a235ed02da9bea38d8f345a503cf336a4bdbc..ca0a1c4bc15cdd3fea84d305eba5cf219969a00f 100644 (file)
--- a/arch/arm/boot/dts/rk3188-radxarock.dts
+++ b/arch/arm/boot/dts/rk3188-radxarock.dts
@@ -58,7 +58,7 @@
                autorepeat;
 
                power {
-                       gpios = <&gpio0 4 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_POWER>;
                        label = "GPIO Key Power";
                        linux,input-type = <1>;
@@ -72,19 +72,19 @@
 
                green {
                        label = "rock:green:user1";
-                       gpios = <&gpio0 12 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio0 RK_PB4 GPIO_ACTIVE_LOW>;
                        default-state = "off";
                };
 
                blue {
                        label = "rock:blue:user2";
-                       gpios = <&gpio0 14 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio0 RK_PB6 GPIO_ACTIVE_LOW>;
                        default-state = "off";
                };
 
                sleep {
                        label = "rock:red:power";
-                       gpios = <&gpio0 15 0>;
+                       gpios = <&gpio0 RK_PB7 GPIO_ACTIVE_HIGH>;
                        default-state = "off";
                };
        };
@@ -106,7 +106,7 @@
 
        ir_recv: gpio-ir-receiver {
                compatible = "gpio-ir-receiver";
-               gpios = <&gpio0 10 1>;
+               gpios = <&gpio0 RK_PB2 GPIO_ACTIVE_LOW>;
                pinctrl-names = "default";
                pinctrl-0 = <&ir_recv_pin>;
        };
@@ -114,7 +114,7 @@
        vcc_otg: usb-otg-regulator {
                compatible = "regulator-fixed";
                enable-active-high;
-               gpio = <&gpio2 31 GPIO_ACTIVE_HIGH>;
+               gpio = <&gpio2 RK_PD7 GPIO_ACTIVE_HIGH>;
                pinctrl-names = "default";
                pinctrl-0 = <&otg_vbus_drv>;
                regulator-name = "otg-vbus";
@@ -129,7 +129,7 @@
                regulator-name = "sdmmc-supply";
                regulator-min-microvolt = <3300000>;
                regulator-max-microvolt = <3300000>;
-               gpio = <&gpio3 1 GPIO_ACTIVE_LOW>;
+               gpio = <&gpio3 RK_PA1 GPIO_ACTIVE_LOW>;
                startup-delay-us = <100000>;
                vin-supply = <&vcc_io>;
        };
@@ -137,7 +137,7 @@
        vcc_host: usb-host-regulator {
                compatible = "regulator-fixed";
                enable-active-high;
-               gpio = <&gpio0 3 GPIO_ACTIVE_HIGH>;
+               gpio = <&gpio0 RK_PA3 GPIO_ACTIVE_HIGH>;
                pinctrl-names = "default";
                pinctrl-0 = <&host_vbus_drv>;
                regulator-name = "host-pwr";
@@ -168,7 +168,7 @@
        phy0: ethernet-phy@0 {
                reg = <0>;
                interrupt-parent = <&gpio3>;
-               interrupts = <26 IRQ_TYPE_LEVEL_LOW>;
+               interrupts = <RK_PD2 IRQ_TYPE_LEVEL_LOW>;
        };
 };
 
@@ -184,7 +184,7 @@
                compatible = "haoyu,hym8563";
                reg = <0x51>;
                interrupt-parent = <&gpio0>;
-               interrupts = <13 IRQ_TYPE_EDGE_FALLING>;
+               interrupts = <RK_PB5 IRQ_TYPE_EDGE_FALLING>;
                pinctrl-names = "default";
                pinctrl-0 = <&rtc_int>;
                #clock-cells = <0>;

diff --git a/arch/arm/boot/dts/rk3229-evb.dts b/arch/arm/boot/dts/rk3229-evb.dts
index dcdd0cee619ea51e715353107f19ec617e96406c..275092a950efa50afb60861ae422d92de0354b38 100644 (file)
--- a/arch/arm/boot/dts/rk3229-evb.dts
+++ b/arch/arm/boot/dts/rk3229-evb.dts
@@ -77,7 +77,7 @@
        phy-mode = "rgmii";
        pinctrl-names = "default";
        pinctrl-0 = <&rgmii_pins>;
-       snps,reset-gpio = <&gpio2 24 GPIO_ACTIVE_LOW>;
+       snps,reset-gpio = <&gpio2 RK_PD0 GPIO_ACTIVE_LOW>;
        snps,reset-active-low;
        snps,reset-delays-us = <0 10000 1000000>;
        tx_delay = <0x30>;

diff --git a/arch/arm/boot/dts/rk3288-evb-act8846.dts b/arch/arm/boot/dts/rk3288-evb-act8846.dts
index 041dd5d2d18cbbecb8c0b093041bd0da595ed57a..b9418d170502915e81d74f59ec1b15dc39d41996 100644 (file)
--- a/arch/arm/boot/dts/rk3288-evb-act8846.dts
+++ b/arch/arm/boot/dts/rk3288-evb-act8846.dts
@@ -47,7 +47,7 @@
        vcc_lcd: vcc-lcd {
                compatible = "regulator-fixed";
                enable-active-high;
-               gpio = <&gpio7 3 GPIO_ACTIVE_HIGH>;
+               gpio = <&gpio7 RK_PA3 GPIO_ACTIVE_HIGH>;
                pinctrl-names = "default";
                pinctrl-0 = <&lcd_en>;
                regulator-name = "vcc_lcd";
@@ -57,7 +57,7 @@
        vcc_wl: vcc-wl {
                compatible = "regulator-fixed";
                enable-active-high;
-               gpio = <&gpio7 9 GPIO_ACTIVE_HIGH>;
+               gpio = <&gpio7 RK_PB1 GPIO_ACTIVE_HIGH>;
                pinctrl-names = "default";
                pinctrl-0 = <&wifi_pwr>;
                regulator-name = "vcc_wl";
@@ -96,7 +96,7 @@
                reg = <0x51>;
 
                interrupt-parent = <&gpio0>;
-               interrupts = <4 IRQ_TYPE_EDGE_FALLING>;
+               interrupts = <RK_PA4 IRQ_TYPE_EDGE_FALLING>;
 
                pinctrl-names = "default";
                pinctrl-0 = <&pmic_int>;

diff --git a/arch/arm/boot/dts/rk3288-evb-rk808.dts b/arch/arm/boot/dts/rk3288-evb-rk808.dts
index 44ebc6e59b3a2138af2252722d299f0f2c2c5f63..56c266df01c1016db18ff3a404723e59abc5dbfc 100644 (file)
--- a/arch/arm/boot/dts/rk3288-evb-rk808.dts
+++ b/arch/arm/boot/dts/rk3288-evb-rk808.dts
@@ -52,7 +52,7 @@
                compatible = "rockchip,rk808";
                reg = <0x1b>;
                interrupt-parent = <&gpio0>;
-               interrupts = <4 IRQ_TYPE_LEVEL_LOW>;
+               interrupts = <RK_PA4 IRQ_TYPE_LEVEL_LOW>;
                pinctrl-names = "default";
                pinctrl-0 = <&pmic_int &global_pwroff>;
                rockchip,system-power-controller;

diff --git a/arch/arm/boot/dts/rk3288-evb.dtsi b/arch/arm/boot/dts/rk3288-evb.dtsi
index bf7ccfad3260f2615b1a9af472aaad273b074297..0dec94c3583b4523d44defc903821beaa810116f 100644 (file)
--- a/arch/arm/boot/dts/rk3288-evb.dtsi
+++ b/arch/arm/boot/dts/rk3288-evb.dtsi
@@ -84,7 +84,7 @@
                        240 241 242 243 244 245 246 247
                        248 249 250 251 252 253 254 255>;
                default-brightness-level = <128>;
-               enable-gpios = <&gpio7 2 GPIO_ACTIVE_HIGH>;
+               enable-gpios = <&gpio7 RK_PA2 GPIO_ACTIVE_HIGH>;
                pinctrl-names = "default";
                pinctrl-0 = <&bl_en>;
                pwms = <&pwm0 0 1000000 PWM_POLARITY_INVERTED>;
@@ -100,7 +100,7 @@
        panel: panel {
                compatible ="lg,lp079qx1-sp0v", "simple-panel";
                backlight = <&backlight>;
-               enable-gpios = <&gpio7 4 GPIO_ACTIVE_HIGH>;
+               enable-gpios = <&gpio7 RK_PA4 GPIO_ACTIVE_HIGH>;
                pinctrl-0 = <&lcd_cs>;
 
                ports {
@@ -120,7 +120,7 @@
                pinctrl-0 = <&pwrbtn>;
 
                power {
-                       gpios = <&gpio0 5 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio0 RK_PA5 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_POWER>;
                        label = "GPIO Key Power";
                        linux,input-type = <1>;
@@ -133,7 +133,7 @@
        vcc_host: vcc-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";
@@ -144,7 +144,7 @@
        vcc_phy: vcc-phy-regulator {
                compatible = "regulator-fixed";
                enable-active-high;
-               gpio = <&gpio0 6 GPIO_ACTIVE_HIGH>;
+               gpio = <&gpio0 RK_PA6 GPIO_ACTIVE_HIGH>;
                pinctrl-names = "default";
                pinctrl-0 = <&eth_phy_pwr>;
                regulator-name = "vcc_phy";
@@ -170,7 +170,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";
@@ -236,7 +236,7 @@
        phy-supply = <&vcc_phy>;
        phy-mode = "rgmii";
        clock_in_out = "input";
-       snps,reset-gpio = <&gpio4 7 0>;
+       snps,reset-gpio = <&gpio4 RK_PA7 GPIO_ACTIVE_HIGH>;
        snps,reset-active-low;
        snps,reset-delays-us = <0 10000 1000000>;
        assigned-clocks = <&cru SCLK_MAC>;

diff --git a/arch/arm/boot/dts/rk3288-fennec.dts b/arch/arm/boot/dts/rk3288-fennec.dts
index 805c0d26770b0c6ddeb0401f95d67bfb7aea6e2c..61d1c1028317818e1e8b59ac2007f1197a00f8c4 100644 (file)
--- a/arch/arm/boot/dts/rk3288-fennec.dts
+++ b/arch/arm/boot/dts/rk3288-fennec.dts
@@ -93,7 +93,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 = "okay";
@@ -111,7 +111,7 @@
                compatible = "rockchip,rk808";
                reg = <0x1b>;
                interrupt-parent = <&gpio0>;
-               interrupts = <4 IRQ_TYPE_LEVEL_LOW>;
+               interrupts = <RK_PA4 IRQ_TYPE_LEVEL_LOW>;
                #clock-cells = <1>;
                clock-output-names = "xin32k", "rk808-clkout2";
                pinctrl-names = "default";
@@ -345,7 +345,7 @@
 &usbphy {
        pinctrl-names = "default";
        pinctrl-0 = <&host_drv>;
-       vbus_drv-gpios = <&gpio0 14 GPIO_ACTIVE_HIGH>;
+       vbus_drv-gpios = <&gpio0 RK_PB6 GPIO_ACTIVE_HIGH>;
        status = "okay";
 };
 

diff --git a/arch/arm/boot/dts/rk3288-firefly-beta.dts b/arch/arm/boot/dts/rk3288-firefly-beta.dts
index 75d77e38e0d650d75c26b3c73176b842dc8a10f3..0195d972166052e0a3a493299b69aa34c6cab404 100644 (file)
--- a/arch/arm/boot/dts/rk3288-firefly-beta.dts
+++ b/arch/arm/boot/dts/rk3288-firefly-beta.dts
@@ -49,7 +49,7 @@
 };
 
 &ir {
-       gpios = <&gpio7 5 GPIO_ACTIVE_LOW>;
+       gpios = <&gpio7 RK_PA5 GPIO_ACTIVE_LOW>;
 };
 
 &pinctrl {

diff --git a/arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi b/arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi
index d242588bae0d73c94824a5fea10ccc15751a35dc..813496618d08ecaad55b250e40cf472efd10b84c 100644 (file)
--- a/arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi
+++ b/arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi
@@ -96,7 +96,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";

diff --git a/arch/arm/boot/dts/rk3288-firefly-reload.dts b/arch/arm/boot/dts/rk3288-firefly-reload.dts
index 751bee81128efdd0b0cdbd12d53c34547209d885..d0b3204a47999022bb12dc661644dcbfbbfe7b23 100644 (file)
--- a/arch/arm/boot/dts/rk3288-firefly-reload.dts
+++ b/arch/arm/boot/dts/rk3288-firefly-reload.dts
@@ -53,7 +53,7 @@
 
                power {
                        wakeup-source;
-                       gpios = <&gpio0 5 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio0 RK_PA5 GPIO_ACTIVE_LOW>;
                        label = "GPIO Power";
                        linux,code = <KEY_POWER>;
                        pinctrl-names = "default";
@@ -63,14 +63,14 @@
 
        ir-receiver {
                compatible = "gpio-ir-receiver";
-               gpios = <&gpio7 0 GPIO_ACTIVE_LOW>;
+               gpios = <&gpio7 RK_PA0 GPIO_ACTIVE_LOW>;
        };
 
        leds {
                compatible = "gpio-leds";
 
                power {
-                       gpios = <&gpio8 2 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio8 RK_PA2 GPIO_ACTIVE_LOW>;
                        label = "firefly:blue:power";
                        pinctrl-names = "default";
                        pinctrl-0 = <&power_led>;
@@ -78,7 +78,7 @@
                };
 
                work {
-                       gpios = <&gpio8 1 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio8 RK_PA1 GPIO_ACTIVE_LOW>;
                        label = "firefly:blue:user";
                        linux,default-trigger = "rc-feedback";
                        pinctrl-names = "default";
@@ -92,7 +92,7 @@
                clock-names = "ext_clock";
                pinctrl-names = "default";
                pinctrl-0 = <&wifi_enable>;
-               reset-gpios = <&gpio4 28 GPIO_ACTIVE_LOW>;
+               reset-gpios = <&gpio4 RK_PD4 GPIO_ACTIVE_LOW>;
        };
 
        sound {
@@ -112,7 +112,7 @@
        vcc_host_5v: 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_5v";
@@ -133,7 +133,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 @@
        vcc_otg_5v: usb-otg-regulator {
                compatible = "regulator-fixed";
                enable-active-high;
-               gpio = <&gpio0 12 GPIO_ACTIVE_HIGH>;
+               gpio = <&gpio0 RK_PB4 GPIO_ACTIVE_HIGH>;
                pinctrl-names = "default";
                pinctrl-0 = <&otg_vbus_drv>;
                regulator-name = "vcc_otg_5v";
@@ -159,7 +159,7 @@
        dovdd_1v8: dovdd-1v8-regulator {
                compatible = "regulator-fixed";
                enable-active-high;
-               gpio = <&gpio0 11 GPIO_ACTIVE_HIGH>;
+               gpio = <&gpio0 RK_PB3 GPIO_ACTIVE_HIGH>;
                pinctrl-names = "default";
                pinctrl-0 = <&dvp_pwr>;
                regulator-name = "dovdd_1v8";
@@ -171,7 +171,7 @@
        vcc28_dvp: vcc28-dvp-regulator {
                compatible = "regulator-fixed";
                enable-active-high;
-               gpio = <&gpio0 11 GPIO_ACTIVE_HIGH>;
+               gpio = <&gpio0 RK_PB3 GPIO_ACTIVE_HIGH>;
                pinctrl-names = "default";
                pinctrl-0 = <&dvp_pwr>;
                regulator-name = "vcc28_dvp";
@@ -183,7 +183,7 @@
        af_28: af_28-regulator {
                compatible = "regulator-fixed";
                enable-active-high;
-               gpio = <&gpio0 11 GPIO_ACTIVE_HIGH>;
+               gpio = <&gpio0 RK_PB3 GPIO_ACTIVE_HIGH>;
                pinctrl-names = "default";
                pinctrl-0 = <&dvp_pwr>;
                regulator-name = "af_28";
@@ -195,7 +195,7 @@
        dvdd_1v2: af_28-regulator {
                compatible = "regulator-fixed";
                enable-active-high;
-               gpio = <&gpio7 12 GPIO_ACTIVE_HIGH>;
+               gpio = <&gpio7 RK_PB4 GPIO_ACTIVE_HIGH>;
                pinctrl-names = "default";
                pinctrl-0 = <&cif_pwr>;
                regulator-name = "dvdd_1v2";
@@ -221,7 +221,7 @@
                clock-frequency = <32768>;
                clock-output-names = "xin32k";
                interrupt-parent = <&gpio7>;
-               interrupts = <4 IRQ_TYPE_EDGE_FALLING>;
+               interrupts = <RK_PA4 IRQ_TYPE_EDGE_FALLING>;
                pinctrl-names = "default";
                pinctrl-0 = <&rtc_int>;
        };

diff --git a/arch/arm/boot/dts/rk3288-firefly.dts b/arch/arm/boot/dts/rk3288-firefly.dts
index c07fe92dc69fda7f713a23fadecd41d4074cca89..14271be72f302731581035ab54eb2fe67f9314ce 100644 (file)
--- a/arch/arm/boot/dts/rk3288-firefly.dts
+++ b/arch/arm/boot/dts/rk3288-firefly.dts
@@ -49,7 +49,7 @@
 };
 
 &ir {
-       gpios = <&gpio7 0 GPIO_ACTIVE_LOW>;
+       gpios = <&gpio7 RK_PA0 GPIO_ACTIVE_LOW>;
 };
 
 &pinctrl {

diff --git a/arch/arm/boot/dts/rk3288-firefly.dtsi b/arch/arm/boot/dts/rk3288-firefly.dtsi
index 44935af1fb0ef0067c03f6b028b89d2930d0ffd9..10793ac185992d95dbb8b3d0d6f36bf8d39ecfe9 100644 (file)
--- a/arch/arm/boot/dts/rk3288-firefly.dtsi
+++ b/arch/arm/boot/dts/rk3288-firefly.dtsi
@@ -75,7 +75,7 @@
 
                power {
                        wakeup-source;
-                       gpios = <&gpio0 5 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio0 RK_PA5 GPIO_ACTIVE_LOW>;
                        label = "GPIO Power";
                        linux,code = <KEY_POWER>;
                        pinctrl-names = "default";
@@ -87,7 +87,7 @@
                compatible = "gpio-leds";
 
                work {
-                       gpios = <&gpio8 1 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio8 RK_PA1 GPIO_ACTIVE_LOW>;
                        label = "firefly:blue:user";
                        linux,default-trigger = "rc-feedback";
                        pinctrl-names = "default";
@@ -95,7 +95,7 @@
                };
 
                power {
-                       gpios = <&gpio8 2 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio8 RK_PA2 GPIO_ACTIVE_LOW>;
                        label = "firefly:green:power";
                        linux,default-trigger = "default-on";
                        pinctrl-names = "default";
@@ -114,7 +114,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";
@@ -145,7 +145,7 @@
        vcc_host_5v: 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_5v";
@@ -158,7 +158,7 @@
        vcc_otg_5v: usb-otg-regulator {
                compatible = "regulator-fixed";
                enable-active-high;
-               gpio = <&gpio0 12 GPIO_ACTIVE_HIGH>;
+               gpio = <&gpio0 RK_PB4 GPIO_ACTIVE_HIGH>;
                pinctrl-names = "default";
                pinctrl-0 = <&otg_vbus_drv>;
                regulator-name = "vcc_otg_5v";
@@ -175,7 +175,7 @@
        vcc28_dvp: vcc28-dvp-regulator {
                compatible = "regulator-fixed";
                enable-active-high;
-               gpio = <&gpio0 11 GPIO_ACTIVE_HIGH>;
+               gpio = <&gpio0 RK_PB3 GPIO_ACTIVE_HIGH>;
                pinctrl-names = "default";
                pinctrl-0 = <&dvp_pwr>;
                regulator-name = "vcc28_dvp";
@@ -213,7 +213,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";
@@ -260,7 +260,7 @@
                clock-frequency = <32768>;
                clock-output-names = "xin32k";
                interrupt-parent = <&gpio7>;
-               interrupts = <4 IRQ_TYPE_EDGE_FALLING>;
+               interrupts = <RK_PA4 IRQ_TYPE_EDGE_FALLING>;
                pinctrl-names = "default";
                pinctrl-0 = <&rtc_int>;
        };

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";

diff --git a/arch/arm/boot/dts/rk3288-popmetal.dts b/arch/arm/boot/dts/rk3288-popmetal.dts
index bc6d10054f6a37f5212f725de4de23a34d9e8e26..aa1f9ecff23109b7671e81d0afd62f217a563b18 100644 (file)
--- a/arch/arm/boot/dts/rk3288-popmetal.dts
+++ b/arch/arm/boot/dts/rk3288-popmetal.dts
@@ -180,7 +180,7 @@
        phy-supply = <&vcc_lan>;
        phy-mode = "rgmii";
        clock_in_out = "input";
-       snps,reset-gpio = <&gpio4 RK_PB0 0>;
+       snps,reset-gpio = <&gpio4 RK_PB0 GPIO_ACTIVE_HIGH>;
        snps,reset-active-low;
        snps,reset-delays-us = <0 10000 1000000>;
        assigned-clocks = <&cru SCLK_MAC>;
@@ -205,7 +205,7 @@
                compatible = "rockchip,rk808";
                reg = <0x1b>;
                interrupt-parent = <&gpio0>;
-               interrupts = <4 IRQ_TYPE_LEVEL_LOW>;
+               interrupts = <RK_PA4 IRQ_TYPE_LEVEL_LOW>;
                pinctrl-names = "default";
                pinctrl-0 = <&pmic_int &global_pwroff>;
                rockchip,system-power-controller;
@@ -390,7 +390,7 @@
                compatible = "asahi-kasei,ak8975";
                reg = <0x0d>;
                interrupt-parent = <&gpio8>;
-               interrupts = <1 IRQ_TYPE_EDGE_RISING>;
+               interrupts = <RK_PA1 IRQ_TYPE_EDGE_RISING>;
                pinctrl-names = "default";
                pinctrl-0 = <&comp_int>;
                vdd-supply = <&vcc_io>;
@@ -409,7 +409,7 @@
                compatible = "fsl,mma8452";
                reg = <0x1d>;
                interrupt-parent = <&gpio8>;
-               interrupts = <0 IRQ_TYPE_EDGE_RISING>;
+               interrupts = <RK_PA0 IRQ_TYPE_EDGE_RISING>;
                pinctrl-names = "default";
                pinctrl-0 = <&gsensor_int>;
        };

diff --git a/arch/arm/boot/dts/rk3288-r89.dts b/arch/arm/boot/dts/rk3288-r89.dts
index 04faa72dbd95f4936cd77cdc279b5039716a1806..1145b62edde7fb8ddf3aee9b1674dad07afb1568 100644 (file)
--- a/arch/arm/boot/dts/rk3288-r89.dts
+++ b/arch/arm/boot/dts/rk3288-r89.dts
@@ -68,7 +68,7 @@
                pinctrl-0 = <&pwrbtn>;
 
                power {
-                       gpios = <&gpio0 5 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio0 RK_PA5 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_POWER>;
                        label = "GPIO Key Power";
                        linux,input-type = <1>;
@@ -79,7 +79,7 @@
 
        ir: ir-receiver {
                compatible = "gpio-ir-receiver";
-               gpios = <&gpio7 0 GPIO_ACTIVE_LOW>;
+               gpios = <&gpio7 RK_PA0 GPIO_ACTIVE_LOW>;
                pinctrl-names = "default";
                pinctrl-0 = <&ir_int>;
        };
@@ -87,7 +87,7 @@
        vcc_host: vcc-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";
@@ -98,7 +98,7 @@
        vcc_otg: vcc-otg-regulator {
                compatible = "regulator-fixed";
                enable-active-high;
-               gpio = <&gpio0 12 GPIO_ACTIVE_HIGH>;
+               gpio = <&gpio0 RK_PB4 GPIO_ACTIVE_HIGH>;
                pinctrl-names = "default";
                pinctrl-0 = <&otg_vbus_drv>;
                regulator-name = "vcc_otg";
@@ -111,7 +111,7 @@
                regulator-name = "sdmmc-supply";
                regulator-min-microvolt = <3300000>;
                regulator-max-microvolt = <3300000>;
-               gpio = <&gpio7 11 GPIO_ACTIVE_LOW>;
+               gpio = <&gpio7 RK_PB3 GPIO_ACTIVE_LOW>;
                startup-delay-us = <100000>;
                vin-supply = <&vcc_io>;
        };
@@ -134,7 +134,7 @@
        phy-supply = <&vcc_lan>;
        phy-mode = "rgmii";
        clock_in_out = "input";
-       snps,reset-gpio = <&gpio4 7 0>;
+       snps,reset-gpio = <&gpio4 RK_PA7 GPIO_ACTIVE_HIGH>;
        snps,reset-active-low;
        snps,reset-delays-us = <0 10000 1000000>;
        assigned-clocks = <&cru SCLK_MAC>;
@@ -187,7 +187,7 @@
                #clock-cells = <0>;
                clock-output-names = "xin32k";
                interrupt-parent = <&gpio0>;
-               interrupts = <4 IRQ_TYPE_EDGE_FALLING>;
+               interrupts = <RK_PA4 IRQ_TYPE_EDGE_FALLING>;
                pinctrl-names = "default";
                pinctrl-0 = <&pmic_int>;
        };

diff --git a/arch/arm/boot/dts/rk3288-rock2-som.dtsi b/arch/arm/boot/dts/rk3288-rock2-som.dtsi
index b25ba806d5eec46fd3f92438c9030e22053bfcad..1c0bbc9b928b1e11b779e2c721967c8ec847bd9b 100644 (file)
--- a/arch/arm/boot/dts/rk3288-rock2-som.dtsi
+++ b/arch/arm/boot/dts/rk3288-rock2-som.dtsi
@@ -51,7 +51,7 @@
                compatible = "mmc-pwrseq-emmc";
                pinctrl-0 = <&emmc_reset>;
                pinctrl-names = "default";
-               reset-gpios = <&gpio3 9 GPIO_ACTIVE_LOW>;
+               reset-gpios = <&gpio3 RK_PB1 GPIO_ACTIVE_LOW>;
        };
 
        ext_gmac: external-gmac-clock {
@@ -106,7 +106,7 @@
        phy-supply = <&vccio_pmu>;
        pinctrl-names = "default";
        pinctrl-0 = <&rgmii_pins &phy_rst>;
-       snps,reset-gpio = <&gpio4 8 GPIO_ACTIVE_LOW>;
+       snps,reset-gpio = <&gpio4 RK_PB0 GPIO_ACTIVE_LOW>;
        snps,reset-active-low;
        snps,reset-delays-us = <0 10000 30000>;
        rx_delay = <0x10>;

diff --git a/arch/arm/boot/dts/rk3288-rock2-square.dts b/arch/arm/boot/dts/rk3288-rock2-square.dts
index dd3ad2e93a6d538dcd29c5dbc17ca2feb8d82d5d..96a2e745bb9322a33af765265e4f5554f9d22d2b 100644 (file)
--- a/arch/arm/boot/dts/rk3288-rock2-square.dts
+++ b/arch/arm/boot/dts/rk3288-rock2-square.dts
@@ -53,13 +53,13 @@
                compatible = "gpio-leds";
 
                heartbeat {
-                       gpios = <&gpio7 15 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio7 RK_PB7 GPIO_ACTIVE_LOW>;
                        label = "rock2:green:state1";
                        linux,default-trigger = "heartbeat";
                };
 
                mmc {
-                       gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio0 RK_PB3 GPIO_ACTIVE_LOW>;
                        label = "rock2:blue:state2";
                        linux,default-trigger = "mmc0";
                };
@@ -67,7 +67,7 @@
 
        ir: ir-receiver {
                compatible = "gpio-ir-receiver";
-               gpios = <&gpio8 1 GPIO_ACTIVE_LOW>;
+               gpios = <&gpio8 RK_PA1 GPIO_ACTIVE_LOW>;
                pinctrl-names = "default";
                pinctrl-0 = <&ir_int>;
        };
@@ -92,13 +92,13 @@
                clock-names = "ext_clock";
                pinctrl-names = "default";
                pinctrl-0 = <&wifi_enable>;
-               reset-gpios = <&gpio4 28 GPIO_ACTIVE_LOW>;
+               reset-gpios = <&gpio4 RK_PD4 GPIO_ACTIVE_LOW>;
        };
 
        vcc_usb_host: vcc-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>;
                /* Always on as the rockchip usb phy doesn't have a vbus-supply
@@ -110,7 +110,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";
@@ -166,7 +166,7 @@
                clock-frequency = <32768>;
                clock-output-names = "xin32k";
                interrupt-parent = <&gpio0>;
-               interrupts = <4 IRQ_TYPE_EDGE_FALLING>;
+               interrupts = <RK_PA4 IRQ_TYPE_EDGE_FALLING>;
                pinctrl-names = "default";
                pinctrl-0 = <&pmic_int>;
 

diff --git a/arch/arm/boot/dts/rk3288-veyron-analog-audio.dtsi b/arch/arm/boot/dts/rk3288-veyron-analog-audio.dtsi
index 6d105914a4f35c7a4c50524b1728814488432362..280aceae25d5021afc15a8c2d905803026b6145c 100644 (file)
--- a/arch/arm/boot/dts/rk3288-veyron-analog-audio.dtsi
+++ b/arch/arm/boot/dts/rk3288-veyron-analog-audio.dtsi
@@ -17,8 +17,8 @@
                rockchip,model = "VEYRON-I2S";
                rockchip,i2s-controller = <&i2s>;
                rockchip,audio-codec = <&max98090>;
-               rockchip,hp-det-gpios = <&gpio6 5 GPIO_ACTIVE_HIGH>;
-               rockchip,mic-det-gpios = <&gpio6 11 GPIO_ACTIVE_LOW>;
+               rockchip,hp-det-gpios = <&gpio6 RK_PA5 GPIO_ACTIVE_HIGH>;
+               rockchip,mic-det-gpios = <&gpio6 RK_PB3 GPIO_ACTIVE_LOW>;
                rockchip,headset-codec = <&headsetcodec>;
        };
 };
@@ -28,7 +28,7 @@
                compatible = "maxim,max98090";
                reg = <0x10>;
                interrupt-parent = <&gpio6>;
-               interrupts = <7 IRQ_TYPE_EDGE_FALLING>;
+               interrupts = <RK_PA7 IRQ_TYPE_EDGE_FALLING>;
                clock-names = "mclk";
                clocks = <&cru SCLK_I2S0_OUT>;
                pinctrl-names = "default";
@@ -41,7 +41,7 @@
                compatible = "ti,ts3a227e";
                reg = <0x3b>;
                interrupt-parent = <&gpio0>;
-               interrupts = <3 IRQ_TYPE_LEVEL_LOW>;
+               interrupts = <RK_PA3 IRQ_TYPE_LEVEL_LOW>;
                pinctrl-names = "default";
                pinctrl-0 = <&ts3a227e_int_l>;
                ti,micbias = <7>;               /* MICBIAS = 2.8V */

diff --git a/arch/arm/boot/dts/rk3288-veyron-brain.dts b/arch/arm/boot/dts/rk3288-veyron-brain.dts
index cf5311d2617c2c81a7dbe3d5d5b74b97820f20da..ed4255294ad4e191c2261e107169183b4b0b319b 100644 (file)
--- a/arch/arm/boot/dts/rk3288-veyron-brain.dts
+++ b/arch/arm/boot/dts/rk3288-veyron-brain.dts
@@ -67,7 +67,7 @@
        vcc5_host2: vcc5-host2-regulator {
                compatible = "regulator-fixed";
                enable-active-high;
-               gpio = <&gpio0 12 GPIO_ACTIVE_HIGH>;
+               gpio = <&gpio0 RK_PB4 GPIO_ACTIVE_HIGH>;
                pinctrl-names = "default";
                pinctrl-0 = <&usb2_pwr_en>;
                regulator-name = "vcc5_host2";
@@ -103,8 +103,8 @@
 &rk808 {
        pinctrl-names = "default";
        pinctrl-0 = <&pmic_int_l &dvs_1 &dvs_2>;
-       dvs-gpios = <&gpio7 11 GPIO_ACTIVE_HIGH>,
-                   <&gpio7 15 GPIO_ACTIVE_HIGH>;
+       dvs-gpios = <&gpio7 RK_PB3 GPIO_ACTIVE_HIGH>,
+                   <&gpio7 RK_PB7 GPIO_ACTIVE_HIGH>;
 
        /delete-property/ vcc6-supply;
 
@@ -133,7 +133,7 @@
 
 &vcc50_hdmi {
        enable-active-high;
-       gpio = <&gpio7 2 GPIO_ACTIVE_HIGH>;
+       gpio = <&gpio7 RK_PA2 GPIO_ACTIVE_HIGH>;
        pinctrl-names = "default";
        pinctrl-0 = <&vcc50_hdmi_en>;
 };

diff --git a/arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi b/arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi
index ce1f87980bcb96ed3e0f6ff2a2c0fe1edda9176c..d752a315f884185606bbe552056eba15a54cb051 100644 (file)
--- a/arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi
+++ b/arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi
@@ -91,7 +91,7 @@
                        240 241 242 243 244 245 246 247
                        248 249 250 251 252 253 254 255>;
                default-brightness-level = <128>;
-               enable-gpios = <&gpio7 2 GPIO_ACTIVE_HIGH>;
+               enable-gpios = <&gpio7 RK_PA2 GPIO_ACTIVE_HIGH>;
                backlight-boot-off;
                pinctrl-names = "default";
                pinctrl-0 = <&bl_en>;
@@ -102,7 +102,7 @@
        gpio-charger {
                compatible = "gpio-charger";
                charger-type = "mains";
-               gpios = <&gpio0 8 GPIO_ACTIVE_HIGH>;
+               gpios = <&gpio0 RK_PB0 GPIO_ACTIVE_HIGH>;
                pinctrl-names = "default";
                pinctrl-0 = <&ac_present_ap>;
        };
@@ -142,7 +142,7 @@
        vcc5_host1: vcc5-host1-regulator {
                compatible = "regulator-fixed";
                enable-active-high;
-               gpio = <&gpio0 11 GPIO_ACTIVE_HIGH>;
+               gpio = <&gpio0 RK_PB3 GPIO_ACTIVE_HIGH>;
                pinctrl-names = "default";
                pinctrl-0 = <&host1_pwr_en>;
                regulator-name = "vcc5_host1";
@@ -154,7 +154,7 @@
        vcc5v_otg: vcc5v-otg-regulator {
                compatible = "regulator-fixed";
                enable-active-high;
-               gpio = <&gpio0 12 GPIO_ACTIVE_HIGH>;
+               gpio = <&gpio0 RK_PB4 GPIO_ACTIVE_HIGH>;
                pinctrl-names = "default";
                pinctrl-0 = <&usbotg_pwren_h>;
                regulator-name = "vcc5_host2";
@@ -190,7 +190,7 @@
        pinctrl-0 = <&pwr_key_l &ap_lid_int_l>;
        lid {
                label = "Lid";
-               gpios = <&gpio0 6 GPIO_ACTIVE_LOW>;
+               gpios = <&gpio0 RK_PA6 GPIO_ACTIVE_LOW>;
                wakeup-source;
                linux,code = <0>; /* SW_LID */
                linux,input-type = <5>; /* EV_SW */
@@ -228,7 +228,7 @@
                reg = <0>;
                google,cros-ec-spi-pre-delay = <30>;
                interrupt-parent = <&gpio7>;
-               interrupts = <7 IRQ_TYPE_LEVEL_LOW>;
+               interrupts = <RK_PA7 IRQ_TYPE_LEVEL_LOW>;
                pinctrl-names = "default";
                pinctrl-0 = <&ec_int>;
                spi-max-frequency = <3000000>;
@@ -247,7 +247,7 @@
                compatible = "elan,ekth3000";
                reg = <0x15>;
                interrupt-parent = <&gpio7>;
-               interrupts = <3 IRQ_TYPE_EDGE_FALLING>;
+               interrupts = <RK_PA3 IRQ_TYPE_EDGE_FALLING>;
                pinctrl-names = "default";
                pinctrl-0 = <&trackpad_int>;
                vcc-supply = <&vcc33_io>;

diff --git a/arch/arm/boot/dts/rk3288-veyron-jaq.dts b/arch/arm/boot/dts/rk3288-veyron-jaq.dts
index 3748abf562b1b2ba75137879a260d700504b1678..d33f5763c39c6abcf95ebd8a7ba38c7ef9b871dc 100644 (file)
--- a/arch/arm/boot/dts/rk3288-veyron-jaq.dts
+++ b/arch/arm/boot/dts/rk3288-veyron-jaq.dts
@@ -57,7 +57,7 @@
        panel_regulator: panel-regulator {
                compatible = "regulator-fixed";
                enable-active-high;
-               gpio = <&gpio7 14 GPIO_ACTIVE_HIGH>;
+               gpio = <&gpio7 RK_PB6 GPIO_ACTIVE_HIGH>;
                pinctrl-names = "default";
                pinctrl-0 = <&lcd_enable_h>;
                regulator-name = "panel_regulator";
@@ -68,7 +68,7 @@
        vcc18_lcd: vcc18-lcd {
                compatible = "regulator-fixed";
                enable-active-high;
-               gpio = <&gpio2 13 GPIO_ACTIVE_HIGH>;
+               gpio = <&gpio2 RK_PB5 GPIO_ACTIVE_HIGH>;
                pinctrl-names = "default";
                pinctrl-0 = <&avdd_1v8_disp_en>;
                regulator-name = "vcc18_lcd";
@@ -80,7 +80,7 @@
        backlight_regulator: backlight-regulator {
                compatible = "regulator-fixed";
                enable-active-high;
-               gpio = <&gpio2 12 GPIO_ACTIVE_HIGH>;
+               gpio = <&gpio2 RK_PB4 GPIO_ACTIVE_HIGH>;
                pinctrl-names = "default";
                pinctrl-0 = <&bl_pwr_en>;
                regulator-name = "backlight_regulator";
@@ -134,8 +134,8 @@
 &rk808 {
        pinctrl-names = "default";
        pinctrl-0 = <&pmic_int_l &dvs_1 &dvs_2>;
-       dvs-gpios = <&gpio7 12 GPIO_ACTIVE_HIGH>,
-                   <&gpio7 15 GPIO_ACTIVE_HIGH>;
+       dvs-gpios = <&gpio7 RK_PB4 GPIO_ACTIVE_HIGH>,
+                   <&gpio7 RK_PB7 GPIO_ACTIVE_HIGH>;
 
        regulators {
                mic_vcc: LDO_REG2 {
@@ -160,14 +160,14 @@
 
 &vcc_5v {
        enable-active-high;
-       gpio = <&gpio7 21 GPIO_ACTIVE_HIGH>;
+       gpio = <&gpio7 RK_PC5 GPIO_ACTIVE_HIGH>;
        pinctrl-names = "default";
        pinctrl-0 = <&drv_5v>;
 };
 
 &vcc50_hdmi {
        enable-active-high;
-       gpio = <&gpio5 19 GPIO_ACTIVE_HIGH>;
+       gpio = <&gpio5 RK_PC3 GPIO_ACTIVE_HIGH>;
        pinctrl-names = "default";
        pinctrl-0 = <&vcc50_hdmi_en>;
 };

diff --git a/arch/arm/boot/dts/rk3288-veyron-jerry.dts b/arch/arm/boot/dts/rk3288-veyron-jerry.dts
index f6b2eaaebb9ab90bcca8fc8d46d3800830a4cd32..cdea751f2a8cb6f10ac67425808151008beaf70e 100644 (file)
--- a/arch/arm/boot/dts/rk3288-veyron-jerry.dts
+++ b/arch/arm/boot/dts/rk3288-veyron-jerry.dts
@@ -56,7 +56,7 @@
        panel_regulator: panel-regulator {
                compatible = "regulator-fixed";
                enable-active-high;
-               gpio = <&gpio7 14 GPIO_ACTIVE_HIGH>;
+               gpio = <&gpio7 RK_PB6 GPIO_ACTIVE_HIGH>;
                pinctrl-names = "default";
                pinctrl-0 = <&lcd_enable_h>;
                regulator-name = "panel_regulator";
@@ -67,7 +67,7 @@
        vcc18_lcd: vcc18-lcd {
                compatible = "regulator-fixed";
                enable-active-high;
-               gpio = <&gpio2 13 GPIO_ACTIVE_HIGH>;
+               gpio = <&gpio2 RK_PB5 GPIO_ACTIVE_HIGH>;
                pinctrl-names = "default";
                pinctrl-0 = <&avdd_1v8_disp_en>;
                regulator-name = "vcc18_lcd";
@@ -79,7 +79,7 @@
        backlight_regulator: backlight-regulator {
                compatible = "regulator-fixed";
                enable-active-high;
-               gpio = <&gpio2 12 GPIO_ACTIVE_HIGH>;
+               gpio = <&gpio2 RK_PB4 GPIO_ACTIVE_HIGH>;
                pinctrl-names = "default";
                pinctrl-0 = <&bl_pwr_en>;
                regulator-name = "backlight_regulator";
@@ -123,14 +123,14 @@
 
 &vcc_5v {
        enable-active-high;
-       gpio = <&gpio7 21 GPIO_ACTIVE_HIGH>;
+       gpio = <&gpio7 RK_PC5 GPIO_ACTIVE_HIGH>;
        pinctrl-names = "default";
        pinctrl-0 = <&drv_5v>;
 };
 
 &vcc50_hdmi {
        enable-active-high;
-       gpio = <&gpio5 19 GPIO_ACTIVE_HIGH>;
+       gpio = <&gpio5 RK_PC3 GPIO_ACTIVE_HIGH>;
        pinctrl-names = "default";
        pinctrl-0 = <&vcc50_hdmi_en>;
 };
@@ -197,7 +197,7 @@
        trackpad@2c {
                compatible = "hid-over-i2c";
                interrupt-parent = <&gpio7>;
-               interrupts = <3 IRQ_TYPE_EDGE_FALLING>;
+               interrupts = <RK_PA3 IRQ_TYPE_EDGE_FALLING>;
                reg = <0x2c>;
                hid-descr-addr = <0x0020>;
                vcc-supply = <&vcc33_io>;

diff --git a/arch/arm/boot/dts/rk3288-veyron-mickey.dts b/arch/arm/boot/dts/rk3288-veyron-mickey.dts
index f36f6f45922578d4d717d494a0742ca7fa58ea60..f0994f0e577454ceef15f371841ee145506f62eb 100644 (file)
--- a/arch/arm/boot/dts/rk3288-veyron-mickey.dts
+++ b/arch/arm/boot/dts/rk3288-veyron-mickey.dts
@@ -182,8 +182,8 @@
 &rk808 {
        pinctrl-names = "default";
        pinctrl-0 = <&pmic_int_l &dvs_1 &dvs_2>;
-       dvs-gpios = <&gpio7 12 GPIO_ACTIVE_HIGH>,
-                   <&gpio7 15 GPIO_ACTIVE_HIGH>;
+       dvs-gpios = <&gpio7 RK_PB4 GPIO_ACTIVE_HIGH>,
+                   <&gpio7 RK_PB7 GPIO_ACTIVE_HIGH>;
 
        /delete-property/ vcc6-supply;
        /delete-property/ vcc12-supply;
@@ -244,7 +244,7 @@
 
 &vcc50_hdmi {
        enable-active-high;
-       gpio = <&gpio7 11 GPIO_ACTIVE_HIGH>;
+       gpio = <&gpio7 RK_PB3 GPIO_ACTIVE_HIGH>;
        pinctrl-names = "default";
        pinctrl-0 = <&power_hdmi_on>;
 };

diff --git a/arch/arm/boot/dts/rk3288-veyron-minnie.dts b/arch/arm/boot/dts/rk3288-veyron-minnie.dts
index f72d616d1bf8dbd1739472f9e5f04656883eecdd..544de6027aaa0fcb9f4f11a94b9367534f77afab 100644 (file)
--- a/arch/arm/boot/dts/rk3288-veyron-minnie.dts
+++ b/arch/arm/boot/dts/rk3288-veyron-minnie.dts
@@ -55,7 +55,7 @@
        backlight_regulator: backlight-regulator {
                compatible = "regulator-fixed";
                enable-active-high;
-               gpio = <&gpio2 12 GPIO_ACTIVE_HIGH>;
+               gpio = <&gpio2 RK_PB4 GPIO_ACTIVE_HIGH>;
                pinctrl-names = "default";
                pinctrl-0 = <&bl_pwr_en>;
                regulator-name = "backlight_regulator";
@@ -66,7 +66,7 @@
        panel_regulator: panel-regulator {
                compatible = "regulator-fixed";
                enable-active-high;
-               gpio = <&gpio7 14 GPIO_ACTIVE_HIGH>;
+               gpio = <&gpio7 RK_PB6 GPIO_ACTIVE_HIGH>;
                pinctrl-names = "default";
                pinctrl-0 = <&lcd_enable_h>;
                regulator-name = "panel_regulator";
@@ -77,7 +77,7 @@
        vcc18_lcd: vcc18-lcd {
                compatible = "regulator-fixed";
                enable-active-high;
-               gpio = <&gpio2 13 GPIO_ACTIVE_HIGH>;
+               gpio = <&gpio2 RK_PB5 GPIO_ACTIVE_HIGH>;
                pinctrl-names = "default";
                pinctrl-0 = <&avdd_1v8_disp_en>;
                regulator-name = "vcc18_lcd";
@@ -134,14 +134,14 @@
 
        volum_down {
                label = "Volum_down";
-               gpios = <&gpio5 11 GPIO_ACTIVE_LOW>;
+               gpios = <&gpio5 RK_PB3 GPIO_ACTIVE_LOW>;
                linux,code = <KEY_VOLUMEDOWN>;
                debounce-interval = <100>;
        };
 
        volum_up {
                label = "Volum_up";
-               gpios = <&gpio5 10 GPIO_ACTIVE_LOW>;
+               gpios = <&gpio5 RK_PB2 GPIO_ACTIVE_LOW>;
                linux,code = <KEY_VOLUMEUP>;
                debounce-interval = <100>;
        };
@@ -165,10 +165,10 @@
                compatible = "elan,ekth3500";
                reg = <0x10>;
                interrupt-parent = <&gpio2>;
-               interrupts = <14 IRQ_TYPE_EDGE_FALLING>;
+               interrupts = <RK_PB6 IRQ_TYPE_EDGE_FALLING>;
                pinctrl-names = "default";
                pinctrl-0 = <&touch_int &touch_rst>;
-               reset-gpios = <&gpio2 15 GPIO_ACTIVE_LOW>;
+               reset-gpios = <&gpio2 RK_PB7 GPIO_ACTIVE_LOW>;
                vcc33-supply = <&vcc33_touch>;
                vccio-supply = <&vcc33_touch>;
        };
@@ -211,14 +211,14 @@
 
 &vcc_5v {
        enable-active-high;
-       gpio = <&gpio7 21 GPIO_ACTIVE_HIGH>;
+       gpio = <&gpio7 RK_PC5 GPIO_ACTIVE_HIGH>;
        pinctrl-names = "default";
        pinctrl-0 = <&drv_5v>;
 };
 
 &vcc50_hdmi {
        enable-active-high;
-       gpio = <&gpio5 19 GPIO_ACTIVE_HIGH>;
+       gpio = <&gpio5 RK_PC3 GPIO_ACTIVE_HIGH>;
        pinctrl-names = "default";
        pinctrl-0 = <&vcc50_hdmi_en>;
 };

diff --git a/arch/arm/boot/dts/rk3288-veyron-pinky.dts b/arch/arm/boot/dts/rk3288-veyron-pinky.dts
index d44351ec2333193491a229d717b3cc6776936ca9..995cff42fa43a2fb19fab79a68dcdec0473f7b3d 100644 (file)
--- a/arch/arm/boot/dts/rk3288-veyron-pinky.dts
+++ b/arch/arm/boot/dts/rk3288-veyron-pinky.dts
@@ -76,7 +76,7 @@
        pinctrl-0 = <&pwr_key_h &ap_lid_int_l>;
 
        power {
-               gpios = <&gpio0 5 GPIO_ACTIVE_HIGH>;
+               gpios = <&gpio0 RK_PA5 GPIO_ACTIVE_HIGH>;
        };
 };
 
@@ -126,7 +126,7 @@
        pinctrl-names = "default";
        pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd_disabled &sdmmc_cd_gpio
                     &sdmmc_wp_gpio &sdmmc_bus4>;
-       wp-gpios = <&gpio7 10 GPIO_ACTIVE_HIGH>;
+       wp-gpios = <&gpio7 RK_PB2 GPIO_ACTIVE_HIGH>;
 };
 
 &tsadc {

diff --git a/arch/arm/boot/dts/rk3288-veyron-sdmmc.dtsi b/arch/arm/boot/dts/rk3288-veyron-sdmmc.dtsi
index fec076eb7aef8f766c939e8b91dca6ef72595bb3..aef07101e9abaa549cc6e2fa3c311c4f5dbd47b2 100644 (file)
--- a/arch/arm/boot/dts/rk3288-veyron-sdmmc.dtsi
+++ b/arch/arm/boot/dts/rk3288-veyron-sdmmc.dtsi
@@ -115,7 +115,7 @@
        cap-mmc-highspeed;
        cap-sd-highspeed;
        card-detect-delay = <200>;
-       cd-gpios = <&gpio7 5 GPIO_ACTIVE_LOW>;
+       cd-gpios = <&gpio7 RK_PA5 GPIO_ACTIVE_LOW>;
        rockchip,default-sample-phase = <90>;
        num-slots = <1>;
        sd-uhs-sdr12;

diff --git a/arch/arm/boot/dts/rk3288-veyron-speedy.dts b/arch/arm/boot/dts/rk3288-veyron-speedy.dts
index a0d033f6fe5268fb4d087691c5c99cafba8d176b..cc0b78cefe34651843e8a9bc9cc388014137e375 100644 (file)
--- a/arch/arm/boot/dts/rk3288-veyron-speedy.dts
+++ b/arch/arm/boot/dts/rk3288-veyron-speedy.dts
@@ -57,7 +57,7 @@
        panel_regulator: panel-regulator {
                compatible = "regulator-fixed";
                enable-active-high;
-               gpio = <&gpio7 14 GPIO_ACTIVE_HIGH>;
+               gpio = <&gpio7 RK_PB6 GPIO_ACTIVE_HIGH>;
                pinctrl-names = "default";
                pinctrl-0 = <&lcd_enable_h>;
                regulator-name = "panel_regulator";
@@ -68,7 +68,7 @@
        vcc18_lcd: vcc18-lcd {
                compatible = "regulator-fixed";
                enable-active-high;
-               gpio = <&gpio2 13 GPIO_ACTIVE_HIGH>;
+               gpio = <&gpio2 RK_PB5 GPIO_ACTIVE_HIGH>;
                pinctrl-names = "default";
                pinctrl-0 = <&avdd_1v8_disp_en>;
                regulator-name = "vcc18_lcd";
@@ -80,7 +80,7 @@
        backlight_regulator: backlight-regulator {
                compatible = "regulator-fixed";
                enable-active-high;
-               gpio = <&gpio2 12 GPIO_ACTIVE_HIGH>;
+               gpio = <&gpio2 RK_PB4 GPIO_ACTIVE_HIGH>;
                pinctrl-names = "default";
                pinctrl-0 = <&bl_pwr_en>;
                regulator-name = "backlight_regulator";
@@ -126,14 +126,14 @@
 
 &vcc_5v {
        enable-active-high;
-       gpio = <&gpio7 21 GPIO_ACTIVE_HIGH>;
+       gpio = <&gpio7 RK_PC5 GPIO_ACTIVE_HIGH>;
        pinctrl-names = "default";
        pinctrl-0 = <&drv_5v>;
 };
 
 &vcc50_hdmi {
        enable-active-high;
-       gpio = <&gpio5 19 GPIO_ACTIVE_HIGH>;
+       gpio = <&gpio5 RK_PC3 GPIO_ACTIVE_HIGH>;
        pinctrl-names = "default";
        pinctrl-0 = <&vcc50_hdmi_en>;
 };

diff --git a/arch/arm/boot/dts/rk3288-veyron.dtsi b/arch/arm/boot/dts/rk3288-veyron.dtsi
index 2251d28e9d2a4fe949d8dcc2b8e775881e73daef..5d1eb0a2582755b274743bc7fefe556a170eb36b 100644 (file)
--- a/arch/arm/boot/dts/rk3288-veyron.dtsi
+++ b/arch/arm/boot/dts/rk3288-veyron.dtsi
@@ -61,7 +61,7 @@
                pinctrl-0 = <&pwr_key_l>;
                power {
                        label = "Power";
-                       gpios = <&gpio0 5 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio0 RK_PA5 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_POWER>;
                        debounce-interval = <100>;
                        wakeup-source;
@@ -70,7 +70,7 @@
 
        gpio-restart {
                compatible = "gpio-restart";
-               gpios = <&gpio0 13 GPIO_ACTIVE_HIGH>;
+               gpios = <&gpio0 RK_PB5 GPIO_ACTIVE_HIGH>;
                pinctrl-names = "default";
                pinctrl-0 = <&ap_warm_reset_h>;
                priority = <200>;
@@ -80,7 +80,7 @@
                compatible = "mmc-pwrseq-emmc";
                pinctrl-0 = <&emmc_reset>;
                pinctrl-names = "default";
-               reset-gpios = <&gpio2 9 GPIO_ACTIVE_HIGH>;
+               reset-gpios = <&gpio2 RK_PB1 GPIO_ACTIVE_HIGH>;
        };
 
        sdio_pwrseq: sdio-pwrseq {
@@ -96,7 +96,7 @@
                 * - SDIO_RESET_L_WL_REG_ON
                 * - PDN (power down when low)
                 */
-               reset-gpios = <&gpio4 28 GPIO_ACTIVE_LOW>;
+               reset-gpios = <&gpio4 RK_PD4 GPIO_ACTIVE_LOW>;
        };
 
        vcc_5v: vcc-5v {
@@ -178,7 +178,7 @@
                reg = <0x1b>;
                clock-output-names = "xin32k", "wifibt_32kin";
                interrupt-parent = <&gpio0>;
-               interrupts = <4 IRQ_TYPE_LEVEL_LOW>;
+               interrupts = <RK_PA4 IRQ_TYPE_LEVEL_LOW>;
                pinctrl-names = "default";
                pinctrl-0 = <&pmic_int_l>;
                rockchip,system-power-controller;