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>
This commit is contained in:
Andy Yan 2016-10-22 20:54:55 +08:00 committed by Heiko Stuebner
parent 0af13f7063
commit e9e79d5395
34 changed files with 160 additions and 160 deletions

View file

@ -56,7 +56,7 @@
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&emac_xfer>, <&emac_mdio>; pinctrl-0 = <&emac_xfer>, <&emac_mdio>;
phy = <&phy0>; 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 */ phy-reset-duration = <10>; /* millisecond */
status = "okay"; status = "okay";

View file

@ -55,7 +55,7 @@
compatible = "gpio-leds"; compatible = "gpio-leds";
work { work {
gpios = <&gpio2 30 GPIO_ACTIVE_HIGH>; gpios = <&gpio2 RK_PD6 GPIO_ACTIVE_HIGH>;
label = "kylin:red:led"; label = "kylin:red:led";
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&led_ctl>; pinctrl-0 = <&led_ctl>;
@ -74,9 +74,9 @@
* - SDIO_RESET_L_WL_RST * - SDIO_RESET_L_WL_RST
* - SDIO_RESET_L_BT_EN * - SDIO_RESET_L_BT_EN
*/ */
reset-gpios = <&gpio0 26 GPIO_ACTIVE_LOW>, /* WL_REG_ON */ reset-gpios = <&gpio0 RK_PD2 GPIO_ACTIVE_LOW>, /* WL_REG_ON */
<&gpio0 27 GPIO_ACTIVE_LOW>, /* WL_RST */ <&gpio0 RK_PD3 GPIO_ACTIVE_LOW>, /* WL_RST */
<&gpio2 9 GPIO_ACTIVE_LOW>; /* BT_EN */ <&gpio2 RK_PB1 GPIO_ACTIVE_LOW>; /* BT_EN */
}; };
sound { sound {
@ -121,7 +121,7 @@
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&emac_xfer>, <&emac_mdio>; pinctrl-0 = <&emac_xfer>, <&emac_mdio>;
phy = <&phy0>; 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 */ phy-reset-duration = <10>; /* millisecond */
status = "okay"; status = "okay";
@ -148,7 +148,7 @@
compatible = "rockchip,rk808"; compatible = "rockchip,rk808";
reg = <0x1b>; reg = <0x1b>;
interrupt-parent = <&gpio2>; interrupt-parent = <&gpio2>;
interrupts = <2 IRQ_TYPE_LEVEL_LOW>; interrupts = <RK_PA2 IRQ_TYPE_LEVEL_LOW>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pmic_int &global_pwroff>; pinctrl-0 = <&pmic_int &global_pwroff>;
rockchip,system-power-controller; rockchip,system-power-controller;

View file

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

View file

@ -69,7 +69,7 @@
regulator-name = "sdmmc-supply"; regulator-name = "sdmmc-supply";
regulator-min-microvolt = <3000000>; regulator-min-microvolt = <3000000>;
regulator-max-microvolt = <3000000>; regulator-max-microvolt = <3000000>;
gpio = <&gpio3 7 GPIO_ACTIVE_LOW>; gpio = <&gpio3 RK_PA7 GPIO_ACTIVE_LOW>;
startup-delay-us = <100000>; startup-delay-us = <100000>;
vin-supply = <&vcc_io>; vin-supply = <&vcc_io>;
}; };
@ -91,7 +91,7 @@
reg = <0x2d>; reg = <0x2d>;
interrupt-parent = <&gpio6>; interrupt-parent = <&gpio6>;
interrupts = <4 IRQ_TYPE_LEVEL_LOW>; interrupts = <RK_PA4 IRQ_TYPE_LEVEL_LOW>;
vcc1-supply = <&vsys>; vcc1-supply = <&vsys>;
vcc2-supply = <&vsys>; vcc2-supply = <&vsys>;
@ -186,7 +186,7 @@
phy0: ethernet-phy@0 { phy0: ethernet-phy@0 {
reg = <0>; reg = <0>;
interrupt-parent = <&gpio1>; interrupt-parent = <&gpio1>;
interrupts = <26 IRQ_TYPE_LEVEL_LOW>; interrupts = <RK_PD2 IRQ_TYPE_LEVEL_LOW>;
}; };
}; };

View file

@ -61,7 +61,7 @@
blue { blue {
label = "mk808:blue:power"; label = "mk808:blue:power";
gpios = <&gpio0 3 GPIO_ACTIVE_HIGH>; gpios = <&gpio0 RK_PA3 GPIO_ACTIVE_HIGH>;
default-state = "off"; default-state = "off";
linux,default-trigger = "default-on"; linux,default-trigger = "default-on";
}; };
@ -77,7 +77,7 @@
vcc_host: usb-host-regulator { vcc_host: usb-host-regulator {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
enable-active-high; enable-active-high;
gpio = <&gpio0 6 GPIO_ACTIVE_HIGH>; gpio = <&gpio0 RK_PA6 GPIO_ACTIVE_HIGH>;
pinctrl-0 = <&host_drv>; pinctrl-0 = <&host_drv>;
pinctrl-names = "default"; pinctrl-names = "default";
regulator-always-on; regulator-always-on;
@ -91,7 +91,7 @@
vcc_otg: usb-otg-regulator { vcc_otg: usb-otg-regulator {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
enable-active-high; enable-active-high;
gpio = <&gpio0 5 GPIO_ACTIVE_HIGH>; gpio = <&gpio0 RK_PA5 GPIO_ACTIVE_HIGH>;
pinctrl-0 = <&otg_drv>; pinctrl-0 = <&otg_drv>;
pinctrl-names = "default"; pinctrl-names = "default";
regulator-always-on; regulator-always-on;
@ -104,7 +104,7 @@
vcc_sd: sdmmc-regulator { vcc_sd: sdmmc-regulator {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
gpio = <&gpio3 7 GPIO_ACTIVE_LOW>; gpio = <&gpio3 RK_PA7 GPIO_ACTIVE_LOW>;
pinctrl-0 = <&sdmmc_pwr>; pinctrl-0 = <&sdmmc_pwr>;
pinctrl-names = "default"; pinctrl-names = "default";
regulator-name = "vcc_sd"; regulator-name = "vcc_sd";
@ -117,7 +117,7 @@
vcc_wifi: sdio-regulator { vcc_wifi: sdio-regulator {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
enable-active-high; enable-active-high;
gpio = <&gpio3 24 GPIO_ACTIVE_HIGH>; gpio = <&gpio3 RK_PD0 GPIO_ACTIVE_HIGH>;
pinctrl-0 = <&wifi_pwr>; pinctrl-0 = <&wifi_pwr>;
pinctrl-names = "default"; pinctrl-names = "default";
regulator-name = "vcc_wifi"; regulator-name = "vcc_wifi";

View file

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

View file

@ -62,7 +62,7 @@
autorepeat; autorepeat;
power { power {
gpios = <&gpio0 4 GPIO_ACTIVE_LOW>; gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_LOW>;
linux,code = <KEY_POWER>; linux,code = <KEY_POWER>;
label = "GPIO Key Power"; label = "GPIO Key Power";
linux,input-type = <1>; linux,input-type = <1>;
@ -102,7 +102,7 @@
compatible = "bosch,bma250"; compatible = "bosch,bma250";
reg = <0x18>; reg = <0x18>;
interrupt-parent = <&gpio0>; interrupt-parent = <&gpio0>;
interrupts = <15 IRQ_TYPE_LEVEL_LOW>; interrupts = <RK_PB7 IRQ_TYPE_LEVEL_LOW>;
}; };
}; };
@ -114,7 +114,7 @@
compatible = "rockchip,rk818"; compatible = "rockchip,rk818";
reg = <0x1c>; reg = <0x1c>;
interrupt-parent = <&gpio0>; interrupt-parent = <&gpio0>;
interrupts = <11 IRQ_TYPE_LEVEL_LOW>; interrupts = <RK_PB3 IRQ_TYPE_LEVEL_LOW>;
rockchip,system-power-controller; rockchip,system-power-controller;
wakeup-source; wakeup-source;
#clock-cells = <1>; #clock-cells = <1>;
@ -247,8 +247,8 @@
compatible = "silead,gsl1680"; compatible = "silead,gsl1680";
reg = <0x40>; reg = <0x40>;
interrupt-parent = <&gpio1>; interrupt-parent = <&gpio1>;
interrupts = <15 IRQ_TYPE_EDGE_FALLING>; interrupts = <RK_PB7 IRQ_TYPE_EDGE_FALLING>;
power-gpios = <&gpio0 14 GPIO_ACTIVE_HIGH>; power-gpios = <&gpio0 RK_PB6 GPIO_ACTIVE_HIGH>;
touchscreen-size-x = <800>; touchscreen-size-x = <800>;
touchscreen-size-y = <1280>; touchscreen-size-y = <1280>;
silead,max-fingers = <5>; silead,max-fingers = <5>;

View file

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

View file

@ -77,7 +77,7 @@
phy-mode = "rgmii"; phy-mode = "rgmii";
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&rgmii_pins>; 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-active-low;
snps,reset-delays-us = <0 10000 1000000>; snps,reset-delays-us = <0 10000 1000000>;
tx_delay = <0x30>; tx_delay = <0x30>;

View file

@ -47,7 +47,7 @@
vcc_lcd: vcc-lcd { vcc_lcd: vcc-lcd {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
enable-active-high; enable-active-high;
gpio = <&gpio7 3 GPIO_ACTIVE_HIGH>; gpio = <&gpio7 RK_PA3 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&lcd_en>; pinctrl-0 = <&lcd_en>;
regulator-name = "vcc_lcd"; regulator-name = "vcc_lcd";
@ -57,7 +57,7 @@
vcc_wl: vcc-wl { vcc_wl: vcc-wl {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
enable-active-high; enable-active-high;
gpio = <&gpio7 9 GPIO_ACTIVE_HIGH>; gpio = <&gpio7 RK_PB1 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&wifi_pwr>; pinctrl-0 = <&wifi_pwr>;
regulator-name = "vcc_wl"; regulator-name = "vcc_wl";
@ -96,7 +96,7 @@
reg = <0x51>; reg = <0x51>;
interrupt-parent = <&gpio0>; interrupt-parent = <&gpio0>;
interrupts = <4 IRQ_TYPE_EDGE_FALLING>; interrupts = <RK_PA4 IRQ_TYPE_EDGE_FALLING>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pmic_int>; pinctrl-0 = <&pmic_int>;

View file

@ -52,7 +52,7 @@
compatible = "rockchip,rk808"; compatible = "rockchip,rk808";
reg = <0x1b>; reg = <0x1b>;
interrupt-parent = <&gpio0>; interrupt-parent = <&gpio0>;
interrupts = <4 IRQ_TYPE_LEVEL_LOW>; interrupts = <RK_PA4 IRQ_TYPE_LEVEL_LOW>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pmic_int &global_pwroff>; pinctrl-0 = <&pmic_int &global_pwroff>;
rockchip,system-power-controller; rockchip,system-power-controller;

View file

@ -84,7 +84,7 @@
240 241 242 243 244 245 246 247 240 241 242 243 244 245 246 247
248 249 250 251 252 253 254 255>; 248 249 250 251 252 253 254 255>;
default-brightness-level = <128>; default-brightness-level = <128>;
enable-gpios = <&gpio7 2 GPIO_ACTIVE_HIGH>; enable-gpios = <&gpio7 RK_PA2 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&bl_en>; pinctrl-0 = <&bl_en>;
pwms = <&pwm0 0 1000000 PWM_POLARITY_INVERTED>; pwms = <&pwm0 0 1000000 PWM_POLARITY_INVERTED>;
@ -100,7 +100,7 @@
panel: panel { panel: panel {
compatible ="lg,lp079qx1-sp0v", "simple-panel"; compatible ="lg,lp079qx1-sp0v", "simple-panel";
backlight = <&backlight>; backlight = <&backlight>;
enable-gpios = <&gpio7 4 GPIO_ACTIVE_HIGH>; enable-gpios = <&gpio7 RK_PA4 GPIO_ACTIVE_HIGH>;
pinctrl-0 = <&lcd_cs>; pinctrl-0 = <&lcd_cs>;
ports { ports {
@ -120,7 +120,7 @@
pinctrl-0 = <&pwrbtn>; pinctrl-0 = <&pwrbtn>;
power { power {
gpios = <&gpio0 5 GPIO_ACTIVE_LOW>; gpios = <&gpio0 RK_PA5 GPIO_ACTIVE_LOW>;
linux,code = <KEY_POWER>; linux,code = <KEY_POWER>;
label = "GPIO Key Power"; label = "GPIO Key Power";
linux,input-type = <1>; linux,input-type = <1>;
@ -133,7 +133,7 @@
vcc_host: vcc-host-regulator { vcc_host: vcc-host-regulator {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
enable-active-high; enable-active-high;
gpio = <&gpio0 14 GPIO_ACTIVE_HIGH>; gpio = <&gpio0 RK_PB6 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&host_vbus_drv>; pinctrl-0 = <&host_vbus_drv>;
regulator-name = "vcc_host"; regulator-name = "vcc_host";
@ -144,7 +144,7 @@
vcc_phy: vcc-phy-regulator { vcc_phy: vcc-phy-regulator {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
enable-active-high; enable-active-high;
gpio = <&gpio0 6 GPIO_ACTIVE_HIGH>; gpio = <&gpio0 RK_PA6 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&eth_phy_pwr>; pinctrl-0 = <&eth_phy_pwr>;
regulator-name = "vcc_phy"; regulator-name = "vcc_phy";
@ -170,7 +170,7 @@
*/ */
vcc_sd: sdmmc-regulator { vcc_sd: sdmmc-regulator {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
gpio = <&gpio7 11 GPIO_ACTIVE_LOW>; gpio = <&gpio7 RK_PB3 GPIO_ACTIVE_LOW>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&sdmmc_pwr>; pinctrl-0 = <&sdmmc_pwr>;
regulator-name = "vcc_sd"; regulator-name = "vcc_sd";
@ -236,7 +236,7 @@
phy-supply = <&vcc_phy>; phy-supply = <&vcc_phy>;
phy-mode = "rgmii"; phy-mode = "rgmii";
clock_in_out = "input"; 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-active-low;
snps,reset-delays-us = <0 10000 1000000>; snps,reset-delays-us = <0 10000 1000000>;
assigned-clocks = <&cru SCLK_MAC>; assigned-clocks = <&cru SCLK_MAC>;

View file

@ -93,7 +93,7 @@
phy-mode = "rgmii"; phy-mode = "rgmii";
snps,reset-active-low; snps,reset-active-low;
snps,reset-delays-us = <0 10000 1000000>; 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>; tx_delay = <0x30>;
rx_delay = <0x10>; rx_delay = <0x10>;
status = "okay"; status = "okay";
@ -111,7 +111,7 @@
compatible = "rockchip,rk808"; compatible = "rockchip,rk808";
reg = <0x1b>; reg = <0x1b>;
interrupt-parent = <&gpio0>; interrupt-parent = <&gpio0>;
interrupts = <4 IRQ_TYPE_LEVEL_LOW>; interrupts = <RK_PA4 IRQ_TYPE_LEVEL_LOW>;
#clock-cells = <1>; #clock-cells = <1>;
clock-output-names = "xin32k", "rk808-clkout2"; clock-output-names = "xin32k", "rk808-clkout2";
pinctrl-names = "default"; pinctrl-names = "default";
@ -345,7 +345,7 @@
&usbphy { &usbphy {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&host_drv>; pinctrl-0 = <&host_drv>;
vbus_drv-gpios = <&gpio0 14 GPIO_ACTIVE_HIGH>; vbus_drv-gpios = <&gpio0 RK_PB6 GPIO_ACTIVE_HIGH>;
status = "okay"; status = "okay";
}; };

View file

@ -49,7 +49,7 @@
}; };
&ir { &ir {
gpios = <&gpio7 5 GPIO_ACTIVE_LOW>; gpios = <&gpio7 RK_PA5 GPIO_ACTIVE_LOW>;
}; };
&pinctrl { &pinctrl {

View file

@ -96,7 +96,7 @@
phy-mode = "rgmii"; phy-mode = "rgmii";
snps,reset-active-low; snps,reset-active-low;
snps,reset-delays-us = <0 10000 1000000>; 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>; tx_delay = <0x30>;
rx_delay = <0x10>; rx_delay = <0x10>;
status = "ok"; status = "ok";

View file

@ -53,7 +53,7 @@
power { power {
wakeup-source; wakeup-source;
gpios = <&gpio0 5 GPIO_ACTIVE_LOW>; gpios = <&gpio0 RK_PA5 GPIO_ACTIVE_LOW>;
label = "GPIO Power"; label = "GPIO Power";
linux,code = <KEY_POWER>; linux,code = <KEY_POWER>;
pinctrl-names = "default"; pinctrl-names = "default";
@ -63,14 +63,14 @@
ir-receiver { ir-receiver {
compatible = "gpio-ir-receiver"; compatible = "gpio-ir-receiver";
gpios = <&gpio7 0 GPIO_ACTIVE_LOW>; gpios = <&gpio7 RK_PA0 GPIO_ACTIVE_LOW>;
}; };
leds { leds {
compatible = "gpio-leds"; compatible = "gpio-leds";
power { power {
gpios = <&gpio8 2 GPIO_ACTIVE_LOW>; gpios = <&gpio8 RK_PA2 GPIO_ACTIVE_LOW>;
label = "firefly:blue:power"; label = "firefly:blue:power";
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&power_led>; pinctrl-0 = <&power_led>;
@ -78,7 +78,7 @@
}; };
work { work {
gpios = <&gpio8 1 GPIO_ACTIVE_LOW>; gpios = <&gpio8 RK_PA1 GPIO_ACTIVE_LOW>;
label = "firefly:blue:user"; label = "firefly:blue:user";
linux,default-trigger = "rc-feedback"; linux,default-trigger = "rc-feedback";
pinctrl-names = "default"; pinctrl-names = "default";
@ -92,7 +92,7 @@
clock-names = "ext_clock"; clock-names = "ext_clock";
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&wifi_enable>; pinctrl-0 = <&wifi_enable>;
reset-gpios = <&gpio4 28 GPIO_ACTIVE_LOW>; reset-gpios = <&gpio4 RK_PD4 GPIO_ACTIVE_LOW>;
}; };
sound { sound {
@ -112,7 +112,7 @@
vcc_host_5v: usb-host-regulator { vcc_host_5v: usb-host-regulator {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
enable-active-high; enable-active-high;
gpio = <&gpio0 14 GPIO_ACTIVE_HIGH>; gpio = <&gpio0 RK_PB6 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&host_vbus_drv>; pinctrl-0 = <&host_vbus_drv>;
regulator-name = "vcc_host_5v"; regulator-name = "vcc_host_5v";
@ -133,7 +133,7 @@
vcc_sd: sdmmc-regulator { vcc_sd: sdmmc-regulator {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
gpio = <&gpio7 11 GPIO_ACTIVE_LOW>; gpio = <&gpio7 RK_PB3 GPIO_ACTIVE_LOW>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&sdmmc_pwr>; pinctrl-0 = <&sdmmc_pwr>;
regulator-name = "vcc_sd"; regulator-name = "vcc_sd";
@ -146,7 +146,7 @@
vcc_otg_5v: usb-otg-regulator { vcc_otg_5v: usb-otg-regulator {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
enable-active-high; enable-active-high;
gpio = <&gpio0 12 GPIO_ACTIVE_HIGH>; gpio = <&gpio0 RK_PB4 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&otg_vbus_drv>; pinctrl-0 = <&otg_vbus_drv>;
regulator-name = "vcc_otg_5v"; regulator-name = "vcc_otg_5v";
@ -159,7 +159,7 @@
dovdd_1v8: dovdd-1v8-regulator { dovdd_1v8: dovdd-1v8-regulator {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
enable-active-high; enable-active-high;
gpio = <&gpio0 11 GPIO_ACTIVE_HIGH>; gpio = <&gpio0 RK_PB3 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&dvp_pwr>; pinctrl-0 = <&dvp_pwr>;
regulator-name = "dovdd_1v8"; regulator-name = "dovdd_1v8";
@ -171,7 +171,7 @@
vcc28_dvp: vcc28-dvp-regulator { vcc28_dvp: vcc28-dvp-regulator {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
enable-active-high; enable-active-high;
gpio = <&gpio0 11 GPIO_ACTIVE_HIGH>; gpio = <&gpio0 RK_PB3 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&dvp_pwr>; pinctrl-0 = <&dvp_pwr>;
regulator-name = "vcc28_dvp"; regulator-name = "vcc28_dvp";
@ -183,7 +183,7 @@
af_28: af_28-regulator { af_28: af_28-regulator {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
enable-active-high; enable-active-high;
gpio = <&gpio0 11 GPIO_ACTIVE_HIGH>; gpio = <&gpio0 RK_PB3 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&dvp_pwr>; pinctrl-0 = <&dvp_pwr>;
regulator-name = "af_28"; regulator-name = "af_28";
@ -195,7 +195,7 @@
dvdd_1v2: af_28-regulator { dvdd_1v2: af_28-regulator {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
enable-active-high; enable-active-high;
gpio = <&gpio7 12 GPIO_ACTIVE_HIGH>; gpio = <&gpio7 RK_PB4 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&cif_pwr>; pinctrl-0 = <&cif_pwr>;
regulator-name = "dvdd_1v2"; regulator-name = "dvdd_1v2";
@ -221,7 +221,7 @@
clock-frequency = <32768>; clock-frequency = <32768>;
clock-output-names = "xin32k"; clock-output-names = "xin32k";
interrupt-parent = <&gpio7>; interrupt-parent = <&gpio7>;
interrupts = <4 IRQ_TYPE_EDGE_FALLING>; interrupts = <RK_PA4 IRQ_TYPE_EDGE_FALLING>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&rtc_int>; pinctrl-0 = <&rtc_int>;
}; };

View file

@ -49,7 +49,7 @@
}; };
&ir { &ir {
gpios = <&gpio7 0 GPIO_ACTIVE_LOW>; gpios = <&gpio7 RK_PA0 GPIO_ACTIVE_LOW>;
}; };
&pinctrl { &pinctrl {

View file

@ -75,7 +75,7 @@
power { power {
wakeup-source; wakeup-source;
gpios = <&gpio0 5 GPIO_ACTIVE_LOW>; gpios = <&gpio0 RK_PA5 GPIO_ACTIVE_LOW>;
label = "GPIO Power"; label = "GPIO Power";
linux,code = <KEY_POWER>; linux,code = <KEY_POWER>;
pinctrl-names = "default"; pinctrl-names = "default";
@ -87,7 +87,7 @@
compatible = "gpio-leds"; compatible = "gpio-leds";
work { work {
gpios = <&gpio8 1 GPIO_ACTIVE_LOW>; gpios = <&gpio8 RK_PA1 GPIO_ACTIVE_LOW>;
label = "firefly:blue:user"; label = "firefly:blue:user";
linux,default-trigger = "rc-feedback"; linux,default-trigger = "rc-feedback";
pinctrl-names = "default"; pinctrl-names = "default";
@ -95,7 +95,7 @@
}; };
power { power {
gpios = <&gpio8 2 GPIO_ACTIVE_LOW>; gpios = <&gpio8 RK_PA2 GPIO_ACTIVE_LOW>;
label = "firefly:green:power"; label = "firefly:green:power";
linux,default-trigger = "default-on"; linux,default-trigger = "default-on";
pinctrl-names = "default"; pinctrl-names = "default";
@ -114,7 +114,7 @@
vcc_sd: sdmmc-regulator { vcc_sd: sdmmc-regulator {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
gpio = <&gpio7 11 GPIO_ACTIVE_LOW>; gpio = <&gpio7 RK_PB3 GPIO_ACTIVE_LOW>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&sdmmc_pwr>; pinctrl-0 = <&sdmmc_pwr>;
regulator-name = "vcc_sd"; regulator-name = "vcc_sd";
@ -145,7 +145,7 @@
vcc_host_5v: usb-host-regulator { vcc_host_5v: usb-host-regulator {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
enable-active-high; enable-active-high;
gpio = <&gpio0 14 GPIO_ACTIVE_HIGH>; gpio = <&gpio0 RK_PB6 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&host_vbus_drv>; pinctrl-0 = <&host_vbus_drv>;
regulator-name = "vcc_host_5v"; regulator-name = "vcc_host_5v";
@ -158,7 +158,7 @@
vcc_otg_5v: usb-otg-regulator { vcc_otg_5v: usb-otg-regulator {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
enable-active-high; enable-active-high;
gpio = <&gpio0 12 GPIO_ACTIVE_HIGH>; gpio = <&gpio0 RK_PB4 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&otg_vbus_drv>; pinctrl-0 = <&otg_vbus_drv>;
regulator-name = "vcc_otg_5v"; regulator-name = "vcc_otg_5v";
@ -175,7 +175,7 @@
vcc28_dvp: vcc28-dvp-regulator { vcc28_dvp: vcc28-dvp-regulator {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
enable-active-high; enable-active-high;
gpio = <&gpio0 11 GPIO_ACTIVE_HIGH>; gpio = <&gpio0 RK_PB3 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&dvp_pwr>; pinctrl-0 = <&dvp_pwr>;
regulator-name = "vcc28_dvp"; regulator-name = "vcc28_dvp";
@ -213,7 +213,7 @@
phy-mode = "rgmii"; phy-mode = "rgmii";
snps,reset-active-low; snps,reset-active-low;
snps,reset-delays-us = <0 10000 1000000>; 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>; tx_delay = <0x30>;
rx_delay = <0x10>; rx_delay = <0x10>;
status = "ok"; status = "ok";
@ -260,7 +260,7 @@
clock-frequency = <32768>; clock-frequency = <32768>;
clock-output-names = "xin32k"; clock-output-names = "xin32k";
interrupt-parent = <&gpio7>; interrupt-parent = <&gpio7>;
interrupts = <4 IRQ_TYPE_EDGE_FALLING>; interrupts = <RK_PA4 IRQ_TYPE_EDGE_FALLING>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&rtc_int>; pinctrl-0 = <&rtc_int>;
}; };

View file

@ -68,7 +68,7 @@
compatible = "gpio-leds"; compatible = "gpio-leds";
work { work {
gpios = <&gpio7 4 GPIO_ACTIVE_LOW>; gpios = <&gpio7 RK_PA4 GPIO_ACTIVE_LOW>;
label = "miqi:green:user"; label = "miqi:green:user";
linux,default-trigger = "default-on"; linux,default-trigger = "default-on";
pinctrl-names = "default"; pinctrl-names = "default";
@ -87,7 +87,7 @@
vcc_host: usb-host-regulator { vcc_host: usb-host-regulator {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
enable-active-high; enable-active-high;
gpio = <&gpio0 14 GPIO_ACTIVE_HIGH>; gpio = <&gpio0 RK_PB6 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&host_vbus_drv>; pinctrl-0 = <&host_vbus_drv>;
regulator-name = "vcc_host"; regulator-name = "vcc_host";
@ -99,7 +99,7 @@
vcc_sd: sdmmc-regulator { vcc_sd: sdmmc-regulator {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
gpio = <&gpio7 11 GPIO_ACTIVE_LOW>; gpio = <&gpio7 RK_PB3 GPIO_ACTIVE_LOW>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&sdmmc_pwr>; pinctrl-0 = <&sdmmc_pwr>;
regulator-name = "vcc_sd"; regulator-name = "vcc_sd";
@ -146,7 +146,7 @@
phy-mode = "rgmii"; phy-mode = "rgmii";
snps,reset-active-low; snps,reset-active-low;
snps,reset-delays-us = <0 10000 1000000>; 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>; tx_delay = <0x30>;
rx_delay = <0x10>; rx_delay = <0x10>;
status = "ok"; status = "ok";

View file

@ -180,7 +180,7 @@
phy-supply = <&vcc_lan>; phy-supply = <&vcc_lan>;
phy-mode = "rgmii"; phy-mode = "rgmii";
clock_in_out = "input"; 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-active-low;
snps,reset-delays-us = <0 10000 1000000>; snps,reset-delays-us = <0 10000 1000000>;
assigned-clocks = <&cru SCLK_MAC>; assigned-clocks = <&cru SCLK_MAC>;
@ -205,7 +205,7 @@
compatible = "rockchip,rk808"; compatible = "rockchip,rk808";
reg = <0x1b>; reg = <0x1b>;
interrupt-parent = <&gpio0>; interrupt-parent = <&gpio0>;
interrupts = <4 IRQ_TYPE_LEVEL_LOW>; interrupts = <RK_PA4 IRQ_TYPE_LEVEL_LOW>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pmic_int &global_pwroff>; pinctrl-0 = <&pmic_int &global_pwroff>;
rockchip,system-power-controller; rockchip,system-power-controller;
@ -390,7 +390,7 @@
compatible = "asahi-kasei,ak8975"; compatible = "asahi-kasei,ak8975";
reg = <0x0d>; reg = <0x0d>;
interrupt-parent = <&gpio8>; interrupt-parent = <&gpio8>;
interrupts = <1 IRQ_TYPE_EDGE_RISING>; interrupts = <RK_PA1 IRQ_TYPE_EDGE_RISING>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&comp_int>; pinctrl-0 = <&comp_int>;
vdd-supply = <&vcc_io>; vdd-supply = <&vcc_io>;
@ -409,7 +409,7 @@
compatible = "fsl,mma8452"; compatible = "fsl,mma8452";
reg = <0x1d>; reg = <0x1d>;
interrupt-parent = <&gpio8>; interrupt-parent = <&gpio8>;
interrupts = <0 IRQ_TYPE_EDGE_RISING>; interrupts = <RK_PA0 IRQ_TYPE_EDGE_RISING>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&gsensor_int>; pinctrl-0 = <&gsensor_int>;
}; };

View file

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

View file

@ -51,7 +51,7 @@
compatible = "mmc-pwrseq-emmc"; compatible = "mmc-pwrseq-emmc";
pinctrl-0 = <&emmc_reset>; pinctrl-0 = <&emmc_reset>;
pinctrl-names = "default"; pinctrl-names = "default";
reset-gpios = <&gpio3 9 GPIO_ACTIVE_LOW>; reset-gpios = <&gpio3 RK_PB1 GPIO_ACTIVE_LOW>;
}; };
ext_gmac: external-gmac-clock { ext_gmac: external-gmac-clock {
@ -106,7 +106,7 @@
phy-supply = <&vccio_pmu>; phy-supply = <&vccio_pmu>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&rgmii_pins &phy_rst>; 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-active-low;
snps,reset-delays-us = <0 10000 30000>; snps,reset-delays-us = <0 10000 30000>;
rx_delay = <0x10>; rx_delay = <0x10>;

View file

@ -53,13 +53,13 @@
compatible = "gpio-leds"; compatible = "gpio-leds";
heartbeat { heartbeat {
gpios = <&gpio7 15 GPIO_ACTIVE_LOW>; gpios = <&gpio7 RK_PB7 GPIO_ACTIVE_LOW>;
label = "rock2:green:state1"; label = "rock2:green:state1";
linux,default-trigger = "heartbeat"; linux,default-trigger = "heartbeat";
}; };
mmc { mmc {
gpios = <&gpio0 11 GPIO_ACTIVE_LOW>; gpios = <&gpio0 RK_PB3 GPIO_ACTIVE_LOW>;
label = "rock2:blue:state2"; label = "rock2:blue:state2";
linux,default-trigger = "mmc0"; linux,default-trigger = "mmc0";
}; };
@ -67,7 +67,7 @@
ir: ir-receiver { ir: ir-receiver {
compatible = "gpio-ir-receiver"; compatible = "gpio-ir-receiver";
gpios = <&gpio8 1 GPIO_ACTIVE_LOW>; gpios = <&gpio8 RK_PA1 GPIO_ACTIVE_LOW>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&ir_int>; pinctrl-0 = <&ir_int>;
}; };
@ -92,13 +92,13 @@
clock-names = "ext_clock"; clock-names = "ext_clock";
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&wifi_enable>; 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 { vcc_usb_host: vcc-host-regulator {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
enable-active-high; enable-active-high;
gpio = <&gpio0 14 GPIO_ACTIVE_HIGH>; gpio = <&gpio0 RK_PB6 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&host_vbus_drv>; pinctrl-0 = <&host_vbus_drv>;
/* Always on as the rockchip usb phy doesn't have a vbus-supply /* Always on as the rockchip usb phy doesn't have a vbus-supply
@ -110,7 +110,7 @@
vcc_sd: sdmmc-regulator { vcc_sd: sdmmc-regulator {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
gpio = <&gpio7 11 GPIO_ACTIVE_LOW>; gpio = <&gpio7 RK_PB3 GPIO_ACTIVE_LOW>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&sdmmc_pwr>; pinctrl-0 = <&sdmmc_pwr>;
regulator-name = "vcc_sd"; regulator-name = "vcc_sd";
@ -166,7 +166,7 @@
clock-frequency = <32768>; clock-frequency = <32768>;
clock-output-names = "xin32k"; clock-output-names = "xin32k";
interrupt-parent = <&gpio0>; interrupt-parent = <&gpio0>;
interrupts = <4 IRQ_TYPE_EDGE_FALLING>; interrupts = <RK_PA4 IRQ_TYPE_EDGE_FALLING>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pmic_int>; pinctrl-0 = <&pmic_int>;

View file

@ -17,8 +17,8 @@
rockchip,model = "VEYRON-I2S"; rockchip,model = "VEYRON-I2S";
rockchip,i2s-controller = <&i2s>; rockchip,i2s-controller = <&i2s>;
rockchip,audio-codec = <&max98090>; rockchip,audio-codec = <&max98090>;
rockchip,hp-det-gpios = <&gpio6 5 GPIO_ACTIVE_HIGH>; rockchip,hp-det-gpios = <&gpio6 RK_PA5 GPIO_ACTIVE_HIGH>;
rockchip,mic-det-gpios = <&gpio6 11 GPIO_ACTIVE_LOW>; rockchip,mic-det-gpios = <&gpio6 RK_PB3 GPIO_ACTIVE_LOW>;
rockchip,headset-codec = <&headsetcodec>; rockchip,headset-codec = <&headsetcodec>;
}; };
}; };
@ -28,7 +28,7 @@
compatible = "maxim,max98090"; compatible = "maxim,max98090";
reg = <0x10>; reg = <0x10>;
interrupt-parent = <&gpio6>; interrupt-parent = <&gpio6>;
interrupts = <7 IRQ_TYPE_EDGE_FALLING>; interrupts = <RK_PA7 IRQ_TYPE_EDGE_FALLING>;
clock-names = "mclk"; clock-names = "mclk";
clocks = <&cru SCLK_I2S0_OUT>; clocks = <&cru SCLK_I2S0_OUT>;
pinctrl-names = "default"; pinctrl-names = "default";
@ -41,7 +41,7 @@
compatible = "ti,ts3a227e"; compatible = "ti,ts3a227e";
reg = <0x3b>; reg = <0x3b>;
interrupt-parent = <&gpio0>; interrupt-parent = <&gpio0>;
interrupts = <3 IRQ_TYPE_LEVEL_LOW>; interrupts = <RK_PA3 IRQ_TYPE_LEVEL_LOW>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&ts3a227e_int_l>; pinctrl-0 = <&ts3a227e_int_l>;
ti,micbias = <7>; /* MICBIAS = 2.8V */ ti,micbias = <7>; /* MICBIAS = 2.8V */

View file

@ -67,7 +67,7 @@
vcc5_host2: vcc5-host2-regulator { vcc5_host2: vcc5-host2-regulator {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
enable-active-high; enable-active-high;
gpio = <&gpio0 12 GPIO_ACTIVE_HIGH>; gpio = <&gpio0 RK_PB4 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&usb2_pwr_en>; pinctrl-0 = <&usb2_pwr_en>;
regulator-name = "vcc5_host2"; regulator-name = "vcc5_host2";
@ -103,8 +103,8 @@
&rk808 { &rk808 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pmic_int_l &dvs_1 &dvs_2>; pinctrl-0 = <&pmic_int_l &dvs_1 &dvs_2>;
dvs-gpios = <&gpio7 11 GPIO_ACTIVE_HIGH>, dvs-gpios = <&gpio7 RK_PB3 GPIO_ACTIVE_HIGH>,
<&gpio7 15 GPIO_ACTIVE_HIGH>; <&gpio7 RK_PB7 GPIO_ACTIVE_HIGH>;
/delete-property/ vcc6-supply; /delete-property/ vcc6-supply;
@ -133,7 +133,7 @@
&vcc50_hdmi { &vcc50_hdmi {
enable-active-high; enable-active-high;
gpio = <&gpio7 2 GPIO_ACTIVE_HIGH>; gpio = <&gpio7 RK_PA2 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&vcc50_hdmi_en>; pinctrl-0 = <&vcc50_hdmi_en>;
}; };

View file

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

View file

@ -57,7 +57,7 @@
panel_regulator: panel-regulator { panel_regulator: panel-regulator {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
enable-active-high; enable-active-high;
gpio = <&gpio7 14 GPIO_ACTIVE_HIGH>; gpio = <&gpio7 RK_PB6 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&lcd_enable_h>; pinctrl-0 = <&lcd_enable_h>;
regulator-name = "panel_regulator"; regulator-name = "panel_regulator";
@ -68,7 +68,7 @@
vcc18_lcd: vcc18-lcd { vcc18_lcd: vcc18-lcd {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
enable-active-high; enable-active-high;
gpio = <&gpio2 13 GPIO_ACTIVE_HIGH>; gpio = <&gpio2 RK_PB5 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&avdd_1v8_disp_en>; pinctrl-0 = <&avdd_1v8_disp_en>;
regulator-name = "vcc18_lcd"; regulator-name = "vcc18_lcd";
@ -80,7 +80,7 @@
backlight_regulator: backlight-regulator { backlight_regulator: backlight-regulator {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
enable-active-high; enable-active-high;
gpio = <&gpio2 12 GPIO_ACTIVE_HIGH>; gpio = <&gpio2 RK_PB4 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&bl_pwr_en>; pinctrl-0 = <&bl_pwr_en>;
regulator-name = "backlight_regulator"; regulator-name = "backlight_regulator";
@ -134,8 +134,8 @@
&rk808 { &rk808 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pmic_int_l &dvs_1 &dvs_2>; pinctrl-0 = <&pmic_int_l &dvs_1 &dvs_2>;
dvs-gpios = <&gpio7 12 GPIO_ACTIVE_HIGH>, dvs-gpios = <&gpio7 RK_PB4 GPIO_ACTIVE_HIGH>,
<&gpio7 15 GPIO_ACTIVE_HIGH>; <&gpio7 RK_PB7 GPIO_ACTIVE_HIGH>;
regulators { regulators {
mic_vcc: LDO_REG2 { mic_vcc: LDO_REG2 {
@ -160,14 +160,14 @@
&vcc_5v { &vcc_5v {
enable-active-high; enable-active-high;
gpio = <&gpio7 21 GPIO_ACTIVE_HIGH>; gpio = <&gpio7 RK_PC5 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&drv_5v>; pinctrl-0 = <&drv_5v>;
}; };
&vcc50_hdmi { &vcc50_hdmi {
enable-active-high; enable-active-high;
gpio = <&gpio5 19 GPIO_ACTIVE_HIGH>; gpio = <&gpio5 RK_PC3 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&vcc50_hdmi_en>; pinctrl-0 = <&vcc50_hdmi_en>;
}; };

View file

@ -56,7 +56,7 @@
panel_regulator: panel-regulator { panel_regulator: panel-regulator {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
enable-active-high; enable-active-high;
gpio = <&gpio7 14 GPIO_ACTIVE_HIGH>; gpio = <&gpio7 RK_PB6 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&lcd_enable_h>; pinctrl-0 = <&lcd_enable_h>;
regulator-name = "panel_regulator"; regulator-name = "panel_regulator";
@ -67,7 +67,7 @@
vcc18_lcd: vcc18-lcd { vcc18_lcd: vcc18-lcd {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
enable-active-high; enable-active-high;
gpio = <&gpio2 13 GPIO_ACTIVE_HIGH>; gpio = <&gpio2 RK_PB5 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&avdd_1v8_disp_en>; pinctrl-0 = <&avdd_1v8_disp_en>;
regulator-name = "vcc18_lcd"; regulator-name = "vcc18_lcd";
@ -79,7 +79,7 @@
backlight_regulator: backlight-regulator { backlight_regulator: backlight-regulator {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
enable-active-high; enable-active-high;
gpio = <&gpio2 12 GPIO_ACTIVE_HIGH>; gpio = <&gpio2 RK_PB4 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&bl_pwr_en>; pinctrl-0 = <&bl_pwr_en>;
regulator-name = "backlight_regulator"; regulator-name = "backlight_regulator";
@ -123,14 +123,14 @@
&vcc_5v { &vcc_5v {
enable-active-high; enable-active-high;
gpio = <&gpio7 21 GPIO_ACTIVE_HIGH>; gpio = <&gpio7 RK_PC5 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&drv_5v>; pinctrl-0 = <&drv_5v>;
}; };
&vcc50_hdmi { &vcc50_hdmi {
enable-active-high; enable-active-high;
gpio = <&gpio5 19 GPIO_ACTIVE_HIGH>; gpio = <&gpio5 RK_PC3 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&vcc50_hdmi_en>; pinctrl-0 = <&vcc50_hdmi_en>;
}; };
@ -197,7 +197,7 @@
trackpad@2c { trackpad@2c {
compatible = "hid-over-i2c"; compatible = "hid-over-i2c";
interrupt-parent = <&gpio7>; interrupt-parent = <&gpio7>;
interrupts = <3 IRQ_TYPE_EDGE_FALLING>; interrupts = <RK_PA3 IRQ_TYPE_EDGE_FALLING>;
reg = <0x2c>; reg = <0x2c>;
hid-descr-addr = <0x0020>; hid-descr-addr = <0x0020>;
vcc-supply = <&vcc33_io>; vcc-supply = <&vcc33_io>;

View file

@ -182,8 +182,8 @@
&rk808 { &rk808 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pmic_int_l &dvs_1 &dvs_2>; pinctrl-0 = <&pmic_int_l &dvs_1 &dvs_2>;
dvs-gpios = <&gpio7 12 GPIO_ACTIVE_HIGH>, dvs-gpios = <&gpio7 RK_PB4 GPIO_ACTIVE_HIGH>,
<&gpio7 15 GPIO_ACTIVE_HIGH>; <&gpio7 RK_PB7 GPIO_ACTIVE_HIGH>;
/delete-property/ vcc6-supply; /delete-property/ vcc6-supply;
/delete-property/ vcc12-supply; /delete-property/ vcc12-supply;
@ -244,7 +244,7 @@
&vcc50_hdmi { &vcc50_hdmi {
enable-active-high; enable-active-high;
gpio = <&gpio7 11 GPIO_ACTIVE_HIGH>; gpio = <&gpio7 RK_PB3 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&power_hdmi_on>; pinctrl-0 = <&power_hdmi_on>;
}; };

View file

@ -55,7 +55,7 @@
backlight_regulator: backlight-regulator { backlight_regulator: backlight-regulator {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
enable-active-high; enable-active-high;
gpio = <&gpio2 12 GPIO_ACTIVE_HIGH>; gpio = <&gpio2 RK_PB4 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&bl_pwr_en>; pinctrl-0 = <&bl_pwr_en>;
regulator-name = "backlight_regulator"; regulator-name = "backlight_regulator";
@ -66,7 +66,7 @@
panel_regulator: panel-regulator { panel_regulator: panel-regulator {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
enable-active-high; enable-active-high;
gpio = <&gpio7 14 GPIO_ACTIVE_HIGH>; gpio = <&gpio7 RK_PB6 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&lcd_enable_h>; pinctrl-0 = <&lcd_enable_h>;
regulator-name = "panel_regulator"; regulator-name = "panel_regulator";
@ -77,7 +77,7 @@
vcc18_lcd: vcc18-lcd { vcc18_lcd: vcc18-lcd {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
enable-active-high; enable-active-high;
gpio = <&gpio2 13 GPIO_ACTIVE_HIGH>; gpio = <&gpio2 RK_PB5 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&avdd_1v8_disp_en>; pinctrl-0 = <&avdd_1v8_disp_en>;
regulator-name = "vcc18_lcd"; regulator-name = "vcc18_lcd";
@ -134,14 +134,14 @@
volum_down { volum_down {
label = "Volum_down"; label = "Volum_down";
gpios = <&gpio5 11 GPIO_ACTIVE_LOW>; gpios = <&gpio5 RK_PB3 GPIO_ACTIVE_LOW>;
linux,code = <KEY_VOLUMEDOWN>; linux,code = <KEY_VOLUMEDOWN>;
debounce-interval = <100>; debounce-interval = <100>;
}; };
volum_up { volum_up {
label = "Volum_up"; label = "Volum_up";
gpios = <&gpio5 10 GPIO_ACTIVE_LOW>; gpios = <&gpio5 RK_PB2 GPIO_ACTIVE_LOW>;
linux,code = <KEY_VOLUMEUP>; linux,code = <KEY_VOLUMEUP>;
debounce-interval = <100>; debounce-interval = <100>;
}; };
@ -165,10 +165,10 @@
compatible = "elan,ekth3500"; compatible = "elan,ekth3500";
reg = <0x10>; reg = <0x10>;
interrupt-parent = <&gpio2>; interrupt-parent = <&gpio2>;
interrupts = <14 IRQ_TYPE_EDGE_FALLING>; interrupts = <RK_PB6 IRQ_TYPE_EDGE_FALLING>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&touch_int &touch_rst>; 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>; vcc33-supply = <&vcc33_touch>;
vccio-supply = <&vcc33_touch>; vccio-supply = <&vcc33_touch>;
}; };
@ -211,14 +211,14 @@
&vcc_5v { &vcc_5v {
enable-active-high; enable-active-high;
gpio = <&gpio7 21 GPIO_ACTIVE_HIGH>; gpio = <&gpio7 RK_PC5 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&drv_5v>; pinctrl-0 = <&drv_5v>;
}; };
&vcc50_hdmi { &vcc50_hdmi {
enable-active-high; enable-active-high;
gpio = <&gpio5 19 GPIO_ACTIVE_HIGH>; gpio = <&gpio5 RK_PC3 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&vcc50_hdmi_en>; pinctrl-0 = <&vcc50_hdmi_en>;
}; };

View file

@ -76,7 +76,7 @@
pinctrl-0 = <&pwr_key_h &ap_lid_int_l>; pinctrl-0 = <&pwr_key_h &ap_lid_int_l>;
power { power {
gpios = <&gpio0 5 GPIO_ACTIVE_HIGH>; gpios = <&gpio0 RK_PA5 GPIO_ACTIVE_HIGH>;
}; };
}; };
@ -126,7 +126,7 @@
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd_disabled &sdmmc_cd_gpio pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd_disabled &sdmmc_cd_gpio
&sdmmc_wp_gpio &sdmmc_bus4>; &sdmmc_wp_gpio &sdmmc_bus4>;
wp-gpios = <&gpio7 10 GPIO_ACTIVE_HIGH>; wp-gpios = <&gpio7 RK_PB2 GPIO_ACTIVE_HIGH>;
}; };
&tsadc { &tsadc {

View file

@ -115,7 +115,7 @@
cap-mmc-highspeed; cap-mmc-highspeed;
cap-sd-highspeed; cap-sd-highspeed;
card-detect-delay = <200>; card-detect-delay = <200>;
cd-gpios = <&gpio7 5 GPIO_ACTIVE_LOW>; cd-gpios = <&gpio7 RK_PA5 GPIO_ACTIVE_LOW>;
rockchip,default-sample-phase = <90>; rockchip,default-sample-phase = <90>;
num-slots = <1>; num-slots = <1>;
sd-uhs-sdr12; sd-uhs-sdr12;

View file

@ -57,7 +57,7 @@
panel_regulator: panel-regulator { panel_regulator: panel-regulator {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
enable-active-high; enable-active-high;
gpio = <&gpio7 14 GPIO_ACTIVE_HIGH>; gpio = <&gpio7 RK_PB6 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&lcd_enable_h>; pinctrl-0 = <&lcd_enable_h>;
regulator-name = "panel_regulator"; regulator-name = "panel_regulator";
@ -68,7 +68,7 @@
vcc18_lcd: vcc18-lcd { vcc18_lcd: vcc18-lcd {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
enable-active-high; enable-active-high;
gpio = <&gpio2 13 GPIO_ACTIVE_HIGH>; gpio = <&gpio2 RK_PB5 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&avdd_1v8_disp_en>; pinctrl-0 = <&avdd_1v8_disp_en>;
regulator-name = "vcc18_lcd"; regulator-name = "vcc18_lcd";
@ -80,7 +80,7 @@
backlight_regulator: backlight-regulator { backlight_regulator: backlight-regulator {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
enable-active-high; enable-active-high;
gpio = <&gpio2 12 GPIO_ACTIVE_HIGH>; gpio = <&gpio2 RK_PB4 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&bl_pwr_en>; pinctrl-0 = <&bl_pwr_en>;
regulator-name = "backlight_regulator"; regulator-name = "backlight_regulator";
@ -126,14 +126,14 @@
&vcc_5v { &vcc_5v {
enable-active-high; enable-active-high;
gpio = <&gpio7 21 GPIO_ACTIVE_HIGH>; gpio = <&gpio7 RK_PC5 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&drv_5v>; pinctrl-0 = <&drv_5v>;
}; };
&vcc50_hdmi { &vcc50_hdmi {
enable-active-high; enable-active-high;
gpio = <&gpio5 19 GPIO_ACTIVE_HIGH>; gpio = <&gpio5 RK_PC3 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&vcc50_hdmi_en>; pinctrl-0 = <&vcc50_hdmi_en>;
}; };

View file

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