mirros/rockchip-kernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ARM: dts: rockchip: bulk convert gpios to their constant counterparts (v2)

Browse Source 
According to upstream commit 07f08d9cee ("ARM: dts: rockchip:
bulk convert gpios to their constant counterparts") replace
RK_FUNC_x -> x and RK_GPIOx -> x.

sed -i -e "
/rockchip,pins *=/bcheck
b # to end of script
:append-next-line
N
:check
/^[^;]*$/bappend-next-line
s/<RK_GPIO\([0-9]\) /<\1 /g
s/<\([^ ][^ ]*  *\)0 /<\1RK_PA0 /g
s/<\([^ ][^ ]*  *\)1 /<\1RK_PA1 /g
s/<\([^ ][^ ]*  *\)2 /<\1RK_PA2 /g
s/<\([^ ][^ ]*  *\)3 /<\1RK_PA3 /g
s/<\([^ ][^ ]*  *\)4 /<\1RK_PA4 /g
s/<\([^ ][^ ]*  *\)5 /<\1RK_PA5 /g
s/<\([^ ][^ ]*  *\)6 /<\1RK_PA6 /g
s/<\([^ ][^ ]*  *\)7 /<\1RK_PA7 /g
s/<\([^ ][^ ]*  *\)8 /<\1RK_PB0 /g
s/<\([^ ][^ ]*  *\)9 /<\1RK_PB1 /g
s/<\([^ ][^ ]*  *\)10 /<\1RK_PB2 /g
s/<\([^ ][^ ]*  *\)11 /<\1RK_PB3 /g
s/<\([^ ][^ ]*  *\)12 /<\1RK_PB4 /g
s/<\([^ ][^ ]*  *\)13 /<\1RK_PB5 /g
s/<\([^ ][^ ]*  *\)14 /<\1RK_PB6 /g
s/<\([^ ][^ ]*  *\)15 /<\1RK_PB7 /g
s/<\([^ ][^ ]*  *\)16 /<\1RK_PC0 /g
s/<\([^ ][^ ]*  *\)17 /<\1RK_PC1 /g
s/<\([^ ][^ ]*  *\)18 /<\1RK_PC2 /g
s/<\([^ ][^ ]*  *\)19 /<\1RK_PC3 /g
s/<\([^ ][^ ]*  *\)20 /<\1RK_PC4 /g
s/<\([^ ][^ ]*  *\)21 /<\1RK_PC5 /g
s/<\([^ ][^ ]*  *\)22 /<\1RK_PC6 /g
s/<\([^ ][^ ]*  *\)23 /<\1RK_PC7 /g
s/<\([^ ][^ ]*  *\)24 /<\1RK_PD0 /g
s/<\([^ ][^ ]*  *\)25 /<\1RK_PD1 /g
s/<\([^ ][^ ]*  *\)26 /<\1RK_PD2 /g
s/<\([^ ][^ ]*  *\)27 /<\1RK_PD3 /g
s/<\([^ ][^ ]*  *\)28 /<\1RK_PD4 /g
s/<\([^ ][^ ]*  *\)29 /<\1RK_PD5 /g
s/<\([^ ][^ ]*  *\)30 /<\1RK_PD6 /g
s/<\([^ ][^ ]*  *\)31 /<\1RK_PD7 /g
s/<\([^ ][^ ]*  *[^ ][^ ]*  *\)0 /<\1RK_FUNC_GPIO /g
s/<\([^ ][^ ]*  *[^ ][^ ]*  *\)RK_FUNC_\([1-9]\) /<\1\2 /g
" *.dts *.dtsi

Change-Id: I8ee2a66094cc25b0d72aba11a239f4fe9c76c4f4
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
This commit is contained in:
Tao Huang
2021-03-25 19:55:38 +08:00
parent 77bcbf172b
commit beda2dd272
46 changed files with 398 additions and 398 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
arch/arm/boot/dts/px3se-evb.dts
View File

@@ -699,34 +699,34 @@
&pinctrl {
camera {
cif_rst: cif-rst {
rockchip,pins = <3 11 RK_FUNC_GPIO &pcfg_pull_default>;
rockchip,pins = <3 RK_PB3 RK_FUNC_GPIO &pcfg_pull_default>;
};
};
pmic {
pmic_int_l: pmic-int-l {
rockchip,pins = <1 11 RK_FUNC_GPIO &pcfg_pull_default>;
rockchip,pins = <1 RK_PB3 RK_FUNC_GPIO &pcfg_pull_default>;
};
};
sdmmc {
sdmmc_pwr: sdmmc-pwr {
rockchip,pins = <1 14 RK_FUNC_GPIO &pcfg_pull_default>;
rockchip,pins = <1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_default>;
};
};
lcdc {
lcdc_pwr_en: lcdc-pwr-en {
rockchip,pins = <1 12 RK_FUNC_GPIO &pcfg_pull_default>;
rockchip,pins = <1 RK_PB4 RK_FUNC_GPIO &pcfg_pull_default>;
};
};
wifi {
wifi_en: wifi-en {
rockchip,pins = <3 27 RK_FUNC_GPIO &pcfg_output_high>;
rockchip,pins = <3 RK_PD3 RK_FUNC_GPIO &pcfg_output_high>;
};
wifi_pwr: wifi-pwr {
rockchip,pins = <1 3 RK_FUNC_GPIO &pcfg_pull_default>;
rockchip,pins = <1 RK_PA3 RK_FUNC_GPIO &pcfg_pull_default>;
};
};
};

12
arch/arm/boot/dts/rk3036-echo.dts
View File

@@ -713,37 +713,37 @@
&pinctrl {
pmic {
pmic_int: pmic-int {
rockchip,pins = <0 1 RK_FUNC_GPIO &pcfg_pull_default>;
rockchip,pins = <0 RK_PA1 RK_FUNC_GPIO &pcfg_pull_default>;
};
};
keys {
pwr_key: pwr-key {
rockchip,pins = <2 25 RK_FUNC_GPIO &pcfg_pull_default>;
rockchip,pins = <2 RK_PD1 RK_FUNC_GPIO &pcfg_pull_default>;
};
};
sdio {
bt_wake_h: bt-wake-h {
rockchip,pins = <2 8 RK_FUNC_GPIO &pcfg_pull_default>;
rockchip,pins = <2 RK_PB0 RK_FUNC_GPIO &pcfg_pull_default>;
};
};
sdmmc {
sdmmc_pwr: sdmmc-pwr {
rockchip,pins = <2 28 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <2 RK_PD4 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
sleep {
global_pwroff: global-pwroff {
rockchip,pins = <2 7 RK_FUNC_1 &pcfg_pull_none>;
rockchip,pins = <2 RK_PA7 1 &pcfg_pull_none>;
};
};
wireless-bluetooth {
uart0_gpios: uart0-gpios {
rockchip,pins = <0 19 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <0 RK_PC3 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
};

4
arch/arm/boot/dts/rk3126-bnd-d708.dtsi
View File

@@ -602,13 +602,13 @@
pmic {
pmic_int_l: pmic-int-l {
rockchip,pins =
<0 2 RK_FUNC_GPIO &pcfg_pull_default>;
<0 RK_PA2 RK_FUNC_GPIO &pcfg_pull_default>;
};
};
wireless-bluetooth {
uart1_rts_gpio: uart1-rts-gpio {
rockchip,pins = <1 11 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <1 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
};

22
arch/arm/boot/dts/rk3126-evb.dts
View File

@@ -407,23 +407,23 @@
lcdc_sleep_pins: lcdc-sleep-pins {
rockchip,pins =
<2 RK_PB0 0 &pcfg_pull_none>, /* DCLK */
<2 RK_PB3 0 &pcfg_pull_none>, /* DEN */
<2 RK_PB4 0 &pcfg_pull_none>, /* DATA10 */
<2 RK_PB5 0 &pcfg_pull_none>, /* DATA11 */
<2 RK_PB6 0 &pcfg_pull_none>, /* DATA12 */
<2 RK_PB7 0 &pcfg_pull_none>, /* DATA13 */
<2 RK_PC0 0 &pcfg_pull_none>, /* DATA14 */
<2 RK_PC1 0 &pcfg_pull_none>, /* DATA15 */
<2 RK_PC2 0 &pcfg_pull_none>, /* DATA16 */
<2 RK_PC3 0 &pcfg_pull_none>; /* DATA17 */
<2 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>, /* DCLK */
<2 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>, /* DEN */
<2 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>, /* DATA10 */
<2 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>, /* DATA11 */
<2 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>, /* DATA12 */
<2 RK_PB7 RK_FUNC_GPIO &pcfg_pull_none>, /* DATA13 */
<2 RK_PC0 RK_FUNC_GPIO &pcfg_pull_none>, /* DATA14 */
<2 RK_PC1 RK_FUNC_GPIO &pcfg_pull_none>, /* DATA15 */
<2 RK_PC2 RK_FUNC_GPIO &pcfg_pull_none>, /* DATA16 */
<2 RK_PC3 RK_FUNC_GPIO &pcfg_pull_none>; /* DATA17 */
};
};
pmic {
pmic_int_l: pmic-int-l {
rockchip,pins =
<0 2 RK_FUNC_GPIO &pcfg_pull_default>;
<0 RK_PA2 RK_FUNC_GPIO &pcfg_pull_default>;
};
};
};

24
arch/arm/boot/dts/rk3126-m88.dts
View File

@@ -533,29 +533,29 @@
lcdc_sleep_pins: lcdc-sleep-pins {
rockchip,pins =
<2 RK_PB0 0 &pcfg_pull_none>, /* DCLK */
<2 RK_PB3 0 &pcfg_pull_none>, /* DEN */
<2 RK_PB4 0 &pcfg_pull_none>, /* DATA10 */
<2 RK_PB5 0 &pcfg_pull_none>, /* DATA11 */
<2 RK_PB6 0 &pcfg_pull_none>, /* DATA12 */
<2 RK_PB7 0 &pcfg_pull_none>, /* DATA13 */
<2 RK_PC0 0 &pcfg_pull_none>, /* DATA14 */
<2 RK_PC1 0 &pcfg_pull_none>, /* DATA15 */
<2 RK_PC2 0 &pcfg_pull_none>, /* DATA16 */
<2 RK_PC3 0 &pcfg_pull_none>; /* DATA17 */
<2 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>, /* DCLK */
<2 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>, /* DEN */
<2 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>, /* DATA10 */
<2 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>, /* DATA11 */
<2 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>, /* DATA12 */
<2 RK_PB7 RK_FUNC_GPIO &pcfg_pull_none>, /* DATA13 */
<2 RK_PC0 RK_FUNC_GPIO &pcfg_pull_none>, /* DATA14 */
<2 RK_PC1 RK_FUNC_GPIO &pcfg_pull_none>, /* DATA15 */
<2 RK_PC2 RK_FUNC_GPIO &pcfg_pull_none>, /* DATA16 */
<2 RK_PC3 RK_FUNC_GPIO &pcfg_pull_none>; /* DATA17 */
};
};
pmic {
pmic_int_l: pmic-int-l {
rockchip,pins =
<0 2 RK_FUNC_GPIO &pcfg_pull_default>;
<0 RK_PA2 RK_FUNC_GPIO &pcfg_pull_default>;
};
};
wireless-bluetooth {
uart1_rts_gpio: uart1-rts-gpio {
rockchip,pins = <1 11 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <1 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
};

2
arch/arm/boot/dts/rk3128-fireprime.dts
View File

@@ -371,7 +371,7 @@
&pinctrl {
pmic {
pmic_int_l: pmic-int-l {
rockchip,pins = <RK_GPIO3 22 RK_FUNC_GPIO &pcfg_pull_default>;
rockchip,pins = <3 RK_PC6 RK_FUNC_GPIO &pcfg_pull_default>;
};
};

2
arch/arm/boot/dts/rk3128h-box-avb.dts
View File

@@ -53,7 +53,7 @@
&pinctrl {
sdmmc {
sdmmc_det: sdmmc-det {
rockchip,pins = <1 RK_PC1 RK_FUNC_1 &pcfg_pull_none>;
rockchip,pins = <1 RK_PC1 1 &pcfg_pull_none>;
};
};
};

10
arch/arm/boot/dts/rk3128h-box.dtsi
View File

@@ -364,29 +364,29 @@
&pinctrl {
keys {
pwr_key: pwr-key {
rockchip,pins = <3 23 RK_FUNC_GPIO &pcfg_pull_up>;
rockchip,pins = <3 RK_PC7 RK_FUNC_GPIO &pcfg_pull_up>;
};
volume_up_key: volume-up {
rockchip,pins = <3 25 RK_FUNC_GPIO &pcfg_pull_up>;
rockchip,pins = <3 RK_PD1 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
sdmmc {
sdmmc_pwr: sdmmc-pwr {
rockchip,pins = <1 14 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
sdio-pwrseq {
wifi_enable_h: wifi-enable-h {
rockchip,pins = <2 26 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <2 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
usb {
host_vbus_drv: host-vbus-drv {
rockchip,pins = <3 20 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <3 RK_PC4 RK_FUNC_GPIO &pcfg_pull_none>;
};
otg_vbus_drv: otg-vbus-drv {

244
arch/arm/boot/dts/rk3128x.dtsi
View File

@@ -1325,353 +1325,353 @@
sdmmc {
sdmmc_clk: sdmmc-clk {
rockchip,pins = <1 16 RK_FUNC_1 &pcfg_pull_none_drv_12ma>;
rockchip,pins = <1 RK_PC0 1 &pcfg_pull_none_drv_12ma>;
};
sdmmc_cmd: sdmmc-cmd {
rockchip,pins = <1 15 RK_FUNC_1 &pcfg_pull_none_drv_12ma>;
rockchip,pins = <1 RK_PB7 1 &pcfg_pull_none_drv_12ma>;
};
sdmmc_bus4: sdmmc-bus4 {
rockchip,pins = <1 18 RK_FUNC_1 &pcfg_pull_none_drv_12ma>,
<1 19 RK_FUNC_1 &pcfg_pull_none_drv_12ma>,
<1 20 RK_FUNC_1 &pcfg_pull_none_drv_12ma>,
<1 21 RK_FUNC_1 &pcfg_pull_none_drv_12ma>;
rockchip,pins = <1 RK_PC2 1 &pcfg_pull_none_drv_12ma>,
<1 RK_PC3 1 &pcfg_pull_none_drv_12ma>,
<1 RK_PC4 1 &pcfg_pull_none_drv_12ma>,
<1 RK_PC5 1 &pcfg_pull_none_drv_12ma>;
};
};
sdio {
sdio_clk: sdio-clk {
rockchip,pins = <3 0 RK_FUNC_1 &pcfg_pull_none_drv_12ma>;
rockchip,pins = <3 RK_PA0 1 &pcfg_pull_none_drv_12ma>;
};
sdio_cmd: sdio-cmd {
rockchip,pins = <3 1 RK_FUNC_1 &pcfg_pull_none_drv_12ma>;
rockchip,pins = <3 RK_PA1 1 &pcfg_pull_none_drv_12ma>;
};
sdio_bus4: sdio-bus4 {
rockchip,pins = <3 2 RK_FUNC_1 &pcfg_pull_none_drv_12ma>,
<3 3 RK_FUNC_1 &pcfg_pull_none_drv_12ma>,
<3 4 RK_FUNC_1 &pcfg_pull_none_drv_12ma>,
<3 5 RK_FUNC_1 &pcfg_pull_none_drv_12ma>;
rockchip,pins = <3 RK_PA2 1 &pcfg_pull_none_drv_12ma>,
<3 RK_PA3 1 &pcfg_pull_none_drv_12ma>,
<3 RK_PA4 1 &pcfg_pull_none_drv_12ma>,
<3 RK_PA5 1 &pcfg_pull_none_drv_12ma>;
};
};
emmc {
emmc_clk: emmc-clk {
rockchip,pins = <2 7 RK_FUNC_2 &pcfg_pull_none>;
rockchip,pins = <2 RK_PA7 2 &pcfg_pull_none>;
};
emmc_cmd: emmc-cmd {
rockchip,pins = <1 22 RK_FUNC_2 &pcfg_pull_none>;
rockchip,pins = <1 RK_PC6 2 &pcfg_pull_none>;
};
emmc_bus8: emmc-bus8 {
rockchip,pins = <1 24 RK_FUNC_2 &pcfg_pull_none>,
<1 25 RK_FUNC_2 &pcfg_pull_none>,
<1 26 RK_FUNC_2 &pcfg_pull_none>,
<1 27 RK_FUNC_2 &pcfg_pull_none>,
<1 28 RK_FUNC_2 &pcfg_pull_none>,
<1 29 RK_FUNC_2 &pcfg_pull_none>,
<1 30 RK_FUNC_2 &pcfg_pull_none>,
<1 31 RK_FUNC_2 &pcfg_pull_none>;
rockchip,pins = <1 RK_PD0 2 &pcfg_pull_none>,
<1 RK_PD1 2 &pcfg_pull_none>,
<1 RK_PD2 2 &pcfg_pull_none>,
<1 RK_PD3 2 &pcfg_pull_none>,
<1 RK_PD4 2 &pcfg_pull_none>,
<1 RK_PD5 2 &pcfg_pull_none>,
<1 RK_PD6 2 &pcfg_pull_none>,
<1 RK_PD7 2 &pcfg_pull_none>;
};
};
gmac {
rgmii_pins: rgmii-pins {
rockchip,pins = <2 14 RK_FUNC_1 &pcfg_pull_none>,
<2 12 RK_FUNC_1 &pcfg_pull_none>,
<2 25 RK_FUNC_1 &pcfg_pull_none>,
<2 19 RK_FUNC_1 &pcfg_pull_none_drv_12ma>,
<2 18 RK_FUNC_1 &pcfg_pull_none_drv_12ma>,
<2 22 RK_FUNC_1 &pcfg_pull_none_drv_12ma>,
<2 23 RK_FUNC_1 &pcfg_pull_none_drv_12ma>,
<2 9 RK_FUNC_1 &pcfg_pull_none_drv_12ma>,
<2 13 RK_FUNC_1 &pcfg_pull_none_drv_12ma>,
<2 17 RK_FUNC_1 &pcfg_pull_none>,
<2 16 RK_FUNC_1 &pcfg_pull_none>,
<2 21 RK_FUNC_2 &pcfg_pull_none>,
<2 20 RK_FUNC_2 &pcfg_pull_none>,
<2 11 RK_FUNC_1 &pcfg_pull_none>,
<2 8 RK_FUNC_1 &pcfg_pull_none>;
rockchip,pins = <2 RK_PB6 1 &pcfg_pull_none>,
<2 RK_PB4 1 &pcfg_pull_none>,
<2 RK_PD1 1 &pcfg_pull_none>,
<2 RK_PC3 1 &pcfg_pull_none_drv_12ma>,
<2 RK_PC2 1 &pcfg_pull_none_drv_12ma>,
<2 RK_PC6 1 &pcfg_pull_none_drv_12ma>,
<2 RK_PC7 1 &pcfg_pull_none_drv_12ma>,
<2 RK_PB1 1 &pcfg_pull_none_drv_12ma>,
<2 RK_PB5 1 &pcfg_pull_none_drv_12ma>,
<2 RK_PC1 1 &pcfg_pull_none>,
<2 RK_PC0 1 &pcfg_pull_none>,
<2 RK_PC5 2 &pcfg_pull_none>,
<2 RK_PC4 2 &pcfg_pull_none>,
<2 RK_PB3 1 &pcfg_pull_none>,
<2 RK_PB0 1 &pcfg_pull_none>;
};
rmii_pins: rmii-pins {
rockchip,pins = <2 14 RK_FUNC_1 &pcfg_pull_none>,
<2 12 RK_FUNC_1 &pcfg_pull_none>,
<2 25 RK_FUNC_1 &pcfg_pull_none>,
<2 19 RK_FUNC_1 &pcfg_pull_none_drv_12ma>,
<2 18 RK_FUNC_1 &pcfg_pull_none_drv_12ma>,
<2 13 RK_FUNC_1 &pcfg_pull_none_drv_12ma>,
<2 17 RK_FUNC_1 &pcfg_pull_none>,
<2 16 RK_FUNC_1 &pcfg_pull_none>,
<2 8 RK_FUNC_1 &pcfg_pull_none>,
<2 15 RK_FUNC_1 &pcfg_pull_none>;
rockchip,pins = <2 RK_PB6 1 &pcfg_pull_none>,
<2 RK_PB4 1 &pcfg_pull_none>,
<2 RK_PD1 1 &pcfg_pull_none>,
<2 RK_PC3 1 &pcfg_pull_none_drv_12ma>,
<2 RK_PC2 1 &pcfg_pull_none_drv_12ma>,
<2 RK_PB5 1 &pcfg_pull_none_drv_12ma>,
<2 RK_PC1 1 &pcfg_pull_none>,
<2 RK_PC0 1 &pcfg_pull_none>,
<2 RK_PB0 1 &pcfg_pull_none>,
<2 RK_PB7 1 &pcfg_pull_none>;
};
phy_pins: phy-pins {
rockchip,pins = <2 14 RK_FUNC_2 &pcfg_pull_none>,
<2 8 RK_FUNC_2 &pcfg_pull_none>;
rockchip,pins = <2 RK_PB6 2 &pcfg_pull_none>,
<2 RK_PB0 2 &pcfg_pull_none>;
};
};
hdmi {
hdmi_hpd: hdmi-hpd {
rockchip,pins = <0 15 RK_FUNC_1 &pcfg_pull_down>;
rockchip,pins = <0 RK_PB7 1 &pcfg_pull_down>;
};
hdmii2c_xfer: hdmii2c-xfer {
rockchip,pins = <0 6 RK_FUNC_2 &pcfg_pull_none>,
<0 7 RK_FUNC_2 &pcfg_pull_none>;
rockchip,pins = <0 RK_PA6 2 &pcfg_pull_none>,
<0 RK_PA7 2 &pcfg_pull_none>;
};
hdmi_cec: hdmi-cec {
rockchip,pins = <0 RK_PC4 RK_FUNC_1 &pcfg_pull_none>;
rockchip,pins = <0 RK_PC4 1 &pcfg_pull_none>;
};
};
i2c0 {
i2c0_xfer: i2c0-xfer {
rockchip,pins = <0 0 RK_FUNC_1 &pcfg_pull_none>,
<0 1 RK_FUNC_1 &pcfg_pull_none>;
rockchip,pins = <0 RK_PA0 1 &pcfg_pull_none>,
<0 RK_PA1 1 &pcfg_pull_none>;
};
};
i2c1 {
i2c1_xfer: i2c1-xfer {
rockchip,pins = <0 2 RK_FUNC_1 &pcfg_pull_none>,
<0 3 RK_FUNC_1 &pcfg_pull_none>;
rockchip,pins = <0 RK_PA2 1 &pcfg_pull_none>,
<0 RK_PA3 1 &pcfg_pull_none>;
};
};
i2c2 {
i2c2_xfer: i2c2-xfer {
rockchip,pins = <2 20 RK_FUNC_1 &pcfg_pull_none>,
<2 21 RK_FUNC_1 &pcfg_pull_none>;
rockchip,pins = <2 RK_PC4 1 &pcfg_pull_none>,
<2 RK_PC5 1 &pcfg_pull_none>;
};
};
i2c3 {
i2c3_xfer: i2c3-xfer {
rockchip,pins = <0 6 RK_FUNC_1 &pcfg_pull_none>,
<0 7 RK_FUNC_1 &pcfg_pull_none>;
rockchip,pins = <0 RK_PA6 1 &pcfg_pull_none>,
<0 RK_PA7 1 &pcfg_pull_none>;
};
};
tsp {
tsp_d0: tsp-d0 {
rockchip,pins = <2 19 RK_FUNC_2 &pcfg_pull_none>;
rockchip,pins = <2 RK_PC3 2 &pcfg_pull_none>;
};
tsp_d1: tsp-d1 {
rockchip,pins = <2 18 RK_FUNC_2 &pcfg_pull_none>;
rockchip,pins = <2 RK_PC2 2 &pcfg_pull_none>;
};
tsp_d2: tsp-d2 {
rockchip,pins = <2 17 RK_FUNC_2 &pcfg_pull_none>;
rockchip,pins = <2 RK_PC1 2 &pcfg_pull_none>;
};
tsp_d3: tsp-d3 {
rockchip,pins = <2 16 RK_FUNC_2 &pcfg_pull_none>;
rockchip,pins = <2 RK_PC0 2 &pcfg_pull_none>;
};
tsp_d4: tsp-d4 {
rockchip,pins = <2 25 RK_FUNC_2 &pcfg_pull_none>;
rockchip,pins = <2 RK_PD1 2 &pcfg_pull_none>;
};
tsp_d5: tsp-d5 {
rockchip,pins = <2 24 RK_FUNC_2 &pcfg_pull_none>;
rockchip,pins = <2 RK_PD0 2 &pcfg_pull_none>;
};
tsp_d6: tsp-d6 {
rockchip,pins = <2 15 RK_FUNC_2 &pcfg_pull_none>;
rockchip,pins = <2 RK_PB7 2 &pcfg_pull_none>;
};
tsp_d7: tsp-d7 {
rockchip,pins = <2 13 RK_FUNC_2 &pcfg_pull_none>;
rockchip,pins = <2 RK_PB5 2 &pcfg_pull_none>;
};
tsp_sync: tsp-sync {
rockchip,pins = <2 12 RK_FUNC_2 &pcfg_pull_none>;
rockchip,pins = <2 RK_PB4 2 &pcfg_pull_none>;
};
tsp_clk: tsp-clk {
rockchip,pins = <2 11 RK_FUNC_2 &pcfg_pull_none>;
rockchip,pins = <2 RK_PB3 2 &pcfg_pull_none>;
};
tsp_fail: tsp-fail {
rockchip,pins = <2 10 RK_FUNC_2 &pcfg_pull_none>;
rockchip,pins = <2 RK_PB2 2 &pcfg_pull_none>;
};
tsp_valid: tsp-valid {
rockchip,pins = <2 9 RK_FUNC_2 &pcfg_pull_none>;
rockchip,pins = <2 RK_PB1 2 &pcfg_pull_none>;
};
};
spi-0 {
spi0_clk: spi0-clk {
rockchip,pins = <0 9 RK_FUNC_2 &pcfg_pull_up>;
rockchip,pins = <0 RK_PB1 2 &pcfg_pull_up>;
};
spi0_cs0: spi0-cs0 {
rockchip,pins = <0 14 RK_FUNC_2 &pcfg_pull_up>;
rockchip,pins = <0 RK_PB6 2 &pcfg_pull_up>;
};
spi0_tx: spi0-tx {
rockchip,pins = <0 11 RK_FUNC_2 &pcfg_pull_up>;
rockchip,pins = <0 RK_PB3 2 &pcfg_pull_up>;
};
spi0_rx: spi0-rx {
rockchip,pins = <0 13 RK_FUNC_2 &pcfg_pull_up>;
rockchip,pins = <0 RK_PB5 2 &pcfg_pull_up>;
};
spi0_cs1: spi0-cs1 {
rockchip,pins = <1 12 RK_FUNC_1 &pcfg_pull_up>;
rockchip,pins = <1 RK_PB4 1 &pcfg_pull_up>;
};
};
spi-1 {
spi1_clk: spi1-clk {
rockchip,pins = <0 23 RK_FUNC_2 &pcfg_pull_up>;
rockchip,pins = <0 RK_PC7 2 &pcfg_pull_up>;
};
spi1_cs0: spi1-cs0 {
rockchip,pins = <2 2 RK_FUNC_2 &pcfg_pull_up>;
rockchip,pins = <2 RK_PA2 2 &pcfg_pull_up>;
};
spi1_rx: spi1-rx {
rockchip,pins = <2 0 RK_FUNC_2 &pcfg_pull_up>;
rockchip,pins = <2 RK_PA0 2 &pcfg_pull_up>;
};
spi1_tx: spi1-tx {
rockchip,pins = <2 1 RK_FUNC_2 &pcfg_pull_up>;
rockchip,pins = <2 RK_PA1 2 &pcfg_pull_up>;
};
spi1_cs1: spi1-cs1 {
rockchip,pins = <2 3 RK_FUNC_2 &pcfg_pull_up>;
rockchip,pins = <2 RK_PA3 2 &pcfg_pull_up>;
};
};
i2s1 {
i2s1_bus: i2s1-bus {
rockchip,pins = <0 8 RK_FUNC_1 &pcfg_pull_none>,
<0 9 RK_FUNC_1 &pcfg_pull_none>,
<0 11 RK_FUNC_1 &pcfg_pull_none>,
<0 12 RK_FUNC_1 &pcfg_pull_none>,
<0 13 RK_FUNC_1 &pcfg_pull_none>,
<0 14 RK_FUNC_1 &pcfg_pull_none>,
<1 2 RK_FUNC_2 &pcfg_pull_none>,
<1 4 RK_FUNC_2 &pcfg_pull_none>,
<1 5 RK_FUNC_2 &pcfg_pull_none>;
rockchip,pins = <0 RK_PB0 1 &pcfg_pull_none>,
<0 RK_PB1 1 &pcfg_pull_none>,
<0 RK_PB3 1 &pcfg_pull_none>,
<0 RK_PB4 1 &pcfg_pull_none>,
<0 RK_PB5 1 &pcfg_pull_none>,
<0 RK_PB6 1 &pcfg_pull_none>,
<1 RK_PA2 2 &pcfg_pull_none>,
<1 RK_PA4 2 &pcfg_pull_none>,
<1 RK_PA5 2 &pcfg_pull_none>;
};
};
pwm0 {
pwm0_pin: pwm0-pin {
rockchip,pins = <3 21 RK_FUNC_1 &pcfg_pull_none>;
rockchip,pins = <3 RK_PC5 1 &pcfg_pull_none>;
};
pwm0_pin_pull_down: pwm0-pin-pull-down {
rockchip,pins = <3 21 RK_FUNC_1 &pcfg_pull_down>;
rockchip,pins = <3 RK_PC5 1 &pcfg_pull_down>;
};
};
pwm1 {
pwm1_pin: pwm1-pin {
rockchip,pins = <0 30 RK_FUNC_2 &pcfg_pull_none>;
rockchip,pins = <0 RK_PD6 2 &pcfg_pull_none>;
};
pwm1_pin_pull_down: pwm1-pin-pull-down {
rockchip,pins = <0 30 RK_FUNC_2 &pcfg_pull_down>;
rockchip,pins = <0 RK_PD6 2 &pcfg_pull_down>;
};
};
pwm2 {
pwm2_pin: pwm2-pin {
rockchip,pins = <1 12 RK_FUNC_2 &pcfg_pull_none>;
rockchip,pins = <1 RK_PB4 2 &pcfg_pull_none>;
};
pwm2_pin_pull_down: pwm2-pin-pull-down {
rockchip,pins = <1 12 RK_FUNC_2 &pcfg_pull_down>;
rockchip,pins = <1 RK_PB4 2 &pcfg_pull_down>;
};
};
pwm3 {
pwm3_pin: pwm3-pin {
rockchip,pins = <1 11 RK_FUNC_2 &pcfg_pull_none>;
rockchip,pins = <1 RK_PB3 2 &pcfg_pull_none>;
};
pwm3_pin_pull_down: pwm3-pin-pull-down {
rockchip,pins = <1 11 RK_FUNC_2 &pcfg_pull_down>;
rockchip,pins = <1 RK_PB3 2 &pcfg_pull_down>;
};
};
spdif {
spdif_tx: spdif-tx {
rockchip,pins = <3 31 RK_FUNC_2 &pcfg_pull_none>;
rockchip,pins = <3 RK_PD7 2 &pcfg_pull_none>;
};
};
tsadc {
otp_gpio: otp-gpio {
rockchip,pins = <0 24 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <0 RK_PD0 RK_FUNC_GPIO &pcfg_pull_none>;
};
otp_out: otp-out {
rockchip,pins = <0 24 RK_FUNC_2 &pcfg_pull_none>;
rockchip,pins = <0 RK_PD0 2 &pcfg_pull_none>;
};
};
uart0 {
uart0_xfer: uart0-xfer {
rockchip,pins = <2 26 RK_FUNC_1 &pcfg_pull_none>,
<2 27 RK_FUNC_1 &pcfg_pull_none>;
rockchip,pins = <2 RK_PD2 1 &pcfg_pull_none>,
<2 RK_PD3 1 &pcfg_pull_none>;
};
uart0_cts: uart0-cts {
rockchip,pins = <2 29 RK_FUNC_1 &pcfg_pull_none>;
rockchip,pins = <2 RK_PD5 1 &pcfg_pull_none>;
};
uart0_rts: uart0-rts {
rockchip,pins = <0 17 RK_FUNC_1 &pcfg_pull_none>;
rockchip,pins = <0 RK_PC1 1 &pcfg_pull_none>;
};
};
uart1 {
uart1_xfer: uart1-xfer {
rockchip,pins = <1 9 RK_FUNC_1 &pcfg_pull_none>,
<1 10 RK_FUNC_1 &pcfg_pull_none>;
rockchip,pins = <1 RK_PB1 1 &pcfg_pull_none>,
<1 RK_PB2 1 &pcfg_pull_none>;
};
uart1_cts: uart1-cts {
rockchip,pins = <1 8 RK_FUNC_1 &pcfg_pull_none>;
rockchip,pins = <1 RK_PB0 1 &pcfg_pull_none>;
};
uart1_rts: uart1-rts {
rockchip,pins = <1 11 RK_FUNC_1 &pcfg_pull_none>;
rockchip,pins = <1 RK_PB3 1 &pcfg_pull_none>;
};
};
uart1-1 {
uart11_xfer: uart11-xfer {
rockchip,pins = <3 14 RK_FUNC_1 &pcfg_pull_up>,
<3 13 RK_FUNC_1 &pcfg_pull_none>;
rockchip,pins = <3 RK_PB6 1 &pcfg_pull_up>,
<3 RK_PB5 1 &pcfg_pull_none>;
};
uart11_cts: uart11-cts {
rockchip,pins = <3 7 RK_FUNC_1 &pcfg_pull_none>;
rockchip,pins = <3 RK_PA7 1 &pcfg_pull_none>;
};
uart11_rts: uart11-rts {
rockchip,pins = <3 6 RK_FUNC_1 &pcfg_pull_none>;
rockchip,pins = <3 RK_PA6 1 &pcfg_pull_none>;
};
uart11_rts_gpio: uart11-rts-gpio {
rockchip,pins = <3 6 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <3 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
uart2 {
uart2_xfer: uart2-xfer {
rockchip,pins = <1 18 RK_FUNC_2 &pcfg_pull_up>,
<1 19 RK_FUNC_2 &pcfg_pull_none>;
rockchip,pins = <1 RK_PC2 2 &pcfg_pull_up>,
<1 RK_PC3 2 &pcfg_pull_none>;
};
uart2_cts: uart2-cts {
rockchip,pins = <0 25 RK_FUNC_1 &pcfg_pull_none>;
rockchip,pins = <0 RK_PD1 1 &pcfg_pull_none>;
};
uart2_rts: uart2-rts {
rockchip,pins = <0 24 RK_FUNC_1 &pcfg_pull_none>;
rockchip,pins = <0 RK_PD0 1 &pcfg_pull_none>;
};
};
uart2-1 {
uart21_xfer: uart21-xfer {
rockchip,pins = <1 10 RK_FUNC_2 &pcfg_pull_up>,
<1 9 RK_FUNC_2 &pcfg_pull_none>;
rockchip,pins = <1 RK_PB2 2 &pcfg_pull_up>,
<1 RK_PB1 2 &pcfg_pull_none>;
};
};
};

36
arch/arm/boot/dts/rk312x.dtsi
View File

@@ -1393,24 +1393,24 @@
lcdc_sleep_pins: lcdc-sleep-pins {
rockchip,pins =
<2 RK_PB0 0 &pcfg_pull_none>, /* LCDC_DCLK */
<2 RK_PB1 0 &pcfg_pull_none>, /* LCDC_HSYNC */
<2 RK_PB2 0 &pcfg_pull_none>, /* LCDC_VSYNC */
<2 RK_PB3 0 &pcfg_pull_none>, /* LCDC_DEN */
<2 RK_PB4 0 &pcfg_pull_none>, /* LCDC_DATA10 */
<2 RK_PB5 0 &pcfg_pull_none>, /* LCDC_DATA11 */
<2 RK_PB6 0 &pcfg_pull_none>, /* LCDC_DATA12 */
<2 RK_PB7 0 &pcfg_pull_none>, /* LCDC_DATA13 */
<2 RK_PC0 0 &pcfg_pull_none>, /* LCDC_DATA14 */
<2 RK_PC1 0 &pcfg_pull_none>, /* LCDC_DATA15 */
<2 RK_PC2 0 &pcfg_pull_none>, /* LCDC_DATA16 */
<2 RK_PC3 0 &pcfg_pull_none>, /* LCDC_DATA17 */
<2 RK_PC4 0 &pcfg_pull_none>, /* LCDC_DATA18 */
<2 RK_PC5 0 &pcfg_pull_none>, /* LCDC_DATA19 */
<2 RK_PC6 0 &pcfg_pull_none>, /* LCDC_DATA20 */
<2 RK_PC7 0 &pcfg_pull_none>, /* LCDC_DATA21 */
<2 RK_PD0 0 &pcfg_pull_none>, /* LCDC_DATA22 */
<2 RK_PD1 0 &pcfg_pull_none>; /* LCDC_DATA23 */
<2 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>, /* LCDC_DCLK */
<2 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>, /* LCDC_HSYNC */
<2 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>, /* LCDC_VSYNC */
<2 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>, /* LCDC_DEN */
<2 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>, /* LCDC_DATA10 */
<2 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>, /* LCDC_DATA11 */
<2 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>, /* LCDC_DATA12 */
<2 RK_PB7 RK_FUNC_GPIO &pcfg_pull_none>, /* LCDC_DATA13 */
<2 RK_PC0 RK_FUNC_GPIO &pcfg_pull_none>, /* LCDC_DATA14 */
<2 RK_PC1 RK_FUNC_GPIO &pcfg_pull_none>, /* LCDC_DATA15 */
<2 RK_PC2 RK_FUNC_GPIO &pcfg_pull_none>, /* LCDC_DATA16 */
<2 RK_PC3 RK_FUNC_GPIO &pcfg_pull_none>, /* LCDC_DATA17 */
<2 RK_PC4 RK_FUNC_GPIO &pcfg_pull_none>, /* LCDC_DATA18 */
<2 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>, /* LCDC_DATA19 */
<2 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>, /* LCDC_DATA20 */
<2 RK_PC7 RK_FUNC_GPIO &pcfg_pull_none>, /* LCDC_DATA21 */
<2 RK_PD0 RK_FUNC_GPIO &pcfg_pull_none>, /* LCDC_DATA22 */
<2 RK_PD1 RK_FUNC_GPIO &pcfg_pull_none>; /* LCDC_DATA23 */
};
};

8
arch/arm/boot/dts/rk3229-at-3nod-func.dts
View File

@@ -104,26 +104,26 @@
keys {
pwr_key: pwr-key {
rockchip,pins = <3 23 RK_FUNC_GPIO &pcfg_pull_down>;
rockchip,pins = <3 RK_PC7 RK_FUNC_GPIO &pcfg_pull_down>;
};
};
sdio-pwrseq {
wifi_enable_h: wifi-enable-h {
rockchip,pins = <3 15 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <3 RK_PB7 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
vcc-sd {
vcc_sd_h: vcc-sd-h {
rockchip,pins = <1 14 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
sdmmc {
sdmmc_cd: sdmmc-cd {
rockchip,pins =
<1 17 RK_FUNC_1 &pcfg_pull_none_drv_12ma>;
<1 RK_PC1 1 &pcfg_pull_none_drv_12ma>;
};
};
};

4
arch/arm/boot/dts/rk3229-at-3nod.dts
View File

@@ -98,13 +98,13 @@
keys {
pwr_key: pwr-key {
rockchip,pins = <3 23 RK_FUNC_GPIO &pcfg_pull_down>;
rockchip,pins = <3 RK_PC7 RK_FUNC_GPIO &pcfg_pull_down>;
};
};
sdio-pwrseq {
wifi_enable_h: wifi-enable-h {
rockchip,pins = <3 15 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <3 RK_PB7 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
};

2
arch/arm/boot/dts/rk3229-at-common.dtsi
View File

@@ -247,7 +247,7 @@
&pinctrl {
pmic {
pmic_int_l: pmic-int-l {
rockchip,pins = <1 1 RK_FUNC_GPIO &pcfg_pull_up>; /* gpio1_a1 */
rockchip,pins = <1 RK_PA1 RK_FUNC_GPIO &pcfg_pull_up>; /* gpio1_a1 */
};
};

4
arch/arm/boot/dts/rk3229-at-gva.dts
View File

@@ -136,13 +136,13 @@
keys {
pwr_key: pwr-key {
rockchip,pins = <3 23 RK_FUNC_GPIO &pcfg_pull_down>;
rockchip,pins = <3 RK_PC7 RK_FUNC_GPIO &pcfg_pull_down>;
};
};
sdio-pwrseq {
wifi_enable_h: wifi-enable-h {
rockchip,pins = <3 15 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <3 RK_PB7 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
};

60
arch/arm/boot/dts/rk3229-at-som.dtsi
View File

@@ -145,61 +145,61 @@
&pinctrl {
sdmmc {
sdmmc_gpio: sdmmc-gpio {
rockchip,pins = <1 14 RK_FUNC_GPIO &pcfg_pull_none>,
<1 15 RK_FUNC_GPIO &pcfg_pull_up>,
<1 16 RK_FUNC_GPIO &pcfg_pull_none>,
<1 17 RK_FUNC_GPIO &pcfg_pull_up>,
<1 18 RK_FUNC_GPIO &pcfg_pull_up>,
<1 19 RK_FUNC_GPIO &pcfg_pull_up>,
<1 20 RK_FUNC_GPIO &pcfg_pull_up>,
<1 21 RK_FUNC_GPIO &pcfg_pull_up>;
rockchip,pins = <1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>,
<1 RK_PB7 RK_FUNC_GPIO &pcfg_pull_up>,
<1 RK_PC0 RK_FUNC_GPIO &pcfg_pull_none>,
<1 RK_PC1 RK_FUNC_GPIO &pcfg_pull_up>,
<1 RK_PC2 RK_FUNC_GPIO &pcfg_pull_up>,
<1 RK_PC3 RK_FUNC_GPIO &pcfg_pull_up>,
<1 RK_PC4 RK_FUNC_GPIO &pcfg_pull_up>,
<1 RK_PC5 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
fixed_io {
fixed_gpio: fixed-gpio {
rockchip,pins = <2 19 RK_FUNC_GPIO &pcfg_pull_none>,
<2 18 RK_FUNC_GPIO &pcfg_pull_none>,
<2 17 RK_FUNC_GPIO &pcfg_pull_none>,
<2 16 RK_FUNC_GPIO &pcfg_pull_none>,
<2 15 RK_FUNC_GPIO &pcfg_pull_none>,
<2 14 RK_FUNC_GPIO &pcfg_pull_none>,
<2 13 RK_FUNC_GPIO &pcfg_pull_none>,
<2 12 RK_FUNC_GPIO &pcfg_pull_none>,
<2 11 RK_FUNC_GPIO &pcfg_pull_none>,
<2 10 RK_FUNC_GPIO &pcfg_pull_none>,
<2 9 RK_FUNC_GPIO &pcfg_pull_none>,
<2 8 RK_FUNC_GPIO &pcfg_pull_up>,
<1 7 RK_FUNC_GPIO &pcfg_pull_none>,
<1 3 RK_FUNC_GPIO &pcfg_pull_none>,
<1 0 RK_FUNC_GPIO &pcfg_pull_none>,
<1 8 RK_FUNC_GPIO &pcfg_pull_up>,
<0 17 RK_FUNC_GPIO &pcfg_pull_up>,
<0 24 RK_FUNC_GPIO &pcfg_pull_up>;
rockchip,pins = <2 RK_PC3 RK_FUNC_GPIO &pcfg_pull_none>,
<2 RK_PC2 RK_FUNC_GPIO &pcfg_pull_none>,
<2 RK_PC1 RK_FUNC_GPIO &pcfg_pull_none>,
<2 RK_PC0 RK_FUNC_GPIO &pcfg_pull_none>,
<2 RK_PB7 RK_FUNC_GPIO &pcfg_pull_none>,
<2 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>,
<2 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>,
<2 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>,
<2 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>,
<2 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>,
<2 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>,
<2 RK_PB0 RK_FUNC_GPIO &pcfg_pull_up>,
<1 RK_PA7 RK_FUNC_GPIO &pcfg_pull_none>,
<1 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>,
<1 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>,
<1 RK_PB0 RK_FUNC_GPIO &pcfg_pull_up>,
<0 RK_PC1 RK_FUNC_GPIO &pcfg_pull_up>,
<0 RK_PD0 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
ir {
ir_gpio: ir-gpio {
rockchip,pins = <1 11 RK_FUNC_GPIO &pcfg_pull_up>;
rockchip,pins = <1 RK_PB3 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
pwm0 {
pwm0_gpio: pwm0-gpio {
rockchip,pins = <3 21 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <3 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
pwm2 {
pwm2_gpio: pwm2-gpio {
rockchip,pins = <1 12 RK_FUNC_GPIO &pcfg_pull_up>;
rockchip,pins = <1 RK_PB4 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
spdif {
spdif_gpio: spdif-gpio {
rockchip,pins = <3 31 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <3 RK_PD7 RK_FUNC_GPIO &pcfg_pull_none>;
};
};

8
arch/arm/boot/dts/rk3229-echo-v10.dts
View File

@@ -317,19 +317,19 @@
&pinctrl {
pmic {
pmic_int_l: pmic-int-l {
rockchip,pins = <1 12 RK_FUNC_GPIO &pcfg_pull_up>; /* gpio1_b4 */
rockchip,pins = <1 RK_PB4 RK_FUNC_GPIO &pcfg_pull_up>; /* gpio1_b4 */
};
};
sdio-pwrseq {
wifi_enable_h: wifi-enable-h {
rockchip,pins = <2 26 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <2 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
usb {
host_vbus_drv: host-vbus-drv {
rockchip,pins = <3 20 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <3 RK_PC4 RK_FUNC_GPIO &pcfg_pull_none>;
};
otg_vbus_drv: otg-vbus-drv {
@@ -339,7 +339,7 @@
keys {
pwr_key: pwr-key {
rockchip,pins = <3 23 RK_FUNC_GPIO &pcfg_pull_up>;
rockchip,pins = <3 RK_PC7 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
};

8
arch/arm/boot/dts/rk3229-evb-android.dtsi
View File

@@ -324,25 +324,25 @@
&pinctrl {
keys {
pwr_key: pwr-key {
rockchip,pins = <3 23 RK_FUNC_GPIO &pcfg_pull_up>;
rockchip,pins = <3 RK_PC7 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
sdmmc {
sdmmc_pwr: sdmmc-pwr {
rockchip,pins = <1 14 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
sdio-pwrseq {
wifi_enable_h: wifi-enable-h {
rockchip,pins = <2 26 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <2 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
usb {
host_vbus_drv: host-vbus-drv {
rockchip,pins = <3 20 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <3 RK_PC4 RK_FUNC_GPIO &pcfg_pull_none>;
};
otg_vbus_drv: otg-vbus-drv {

10
arch/arm/boot/dts/rk3229-gva-sdk.dts
View File

@@ -374,27 +374,27 @@
&pinctrl {
keys {
pwr_key: pwr-key {
rockchip,pins = <1 18 RK_FUNC_GPIO &pcfg_pull_down>;
rockchip,pins = <1 RK_PC2 RK_FUNC_GPIO &pcfg_pull_down>;
};
bt_key: bt-key {
rockchip,pins = <3 31 RK_FUNC_GPIO &pcfg_pull_down>;
rockchip,pins = <3 RK_PD7 RK_FUNC_GPIO &pcfg_pull_down>;
};
mute_key: mute-key {
rockchip,pins = <3 20 RK_FUNC_GPIO &pcfg_pull_down>;
rockchip,pins = <3 RK_PC4 RK_FUNC_GPIO &pcfg_pull_down>;
};
};
pmic {
pmic_int_l: pmic-int-l {
rockchip,pins = <1 12 RK_FUNC_GPIO &pcfg_pull_up>; /* gpio1_b4 */
rockchip,pins = <1 RK_PB4 RK_FUNC_GPIO &pcfg_pull_up>; /* gpio1_b4 */
};
};
sdio-pwrseq {
wifi_enable_h: wifi-enable-h {
rockchip,pins = <3 15 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <3 RK_PB7 RK_FUNC_GPIO &pcfg_pull_none>;
};
};

2
arch/arm/boot/dts/rk3288-android.dtsi
View File

@@ -345,7 +345,7 @@
&pinctrl {
buttons {
pwrbtn: pwrbtn {
rockchip,pins = <0 5 RK_FUNC_GPIO &pcfg_pull_up>;
rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
};

22
arch/arm/boot/dts/rk3288-evb-android-act8846-edp.dts
View File

@@ -442,44 +442,44 @@
&pinctrl {
backlight {
bl_en: bl-en {
rockchip,pins = <7 2 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <7 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
buttons {
pwrbtn: pwrbtn {
rockchip,pins = <0 5 RK_FUNC_GPIO &pcfg_pull_up>;
rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
cam_pins {
cam0_default_pins: cam0-default-pins {
rockchip,pins = <0 17 RK_FUNC_GPIO &pcfg_pull_none>,
<2 15 RK_FUNC_GPIO &pcfg_pull_none>,
<2 11 RK_FUNC_1 &pcfg_pull_none>;
rockchip,pins = <0 RK_PC1 RK_FUNC_GPIO &pcfg_pull_none>,
<2 RK_PB7 RK_FUNC_GPIO &pcfg_pull_none>,
<2 RK_PB3 1 &pcfg_pull_none>;
};
cam0_sleep_pins: cam0-sleep-pins {
rockchip,pins = <0 17 RK_FUNC_GPIO &pcfg_pull_none>,
<2 15 RK_FUNC_GPIO &pcfg_pull_none>,
<2 11 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <0 RK_PC1 RK_FUNC_GPIO &pcfg_pull_none>,
<2 RK_PB7 RK_FUNC_GPIO &pcfg_pull_none>,
<2 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
lcd {
lcd_en: lcd-en {
rockchip,pins = <7 3 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <7 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
wifi {
wifi_pwr: wifi-pwr {
rockchip,pins = <7 9 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <7 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
mpu6050 {
mpu6050_irq_gpio: mpu6050-irq-gpio {
rockchip,pins = <8 0 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <8 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
};

4
arch/arm/boot/dts/rk3288-evb-android-rk808-edp.dtsi
View File

@@ -417,13 +417,13 @@
&pinctrl {
mpu6050 {
mpu6050_irq_gpio: mpu6050-irq-gpio {
rockchip,pins = <8 0 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <8 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
ak8963 {
ak8963_irq_gpio: ak8963-irq-gpio {
rockchip,pins = <8 1 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <8 RK_PA1 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
};

8
arch/arm/boot/dts/rk3288-evb-android-rk818-edp.dts
View File

@@ -415,22 +415,22 @@
&pinctrl {
lcd {
lcd_en: lcd-en {
rockchip,pins = <7 3 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <7 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
mpu6050 {
mpu6050_irq_gpio: mpu6050-irq-gpio {
rockchip,pins = <8 0 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <8 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
pmic {
pmic_int: pmic-int {
rockchip,pins = <RK_GPIO0 4 RK_FUNC_GPIO &pcfg_pull_up>;
rockchip,pins = <0 RK_PA4 RK_FUNC_GPIO &pcfg_pull_up>;
};
vsel1_gpio: vsel1-gpio {
rockchip,pins = <RK_GPIO0 0 RK_FUNC_GPIO &pcfg_pull_down>;
rockchip,pins = <0 RK_PA0 RK_FUNC_GPIO &pcfg_pull_down>;
};
};
};

8
arch/arm/boot/dts/rk3288-evb-android-rk818-hdmi.dts
View File

@@ -389,22 +389,22 @@
&pinctrl {
lcd {
lcd_en: lcd-en {
rockchip,pins = <7 3 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <7 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
mpu6050 {
mpu6050_irq_gpio: mpu6050-irq-gpio {
rockchip,pins = <8 0 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <8 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
pmic {
pmic_int: pmic-int {
rockchip,pins = <RK_GPIO0 4 RK_FUNC_GPIO &pcfg_pull_up>;
rockchip,pins = <0 RK_PA4 RK_FUNC_GPIO &pcfg_pull_up>;
};
vsel1_gpio: vsel1-gpio {
rockchip,pins = <RK_GPIO0 0 RK_FUNC_GPIO &pcfg_pull_down>;
rockchip,pins = <0 RK_PA0 RK_FUNC_GPIO &pcfg_pull_down>;
};
};
};

8
arch/arm/boot/dts/rk3288-evb-android-rk818-lvds.dts
View File

@@ -416,22 +416,22 @@
&pinctrl {
lcd {
lcd_en: lcd-en {
rockchip,pins = <7 3 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <7 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
mpu6050 {
mpu6050_irq_gpio: mpu6050-irq-gpio {
rockchip,pins = <8 0 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <8 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
pmic {
pmic_int: pmic-int {
rockchip,pins = <0 4 RK_FUNC_GPIO &pcfg_pull_up>;
rockchip,pins = <0 RK_PA4 RK_FUNC_GPIO &pcfg_pull_up>;
};
vsel1_gpio: vsel1-gpio {
rockchip,pins = <0 0 RK_FUNC_GPIO &pcfg_pull_down>;
rockchip,pins = <0 RK_PA0 RK_FUNC_GPIO &pcfg_pull_down>;
};
};
};

8
arch/arm/boot/dts/rk3288-evb-android-rk818-mipi-edp.dts
View File

@@ -441,22 +441,22 @@
&pinctrl {
lcd {
lcd_en: lcd-en {
rockchip,pins = <7 3 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <7 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
mpu6050 {
mpu6050_irq_gpio: mpu6050-irq-gpio {
rockchip,pins = <8 0 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <8 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
pmic {
pmic_int: pmic-int {
rockchip,pins = <RK_GPIO0 4 RK_FUNC_GPIO &pcfg_pull_up>;
rockchip,pins = <0 RK_PA4 RK_FUNC_GPIO &pcfg_pull_up>;
};
vsel1_gpio: vsel1-gpio {
rockchip,pins = <RK_GPIO0 0 RK_FUNC_GPIO &pcfg_pull_down>;
rockchip,pins = <0 RK_PA0 RK_FUNC_GPIO &pcfg_pull_down>;
};
};
};

8
arch/arm/boot/dts/rk3288-evb-android-rk818-mipi.dts
View File

@@ -414,22 +414,22 @@
&pinctrl {
lcd {
lcd_en: lcd-en {
rockchip,pins = <7 3 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <7 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
mpu6050 {
mpu6050_irq_gpio: mpu6050-irq-gpio {
rockchip,pins = <8 0 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <8 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
pmic {
pmic_int: pmic-int {
rockchip,pins = <RK_GPIO0 4 RK_FUNC_GPIO &pcfg_pull_up>;
rockchip,pins = <0 RK_PA4 RK_FUNC_GPIO &pcfg_pull_up>;
};
vsel1_gpio: vsel1-gpio {
rockchip,pins = <RK_GPIO0 0 RK_FUNC_GPIO &pcfg_pull_down>;
rockchip,pins = <0 RK_PA0 RK_FUNC_GPIO &pcfg_pull_down>;
};
};
};

26
arch/arm/boot/dts/rk3288-evb-rk1608.dts
View File

@@ -646,25 +646,25 @@
backlight {
bl_en: bl-en {
rockchip,pins = <7 2 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <7 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
lcd {
lcd_en: lcd-en {
rockchip,pins = <7 3 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <7 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
pmic {
pmic_int: pmic-int {
rockchip,pins = <RK_GPIO0 4 RK_FUNC_GPIO &pcfg_pull_up>;
rockchip,pins = <0 RK_PA4 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
sdio-pwrseq {
wifi_enable_h: wifi-enable-h {
rockchip,pins = <4 28 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <4 RK_PD4 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
@@ -674,34 +674,34 @@
* high-speed mode on EVB board so bump up to 8ma.
*/
sdmmc_bus4: sdmmc-bus4 {
rockchip,pins = <6 16 RK_FUNC_1 &pcfg_pull_up_drv_8ma>,
<6 17 RK_FUNC_1 &pcfg_pull_up_drv_8ma>,
<6 18 RK_FUNC_1 &pcfg_pull_up_drv_8ma>,
<6 19 RK_FUNC_1 &pcfg_pull_up_drv_8ma>;
rockchip,pins = <6 RK_PC0 1 &pcfg_pull_up_drv_8ma>,
<6 RK_PC1 1 &pcfg_pull_up_drv_8ma>,
<6 RK_PC2 1 &pcfg_pull_up_drv_8ma>,
<6 RK_PC3 1 &pcfg_pull_up_drv_8ma>;
};
sdmmc_clk: sdmmc-clk {
rockchip,pins = <6 20 RK_FUNC_1 &pcfg_pull_none_drv_8ma>;
rockchip,pins = <6 RK_PC4 1 &pcfg_pull_none_drv_8ma>;
};
sdmmc_cmd: sdmmc-cmd {
rockchip,pins = <6 21 RK_FUNC_1 &pcfg_pull_up_drv_8ma>;
rockchip,pins = <6 RK_PC5 1 &pcfg_pull_up_drv_8ma>;
};
sdmmc_pwr: sdmmc-pwr {
rockchip,pins = <7 11 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <7 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
usb {
host_vbus_drv: host-vbus-drv {
rockchip,pins = <0 14 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <0 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
wireless-bluetooth {
uart0_gpios: uart0-gpios {
rockchip,pins = <4 19 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <4 RK_PC3 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
};

18
arch/arm/boot/dts/rk3288-evb-rk628.dtsi
View File

@@ -575,7 +575,7 @@
pmic {
pmic_int: pmic-int {
rockchip,pins = <RK_GPIO0 4 RK_FUNC_GPIO &pcfg_pull_up>;
rockchip,pins = <0 RK_PA4 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
@@ -585,28 +585,28 @@
* high-speed mode on EVB board so bump up to 8ma.
*/
sdmmc_bus4: sdmmc-bus4 {
rockchip,pins = <6 16 RK_FUNC_1 &pcfg_pull_up_drv_8ma>,
<6 17 RK_FUNC_1 &pcfg_pull_up_drv_8ma>,
<6 18 RK_FUNC_1 &pcfg_pull_up_drv_8ma>,
<6 19 RK_FUNC_1 &pcfg_pull_up_drv_8ma>;
rockchip,pins = <6 RK_PC0 1 &pcfg_pull_up_drv_8ma>,
<6 RK_PC1 1 &pcfg_pull_up_drv_8ma>,
<6 RK_PC2 1 &pcfg_pull_up_drv_8ma>,
<6 RK_PC3 1 &pcfg_pull_up_drv_8ma>;
};
sdmmc_clk: sdmmc-clk {
rockchip,pins = <6 20 RK_FUNC_1 &pcfg_pull_none_drv_8ma>;
rockchip,pins = <6 RK_PC4 1 &pcfg_pull_none_drv_8ma>;
};
sdmmc_cmd: sdmmc-cmd {
rockchip,pins = <6 21 RK_FUNC_1 &pcfg_pull_up_drv_8ma>;
rockchip,pins = <6 RK_PC5 1 &pcfg_pull_up_drv_8ma>;
};
sdmmc_pwr: sdmmc-pwr {
rockchip,pins = <7 11 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <7 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
usb {
host_vbus_drv: host-vbus-drv {
rockchip,pins = <0 14 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <0 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
};

6
arch/arm/boot/dts/rk3288-evb-rk808-linux.dts
View File

@@ -586,19 +586,19 @@
&pinctrl {
backlight {
bl_en: bl-en {
rockchip,pins = <7 2 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <7 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
buttons {
pwrbtn: pwrbtn {
rockchip,pins = <0 5 RK_FUNC_GPIO &pcfg_pull_up>;
rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
mpu6050 {
mpu6050_irq_gpio: mpu6050-irq-gpio {
rockchip,pins = <8 0 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <8 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
};

26
arch/arm/boot/dts/rk3288-firefly-reload-linux.dts
View File

@@ -444,56 +444,56 @@
};
pmic {
pmic_int: pmic-int {
rockchip,pins = <RK_GPIO0 4 RK_FUNC_GPIO &pcfg_pull_up>;
rockchip,pins = <0 RK_PA4 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
lcd {
lcd_cs: lcd-cs {
rockchip,pins = <7 4 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <7 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>;
};
lcd_en: lcd-en {
rockchip,pins = <7 3 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <7 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
act8846 {
pmic_vsel: pmic-vsel {
rockchip,pins = <7 14 RK_FUNC_GPIO &pcfg_output_low>;
rockchip,pins = <7 RK_PB6 RK_FUNC_GPIO &pcfg_output_low>;
};
pwr_hold: pwr-hold {
rockchip,pins = <0 1 RK_FUNC_GPIO &pcfg_output_high>;
rockchip,pins = <0 RK_PA1 RK_FUNC_GPIO &pcfg_output_high>;
};
};
backlight {
bl_en: bl-en {
rockchip,pins = <7 2 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <7 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
buttons {
pwrbtn: pwrbtn {
rockchip,pins = <0 5 RK_FUNC_GPIO &pcfg_pull_up>;
rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
hdmiin {
hdmiin_gpios: hdmiin_gpios {
rockchip,pins =
<7 5 RK_FUNC_GPIO &pcfg_output_high>,
<7 21 RK_FUNC_GPIO &pcfg_output_high>,
<8 8 RK_FUNC_GPIO &pcfg_pull_none>,
<8 9 RK_FUNC_GPIO &pcfg_pull_none>;
<7 RK_PA5 RK_FUNC_GPIO &pcfg_output_high>,
<7 RK_PC5 RK_FUNC_GPIO &pcfg_output_high>,
<8 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>,
<8 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
i2c1 {
i2c1_xfer: i2c1-xfer {
rockchip,pins = <8 4 RK_FUNC_1 &pcfg_pull_up>,
<8 5 RK_FUNC_1 &pcfg_pull_up>;
rockchip,pins = <8 RK_PA4 1 &pcfg_pull_up>,
<8 RK_PA5 1 &pcfg_pull_up>;
};
};
};

24
arch/arm/boot/dts/rk3288-firefly-rk808.dts
View File

@@ -720,55 +720,55 @@
pmic {
pmic_int: pmic-int {
rockchip,pins = <RK_GPIO0 4 RK_FUNC_GPIO &pcfg_pull_up>;
rockchip,pins = <0 RK_PA4 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
eth_phy {
eth_phy_pwr: eth-phy-pwr {
rockchip,pins = <0 6 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <0 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
lcd {
lcd_cs: lcd-cs {
rockchip,pins = <7 4 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <7 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>;
};
lcd_en: lcd-en {
rockchip,pins = <7 3 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <7 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
act8846 {
pmic_vsel: pmic-vsel {
rockchip,pins = <7 14 RK_FUNC_GPIO &pcfg_output_low>;
rockchip,pins = <7 RK_PB6 RK_FUNC_GPIO &pcfg_output_low>;
};
pwr_hold: pwr-hold {
rockchip,pins = <0 1 RK_FUNC_GPIO &pcfg_output_high>;
rockchip,pins = <0 RK_PA1 RK_FUNC_GPIO &pcfg_output_high>;
};
};
backlight {
bl_en: bl-en {
rockchip,pins = <7 2 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <7 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
buttons {
pwrbtn: pwrbtn {
rockchip,pins = <0 5 RK_FUNC_GPIO &pcfg_pull_up>;
rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
hdmiin {
hdmiin_gpios: hdmiin_gpios {
rockchip,pins =
<7 5 RK_FUNC_GPIO &pcfg_pull_none>,
<7 21 RK_FUNC_GPIO &pcfg_pull_none>,
<8 8 RK_FUNC_GPIO &pcfg_pull_none>,
<8 9 RK_FUNC_GPIO &pcfg_pull_none>;
<7 RK_PA5 RK_FUNC_GPIO &pcfg_pull_none>,
<7 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>,
<8 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>,
<8 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
};

38
arch/arm/boot/dts/rk3288-miniarm.dts
View File

@@ -678,42 +678,42 @@
backlight {
bl_en: bl-en {
rockchip,pins = <7 2 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <7 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
buttons {
pwrbtn: pwrbtn {
rockchip,pins = <0 5 RK_FUNC_GPIO &pcfg_pull_up>;
rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
eth_phy {
eth_phy_pwr: eth-phy-pwr {
rockchip,pins = <0 6 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <0 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
pmic {
pmic_int: pmic-int {
rockchip,pins = <RK_GPIO0 4 RK_FUNC_GPIO &pcfg_pull_up>;
rockchip,pins = <0 RK_PA4 RK_FUNC_GPIO &pcfg_pull_up>;
};
dvs_1: dvs-1 {
rockchip,pins = <RK_GPIO0 11 RK_FUNC_GPIO &pcfg_pull_down>;
rockchip,pins = <0 RK_PB3 RK_FUNC_GPIO &pcfg_pull_down>;
};
dvs_2: dvs-2 {
rockchip,pins = <RK_GPIO0 12 RK_FUNC_GPIO &pcfg_pull_down>;
rockchip,pins = <0 RK_PB4 RK_FUNC_GPIO &pcfg_pull_down>;
};
};
sdio-pwrseq {
wifi_enable_h: wifi-enable-h {
rockchip,pins = <4 28 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <4 RK_PD4 RK_FUNC_GPIO &pcfg_pull_none>;
};
chip_enable_h: chip-enable-h {
rockchip,pins = <4 27 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <4 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
@@ -723,44 +723,44 @@
* high-speed mode on EVB board so bump up to 8ma.
*/
sdmmc_bus4: sdmmc-bus4 {
rockchip,pins = <6 16 RK_FUNC_1 &pcfg_pull_up_drv_8ma>,
<6 17 RK_FUNC_1 &pcfg_pull_up_drv_8ma>,
<6 18 RK_FUNC_1 &pcfg_pull_up_drv_8ma>,
<6 19 RK_FUNC_1 &pcfg_pull_up_drv_8ma>;
rockchip,pins = <6 RK_PC0 1 &pcfg_pull_up_drv_8ma>,
<6 RK_PC1 1 &pcfg_pull_up_drv_8ma>,
<6 RK_PC2 1 &pcfg_pull_up_drv_8ma>,
<6 RK_PC3 1 &pcfg_pull_up_drv_8ma>;
};
sdmmc_clk: sdmmc-clk {
rockchip,pins = <6 20 RK_FUNC_1 &pcfg_pull_none_drv_8ma>;
rockchip,pins = <6 RK_PC4 1 &pcfg_pull_none_drv_8ma>;
};
sdmmc_cmd: sdmmc-cmd {
rockchip,pins = <6 21 RK_FUNC_1 &pcfg_pull_up_drv_8ma>;
rockchip,pins = <6 RK_PC5 1 &pcfg_pull_up_drv_8ma>;
};
sdmmc_pwr: sdmmc-pwr {
rockchip,pins = <7 11 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <7 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
usb {
host_vbus_drv: host-vbus-drv {
rockchip,pins = <0 14 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <0 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>;
};
pwr_3g: pwr-3g {
rockchip,pins = <7 8 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <7 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
wireless-bluetooth {
uart0_gpios: uart0-gpios {
rockchip,pins = <4 19 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <4 RK_PC3 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
cam_pins {
cam_pwr: cam-pwr {
rockchip,pins = <2 0 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <2 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
};

14
arch/arm/boot/dts/rk3288-popmetal-android-vga.dts
View File

@@ -545,43 +545,43 @@
&pinctrl {
ak8963 {
comp_int: comp-int {
rockchip,pins = <8 1 RK_FUNC_GPIO &pcfg_pull_up>;
rockchip,pins = <8 RK_PA1 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
buttons {
pwrbtn: pwrbtn {
rockchip,pins = <0 5 RK_FUNC_GPIO &pcfg_pull_up>;
rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
dvp {
dvp_pwr: dvp-pwr {
rockchip,pins = <0 17 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <0 RK_PC1 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
ir {
ir_int: ir-int {
rockchip,pins = <0 6 RK_FUNC_GPIO &pcfg_pull_up>;
rockchip,pins = <0 RK_PA6 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
mma8452 {
gsensor_int: gsensor-int {
rockchip,pins = <8 0 RK_FUNC_GPIO &pcfg_pull_up>;
rockchip,pins = <8 RK_PA0 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
pmic {
pmic_int: pmic-int {
rockchip,pins = <RK_GPIO0 4 RK_FUNC_GPIO &pcfg_pull_up>;
rockchip,pins = <0 RK_PA4 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
sdmmc {
sdmmc_pwr: sdmmc-pwr {
rockchip,pins = <7 11 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <7 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
};

14
arch/arm/boot/dts/rk3288-popmetal-android.dts
View File

@@ -539,43 +539,43 @@
&pinctrl {
ak8963 {
comp_int: comp-int {
rockchip,pins = <8 1 RK_FUNC_GPIO &pcfg_pull_up>;
rockchip,pins = <8 RK_PA1 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
buttons {
pwrbtn: pwrbtn {
rockchip,pins = <0 5 RK_FUNC_GPIO &pcfg_pull_up>;
rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
dvp {
dvp_pwr: dvp-pwr {
rockchip,pins = <0 17 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <0 RK_PC1 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
ir {
ir_int: ir-int {
rockchip,pins = <0 6 RK_FUNC_GPIO &pcfg_pull_up>;
rockchip,pins = <0 RK_PA6 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
mma8452 {
gsensor_int: gsensor-int {
rockchip,pins = <8 0 RK_FUNC_GPIO &pcfg_pull_up>;
rockchip,pins = <8 RK_PA0 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
pmic {
pmic_int: pmic-int {
rockchip,pins = <RK_GPIO0 4 RK_FUNC_GPIO &pcfg_pull_up>;
rockchip,pins = <0 RK_PA4 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
sdmmc {
sdmmc_pwr: sdmmc-pwr {
rockchip,pins = <7 11 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <7 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
};

24
arch/arm/boot/dts/rk3288-th804-avb.dts
View File

@@ -130,30 +130,30 @@
isp_mipi: isp-mipi {
rockchip,pins =
/* cif_clkout */
<2 11 RK_FUNC_1 &pcfg_pull_none_4ma>;
<2 RK_PB3 1 &pcfg_pull_none_4ma>;
};
isp_dvp_d2d9: isp-d2d9 {
rockchip,pins =
/* cif_data2 ... cif_data9 */
<2 0 RK_FUNC_1 &pcfg_pull_down>,
<2 1 RK_FUNC_1 &pcfg_pull_down>,
<2 2 RK_FUNC_1 &pcfg_pull_down>,
<2 3 RK_FUNC_1 &pcfg_pull_down>,
<2 4 RK_FUNC_1 &pcfg_pull_down>,
<2 5 RK_FUNC_1 &pcfg_pull_down>,
<2 RK_PA0 1 &pcfg_pull_down>,
<2 RK_PA1 1 &pcfg_pull_down>,
<2 RK_PA2 1 &pcfg_pull_down>,
<2 RK_PA3 1 &pcfg_pull_down>,
<2 RK_PA4 1 &pcfg_pull_down>,
<2 RK_PA5 1 &pcfg_pull_down>,
/* cif_sync, cif_href */
<2 8 RK_FUNC_1 &pcfg_pull_down>,
<2 9 RK_FUNC_1 &pcfg_pull_down>,
<2 RK_PB0 1 &pcfg_pull_down>,
<2 RK_PB1 1 &pcfg_pull_down>,
/* cif_clkin */
<2 10 RK_FUNC_1 &pcfg_pull_down>;
<2 RK_PB2 1 &pcfg_pull_down>;
};
isp_dvp_d0d1: isp-d0d1 {
rockchip,pins =
/* cif_data0, cif_data1 */
<2 12 RK_FUNC_1 &pcfg_pull_down>,
<2 13 RK_FUNC_1 &pcfg_pull_down>;
<2 RK_PB4 1 &pcfg_pull_down>,
<2 RK_PB5 1 &pcfg_pull_down>;
};
};
};

26
arch/arm/boot/dts/rk3288-th804.dtsi
View File

@@ -775,28 +775,28 @@
&pinctrl {
lcd {
lcd_en: lcd-en {
rockchip,pins = <7 3 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <7 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
backlight {
bl_en: bl-en {
rockchip,pins = <7 2 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <7 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
mpu6050 {
mpu6050_irq_gpio: mpu6050-irq-gpio {
rockchip,pins = <8 0 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <8 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
pmic {
pmic_int: pmic-int {
rockchip,pins = <RK_GPIO0 4 RK_FUNC_GPIO &pcfg_pull_up>;
rockchip,pins = <0 RK_PA4 RK_FUNC_GPIO &pcfg_pull_up>;
};
vsel1_gpio: vsel1-gpio {
rockchip,pins = <RK_GPIO0 0 RK_FUNC_GPIO &pcfg_pull_down>;
rockchip,pins = <0 RK_PA0 RK_FUNC_GPIO &pcfg_pull_down>;
};
};
@@ -815,28 +815,28 @@
* high-speed mode on EVB board so bump up to 8ma.
*/
sdmmc_bus4: sdmmc-bus4 {
rockchip,pins = <6 16 RK_FUNC_1 &pcfg_pull_up_drv_8ma>,
<6 17 RK_FUNC_1 &pcfg_pull_up_drv_8ma>,
<6 18 RK_FUNC_1 &pcfg_pull_up_drv_8ma>,
<6 19 RK_FUNC_1 &pcfg_pull_up_drv_8ma>;
rockchip,pins = <6 RK_PC0 1 &pcfg_pull_up_drv_8ma>,
<6 RK_PC1 1 &pcfg_pull_up_drv_8ma>,
<6 RK_PC2 1 &pcfg_pull_up_drv_8ma>,
<6 RK_PC3 1 &pcfg_pull_up_drv_8ma>;
};
sdmmc_clk: sdmmc-clk {
rockchip,pins = <6 20 RK_FUNC_1 &pcfg_pull_none_drv_8ma>;
rockchip,pins = <6 RK_PC4 1 &pcfg_pull_none_drv_8ma>;
};
sdmmc_cmd: sdmmc-cmd {
rockchip,pins = <6 21 RK_FUNC_1 &pcfg_pull_up_drv_8ma>;
rockchip,pins = <6 RK_PC5 1 &pcfg_pull_up_drv_8ma>;
};
sdmmc_pwr: sdmmc-pwr {
rockchip,pins = <7 11 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <7 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
wireless-bluetooth {
uart0_gpios: uart0-gpios {
rockchip,pins = <4 19 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <4 RK_PC3 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
};

8
arch/arm/boot/dts/rk3288-x7811-rk818-dual-dsi.dts
View File

@@ -400,22 +400,22 @@
&pinctrl {
lcd {
lcd_en: lcd-en {
rockchip,pins = <1 24 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <1 RK_PD0 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
mpu6050 {
mpu6050_irq_gpio: mpu6050-irq-gpio {
rockchip,pins = <8 0 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <8 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
pmic {
pmic_int: pmic-int {
rockchip,pins = <RK_GPIO0 4 RK_FUNC_GPIO &pcfg_pull_up>;
rockchip,pins = <0 RK_PA4 RK_FUNC_GPIO &pcfg_pull_up>;
};
vsel1_gpio: vsel1-gpio {
rockchip,pins = <RK_GPIO0 0 RK_FUNC_GPIO &pcfg_pull_down>;
rockchip,pins = <0 RK_PA0 RK_FUNC_GPIO &pcfg_pull_down>;
};
};
};

2
arch/arm/boot/dts/rk3308-dot-rk816-v10-aarch32.dts
View File

@@ -413,7 +413,7 @@
pmic {
pmic_int_l: pmic-int-l {
rockchip,pins =
<0 6 RK_FUNC_GPIO &pcfg_pull_none>;
<0 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
};

2
arch/arm/boot/dts/rv1126-38x38-v10-emmc.dts
View File

@@ -352,7 +352,7 @@
&pinctrl {
es8311 {
spk_ctl: spk-ctl {
rockchip,pins = <2 RK_PA5 0 &pcfg_pull_none>;
rockchip,pins = <2 RK_PA5 RK_FUNC_GPIO &pcfg_pull_none>;
};
};

4
arch/arm/boot/dts/rv1126-ai-cam.dtsi
View File

@@ -250,13 +250,13 @@
/omit-if-no-ref/
soc_slppin_slp: soc_slppin_slp {
rockchip,pins =
<0 RK_PB2 RK_FUNC_1 &pcfg_pull_none>;
<0 RK_PB2 1 &pcfg_pull_none>;
};
/omit-if-no-ref/
soc_slppin_rst: soc_slppin_rst {
rockchip,pins =
<0 RK_PB2 RK_FUNC_2 &pcfg_pull_none>;
<0 RK_PB2 2 &pcfg_pull_none>;
};
};
};

2
arch/arm/boot/dts/rv1126-bat-ipc-v10.dts
View File

@@ -309,7 +309,7 @@
};
es8311 {
spk_ctl: spk-ctl {
rockchip,pins = <2 RK_PA5 0 &pcfg_pull_none>;
rockchip,pins = <2 RK_PA5 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
ir-cut {

6
arch/arm/boot/dts/rv1126-evb-v10.dtsi
View File

@@ -1068,13 +1068,13 @@
/omit-if-no-ref/
soc_slppin_slp: soc_slppin_slp {
rockchip,pins =
<0 RK_PB2 RK_FUNC_1 &pcfg_pull_none>;
<0 RK_PB2 1 &pcfg_pull_none>;
};
/omit-if-no-ref/
soc_slppin_rst: soc_slppin_rst {
rockchip,pins =
<0 RK_PB2 RK_FUNC_2 &pcfg_pull_none>;
<0 RK_PB2 2 &pcfg_pull_none>;
};
};
@@ -1088,7 +1088,7 @@
wireless-wlan {
/omit-if-no-ref/
wifi_wake_host: wifi-wake-host {
rockchip,pins = <0 RK_PB0 0 &pcfg_pull_up>;
rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
};

4
arch/arm/boot/dts/rv1126-iotest-v10.dts
View File

@@ -315,13 +315,13 @@
/omit-if-no-ref/
soc_slppin_slp: soc_slppin_slp {
rockchip,pins =
<0 RK_PB2 RK_FUNC_1 &pcfg_pull_none>;
<0 RK_PB2 1 &pcfg_pull_none>;
};
/omit-if-no-ref/
soc_slppin_rst: soc_slppin_rst {
rockchip,pins =
<0 RK_PB2 RK_FUNC_2 &pcfg_pull_none>;
<0 RK_PB2 2 &pcfg_pull_none>;
};
};
};

4
arch/arm/boot/dts/rv1126-ipc.dtsi
View File

@@ -116,13 +116,13 @@
/omit-if-no-ref/
soc_slppin_slp: soc_slppin_slp {
rockchip,pins =
<0 RK_PB2 RK_FUNC_1 &pcfg_pull_none>;
<0 RK_PB2 1 &pcfg_pull_none>;
};
/omit-if-no-ref/
soc_slppin_rst: soc_slppin_rst {
rockchip,pins =
<0 RK_PB2 RK_FUNC_2 &pcfg_pull_none>;
<0 RK_PB2 2 &pcfg_pull_none>;
};
};
};

4
arch/arm/boot/dts/rv1126-rmsl-ddr3-v1.dts
View File

@@ -264,12 +264,12 @@
rk1608_gpios {
preisp_irq_gpios: preisp-irq-gpios {
rockchip,pins =
<0 RK_PA4 0 &pcfg_pull_up>;
<0 RK_PA4 RK_FUNC_GPIO &pcfg_pull_up>;
};
preisp_reset_gpios: preisp-reset-gpios {
rockchip,pins =
<0 RK_PA5 0 &pcfg_output_low>;
<0 RK_PA5 RK_FUNC_GPIO &pcfg_output_low>;
};
preisp_24m_mclk: preisp-24m-mclk {

4
arch/arm/boot/dts/rv1126-rmsl.dtsi
View File

@@ -175,13 +175,13 @@
/omit-if-no-ref/
soc_slppin_slp: soc_slppin_slp {
rockchip,pins =
<0 RK_PB2 RK_FUNC_1 &pcfg_pull_none>;
<0 RK_PB2 1 &pcfg_pull_none>;
};
/omit-if-no-ref/
soc_slppin_rst: soc_slppin_rst {
rockchip,pins =
<0 RK_PB2 RK_FUNC_2 &pcfg_pull_none>;
<0 RK_PB2 2 &pcfg_pull_none>;
};
};
};