diff --git a/arch/arm/boot/dts/px3se-evb.dts b/arch/arm/boot/dts/px3se-evb.dts index c4adff7d8c42..002cef665376 100644 --- a/arch/arm/boot/dts/px3se-evb.dts +++ b/arch/arm/boot/dts/px3se-evb.dts @@ -699,34 +699,34 @@ &vpu_mmu { &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>; }; }; }; diff --git a/arch/arm/boot/dts/rk3036-echo.dts b/arch/arm/boot/dts/rk3036-echo.dts index ab27a9c368c2..fe37c7eb713d 100644 --- a/arch/arm/boot/dts/rk3036-echo.dts +++ b/arch/arm/boot/dts/rk3036-echo.dts @@ -713,37 +713,37 @@ &wdt { &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>; }; }; }; diff --git a/arch/arm/boot/dts/rk3126-bnd-d708.dtsi b/arch/arm/boot/dts/rk3126-bnd-d708.dtsi index c55e76cac169..80a7581fab98 100644 --- a/arch/arm/boot/dts/rk3126-bnd-d708.dtsi +++ b/arch/arm/boot/dts/rk3126-bnd-d708.dtsi @@ -602,13 +602,13 @@ lcdc_lcdc: lcdc-lcdc { 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>; }; }; }; diff --git a/arch/arm/boot/dts/rk3126-evb.dts b/arch/arm/boot/dts/rk3126-evb.dts index 32688fe105d4..e23578c64fb8 100644 --- a/arch/arm/boot/dts/rk3126-evb.dts +++ b/arch/arm/boot/dts/rk3126-evb.dts @@ -407,23 +407,23 @@ lcdc_rgb_pins: lcdc-rgb-pins { 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>; }; }; }; diff --git a/arch/arm/boot/dts/rk3126-m88.dts b/arch/arm/boot/dts/rk3126-m88.dts index 2248687cb30b..0bce07dd664f 100644 --- a/arch/arm/boot/dts/rk3126-m88.dts +++ b/arch/arm/boot/dts/rk3126-m88.dts @@ -533,29 +533,29 @@ lcdc_rgb_pins: lcdc-rgb-pins { 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>; }; }; }; diff --git a/arch/arm/boot/dts/rk3128-fireprime.dts b/arch/arm/boot/dts/rk3128-fireprime.dts index 8cf91aa5d53b..cd8ca63187f6 100644 --- a/arch/arm/boot/dts/rk3128-fireprime.dts +++ b/arch/arm/boot/dts/rk3128-fireprime.dts @@ -371,7 +371,7 @@ battery { &pinctrl { pmic { pmic_int_l: pmic-int-l { - rockchip,pins = ; + rockchip,pins = <3 RK_PC6 RK_FUNC_GPIO &pcfg_pull_default>; }; }; diff --git a/arch/arm/boot/dts/rk3128h-box-avb.dts b/arch/arm/boot/dts/rk3128h-box-avb.dts index b06661f74472..93b4bc2ca868 100644 --- a/arch/arm/boot/dts/rk3128h-box-avb.dts +++ b/arch/arm/boot/dts/rk3128h-box-avb.dts @@ -53,7 +53,7 @@ vendor { &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>; }; }; }; diff --git a/arch/arm/boot/dts/rk3128h-box.dtsi b/arch/arm/boot/dts/rk3128h-box.dtsi index 3f8ab6e64e8b..533c27bd0a23 100644 --- a/arch/arm/boot/dts/rk3128h-box.dtsi +++ b/arch/arm/boot/dts/rk3128h-box.dtsi @@ -364,29 +364,29 @@ &nandc { &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 { diff --git a/arch/arm/boot/dts/rk3128x.dtsi b/arch/arm/boot/dts/rk3128x.dtsi index bb8743d266ab..bb8e13f0566c 100644 --- a/arch/arm/boot/dts/rk3128x.dtsi +++ b/arch/arm/boot/dts/rk3128x.dtsi @@ -1325,353 +1325,353 @@ pcfg_pull_none_drv_12ma: pcfg-pull-none-drv-12ma { 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>; }; }; }; diff --git a/arch/arm/boot/dts/rk312x.dtsi b/arch/arm/boot/dts/rk312x.dtsi index 912b92aa492e..eb8139483260 100644 --- a/arch/arm/boot/dts/rk312x.dtsi +++ b/arch/arm/boot/dts/rk312x.dtsi @@ -1393,24 +1393,24 @@ lcdc_rgb_pins: lcdc-rgb-pins { 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 */ }; }; diff --git a/arch/arm/boot/dts/rk3229-at-3nod-func.dts b/arch/arm/boot/dts/rk3229-at-3nod-func.dts index 98a245da5f00..29e07d18a342 100644 --- a/arch/arm/boot/dts/rk3229-at-3nod-func.dts +++ b/arch/arm/boot/dts/rk3229-at-3nod-func.dts @@ -104,26 +104,26 @@ &pinctrl { 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>; }; }; }; diff --git a/arch/arm/boot/dts/rk3229-at-3nod.dts b/arch/arm/boot/dts/rk3229-at-3nod.dts index cb24ccc6585c..d38b303cadae 100644 --- a/arch/arm/boot/dts/rk3229-at-3nod.dts +++ b/arch/arm/boot/dts/rk3229-at-3nod.dts @@ -98,13 +98,13 @@ &pinctrl { 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>; }; }; }; diff --git a/arch/arm/boot/dts/rk3229-at-common.dtsi b/arch/arm/boot/dts/rk3229-at-common.dtsi index 147c413143fb..7d8e032eb4d1 100644 --- a/arch/arm/boot/dts/rk3229-at-common.dtsi +++ b/arch/arm/boot/dts/rk3229-at-common.dtsi @@ -247,7 +247,7 @@ &io_domains { &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 */ }; }; diff --git a/arch/arm/boot/dts/rk3229-at-gva.dts b/arch/arm/boot/dts/rk3229-at-gva.dts index 2cb75a4b2ef5..4d7ab0d0f322 100644 --- a/arch/arm/boot/dts/rk3229-at-gva.dts +++ b/arch/arm/boot/dts/rk3229-at-gva.dts @@ -136,13 +136,13 @@ &pinctrl { 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>; }; }; }; diff --git a/arch/arm/boot/dts/rk3229-at-som.dtsi b/arch/arm/boot/dts/rk3229-at-som.dtsi index ad73470588b1..f8e8a3db8962 100644 --- a/arch/arm/boot/dts/rk3229-at-som.dtsi +++ b/arch/arm/boot/dts/rk3229-at-som.dtsi @@ -145,61 +145,61 @@ &i2s1 { &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>; }; }; diff --git a/arch/arm/boot/dts/rk3229-echo-v10.dts b/arch/arm/boot/dts/rk3229-echo-v10.dts index 7d3e9b048020..6c75c8d98b2d 100644 --- a/arch/arm/boot/dts/rk3229-echo-v10.dts +++ b/arch/arm/boot/dts/rk3229-echo-v10.dts @@ -317,19 +317,19 @@ &io_domains { &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 @@ otg_vbus_drv: otg-vbus-drv { 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>; }; }; }; diff --git a/arch/arm/boot/dts/rk3229-evb-android.dtsi b/arch/arm/boot/dts/rk3229-evb-android.dtsi index 965d2ec8b231..1c1ae22e2a6e 100644 --- a/arch/arm/boot/dts/rk3229-evb-android.dtsi +++ b/arch/arm/boot/dts/rk3229-evb-android.dtsi @@ -324,25 +324,25 @@ &nandc { &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 { diff --git a/arch/arm/boot/dts/rk3229-gva-sdk.dts b/arch/arm/boot/dts/rk3229-gva-sdk.dts index 8c25d400c544..99a3c7cfeec9 100644 --- a/arch/arm/boot/dts/rk3229-gva-sdk.dts +++ b/arch/arm/boot/dts/rk3229-gva-sdk.dts @@ -374,27 +374,27 @@ &io_domains { &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>; }; }; diff --git a/arch/arm/boot/dts/rk3288-android.dtsi b/arch/arm/boot/dts/rk3288-android.dtsi index ac5b4226598f..481d7bfd8c7f 100644 --- a/arch/arm/boot/dts/rk3288-android.dtsi +++ b/arch/arm/boot/dts/rk3288-android.dtsi @@ -345,7 +345,7 @@ &uart2 { &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>; }; }; }; diff --git a/arch/arm/boot/dts/rk3288-evb-android-act8846-edp.dts b/arch/arm/boot/dts/rk3288-evb-android-act8846-edp.dts index 1eed7936ebf1..565d0f430d90 100644 --- a/arch/arm/boot/dts/rk3288-evb-android-act8846-edp.dts +++ b/arch/arm/boot/dts/rk3288-evb-android-act8846-edp.dts @@ -442,44 +442,44 @@ &uart2 { &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>; }; }; }; diff --git a/arch/arm/boot/dts/rk3288-evb-android-rk808-edp.dtsi b/arch/arm/boot/dts/rk3288-evb-android-rk808-edp.dtsi index a23e01deb377..e8e3890a3b2b 100644 --- a/arch/arm/boot/dts/rk3288-evb-android-rk808-edp.dtsi +++ b/arch/arm/boot/dts/rk3288-evb-android-rk808-edp.dtsi @@ -417,13 +417,13 @@ &pwm1 { &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>; }; }; }; diff --git a/arch/arm/boot/dts/rk3288-evb-android-rk818-edp.dts b/arch/arm/boot/dts/rk3288-evb-android-rk818-edp.dts index b6690b6efbd5..26bcdfe2d91d 100644 --- a/arch/arm/boot/dts/rk3288-evb-android-rk818-edp.dts +++ b/arch/arm/boot/dts/rk3288-evb-android-rk818-edp.dts @@ -415,22 +415,22 @@ &tsadc { &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 = ; + rockchip,pins = <0 RK_PA4 RK_FUNC_GPIO &pcfg_pull_up>; }; vsel1_gpio: vsel1-gpio { - rockchip,pins = ; + rockchip,pins = <0 RK_PA0 RK_FUNC_GPIO &pcfg_pull_down>; }; }; }; diff --git a/arch/arm/boot/dts/rk3288-evb-android-rk818-hdmi.dts b/arch/arm/boot/dts/rk3288-evb-android-rk818-hdmi.dts index 70bc513743c7..c32fbd4c3d82 100644 --- a/arch/arm/boot/dts/rk3288-evb-android-rk818-hdmi.dts +++ b/arch/arm/boot/dts/rk3288-evb-android-rk818-hdmi.dts @@ -389,22 +389,22 @@ &tsadc { &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 = ; + rockchip,pins = <0 RK_PA4 RK_FUNC_GPIO &pcfg_pull_up>; }; vsel1_gpio: vsel1-gpio { - rockchip,pins = ; + rockchip,pins = <0 RK_PA0 RK_FUNC_GPIO &pcfg_pull_down>; }; }; }; diff --git a/arch/arm/boot/dts/rk3288-evb-android-rk818-lvds.dts b/arch/arm/boot/dts/rk3288-evb-android-rk818-lvds.dts index 878d0c498989..d35ee4ba847e 100644 --- a/arch/arm/boot/dts/rk3288-evb-android-rk818-lvds.dts +++ b/arch/arm/boot/dts/rk3288-evb-android-rk818-lvds.dts @@ -416,22 +416,22 @@ &tsadc { &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>; }; }; }; diff --git a/arch/arm/boot/dts/rk3288-evb-android-rk818-mipi-edp.dts b/arch/arm/boot/dts/rk3288-evb-android-rk818-mipi-edp.dts index a950afbc6f50..b6aef8fc146a 100644 --- a/arch/arm/boot/dts/rk3288-evb-android-rk818-mipi-edp.dts +++ b/arch/arm/boot/dts/rk3288-evb-android-rk818-mipi-edp.dts @@ -441,22 +441,22 @@ &tsadc { &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 = ; + rockchip,pins = <0 RK_PA4 RK_FUNC_GPIO &pcfg_pull_up>; }; vsel1_gpio: vsel1-gpio { - rockchip,pins = ; + rockchip,pins = <0 RK_PA0 RK_FUNC_GPIO &pcfg_pull_down>; }; }; }; diff --git a/arch/arm/boot/dts/rk3288-evb-android-rk818-mipi.dts b/arch/arm/boot/dts/rk3288-evb-android-rk818-mipi.dts index 25bb3a1d5dc5..974427820a0c 100644 --- a/arch/arm/boot/dts/rk3288-evb-android-rk818-mipi.dts +++ b/arch/arm/boot/dts/rk3288-evb-android-rk818-mipi.dts @@ -414,22 +414,22 @@ &tsadc { &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 = ; + rockchip,pins = <0 RK_PA4 RK_FUNC_GPIO &pcfg_pull_up>; }; vsel1_gpio: vsel1-gpio { - rockchip,pins = ; + rockchip,pins = <0 RK_PA0 RK_FUNC_GPIO &pcfg_pull_down>; }; }; }; diff --git a/arch/arm/boot/dts/rk3288-evb-rk1608.dts b/arch/arm/boot/dts/rk3288-evb-rk1608.dts index ff8eb0c87d58..fafe5b80eb0c 100644 --- a/arch/arm/boot/dts/rk3288-evb-rk1608.dts +++ b/arch/arm/boot/dts/rk3288-evb-rk1608.dts @@ -646,25 +646,25 @@ pcfg_pull_up_drv_8ma: pcfg-pull-up-drv-8ma { 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 = ; + 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 @@ sdmmc { * 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>; }; }; }; diff --git a/arch/arm/boot/dts/rk3288-evb-rk628.dtsi b/arch/arm/boot/dts/rk3288-evb-rk628.dtsi index 4b83c09018fb..d18cda86d91e 100644 --- a/arch/arm/boot/dts/rk3288-evb-rk628.dtsi +++ b/arch/arm/boot/dts/rk3288-evb-rk628.dtsi @@ -575,7 +575,7 @@ pcfg_pull_up_drv_8ma: pcfg-pull-up-drv-8ma { pmic { pmic_int: pmic-int { - rockchip,pins = ; + rockchip,pins = <0 RK_PA4 RK_FUNC_GPIO &pcfg_pull_up>; }; }; @@ -585,28 +585,28 @@ sdmmc { * 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>; }; }; }; diff --git a/arch/arm/boot/dts/rk3288-evb-rk808-linux.dts b/arch/arm/boot/dts/rk3288-evb-rk808-linux.dts index cb00394d925a..f3d2262a0099 100644 --- a/arch/arm/boot/dts/rk3288-evb-rk808-linux.dts +++ b/arch/arm/boot/dts/rk3288-evb-rk808-linux.dts @@ -586,19 +586,19 @@ &pwm1 { &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>; }; }; }; diff --git a/arch/arm/boot/dts/rk3288-firefly-reload-linux.dts b/arch/arm/boot/dts/rk3288-firefly-reload-linux.dts index 3cefff74d004..0aefa4c0f9fd 100644 --- a/arch/arm/boot/dts/rk3288-firefly-reload-linux.dts +++ b/arch/arm/boot/dts/rk3288-firefly-reload-linux.dts @@ -444,56 +444,56 @@ pcfg_output_low: pcfg-output-low { }; pmic { pmic_int: pmic-int { - rockchip,pins = ; + 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>; }; }; }; diff --git a/arch/arm/boot/dts/rk3288-firefly-rk808.dts b/arch/arm/boot/dts/rk3288-firefly-rk808.dts index 20af18720e05..0990c326f465 100644 --- a/arch/arm/boot/dts/rk3288-firefly-rk808.dts +++ b/arch/arm/boot/dts/rk3288-firefly-rk808.dts @@ -720,55 +720,55 @@ pcfg_output_low: pcfg-output-low { pmic { pmic_int: pmic-int { - rockchip,pins = ; + 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>; }; }; }; diff --git a/arch/arm/boot/dts/rk3288-miniarm.dts b/arch/arm/boot/dts/rk3288-miniarm.dts index 2508eb6c1766..fc6e3bf5ff15 100644 --- a/arch/arm/boot/dts/rk3288-miniarm.dts +++ b/arch/arm/boot/dts/rk3288-miniarm.dts @@ -678,42 +678,42 @@ pcfg_pull_up_drv_8ma: pcfg-pull-up-drv-8ma { 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 = ; + rockchip,pins = <0 RK_PA4 RK_FUNC_GPIO &pcfg_pull_up>; }; dvs_1: dvs-1 { - rockchip,pins = ; + rockchip,pins = <0 RK_PB3 RK_FUNC_GPIO &pcfg_pull_down>; }; dvs_2: dvs-2 { - rockchip,pins = ; + 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 @@ sdmmc { * 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>; }; }; }; diff --git a/arch/arm/boot/dts/rk3288-popmetal-android-vga.dts b/arch/arm/boot/dts/rk3288-popmetal-android-vga.dts index ec68a65edd0f..d03d68af52e5 100644 --- a/arch/arm/boot/dts/rk3288-popmetal-android-vga.dts +++ b/arch/arm/boot/dts/rk3288-popmetal-android-vga.dts @@ -545,43 +545,43 @@ &rga { &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 = ; + 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>; }; }; }; diff --git a/arch/arm/boot/dts/rk3288-popmetal-android.dts b/arch/arm/boot/dts/rk3288-popmetal-android.dts index e05b455f3ceb..429afdf63bc3 100644 --- a/arch/arm/boot/dts/rk3288-popmetal-android.dts +++ b/arch/arm/boot/dts/rk3288-popmetal-android.dts @@ -539,43 +539,43 @@ &rga { &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 = ; + 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>; }; }; }; diff --git a/arch/arm/boot/dts/rk3288-th804-avb.dts b/arch/arm/boot/dts/rk3288-th804-avb.dts index 7ba6816ab9cc..ea34d09b8e40 100644 --- a/arch/arm/boot/dts/rk3288-th804-avb.dts +++ b/arch/arm/boot/dts/rk3288-th804-avb.dts @@ -130,30 +130,30 @@ isp_pin { 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>; }; }; }; diff --git a/arch/arm/boot/dts/rk3288-th804.dtsi b/arch/arm/boot/dts/rk3288-th804.dtsi index 8c6a535e704a..179d17a56434 100644 --- a/arch/arm/boot/dts/rk3288-th804.dtsi +++ b/arch/arm/boot/dts/rk3288-th804.dtsi @@ -775,28 +775,28 @@ &rockchip_suspend { &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 = ; + rockchip,pins = <0 RK_PA4 RK_FUNC_GPIO &pcfg_pull_up>; }; vsel1_gpio: vsel1-gpio { - rockchip,pins = ; + rockchip,pins = <0 RK_PA0 RK_FUNC_GPIO &pcfg_pull_down>; }; }; @@ -815,28 +815,28 @@ sdmmc { * 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>; }; }; }; diff --git a/arch/arm/boot/dts/rk3288-x7811-rk818-dual-dsi.dts b/arch/arm/boot/dts/rk3288-x7811-rk818-dual-dsi.dts index f4500ee402c9..bc90a8a4a853 100644 --- a/arch/arm/boot/dts/rk3288-x7811-rk818-dual-dsi.dts +++ b/arch/arm/boot/dts/rk3288-x7811-rk818-dual-dsi.dts @@ -400,22 +400,22 @@ &tsadc { &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 = ; + rockchip,pins = <0 RK_PA4 RK_FUNC_GPIO &pcfg_pull_up>; }; vsel1_gpio: vsel1-gpio { - rockchip,pins = ; + rockchip,pins = <0 RK_PA0 RK_FUNC_GPIO &pcfg_pull_down>; }; }; }; diff --git a/arch/arm/boot/dts/rk3308-dot-rk816-v10-aarch32.dts b/arch/arm/boot/dts/rk3308-dot-rk816-v10-aarch32.dts index 9b03e9f68057..a5e995a97160 100644 --- a/arch/arm/boot/dts/rk3308-dot-rk816-v10-aarch32.dts +++ b/arch/arm/boot/dts/rk3308-dot-rk816-v10-aarch32.dts @@ -413,7 +413,7 @@ wifi_wake_host: wifi-wake-host { 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>; }; }; }; diff --git a/arch/arm/boot/dts/rv1126-38x38-v10-emmc.dts b/arch/arm/boot/dts/rv1126-38x38-v10-emmc.dts index 980b92ba5755..4ed41f3fc9f4 100644 --- a/arch/arm/boot/dts/rv1126-38x38-v10-emmc.dts +++ b/arch/arm/boot/dts/rv1126-38x38-v10-emmc.dts @@ -352,7 +352,7 @@ &npu_opp_table { &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>; }; }; diff --git a/arch/arm/boot/dts/rv1126-ai-cam.dtsi b/arch/arm/boot/dts/rv1126-ai-cam.dtsi index 513df0cea4a0..a395107b8e00 100644 --- a/arch/arm/boot/dts/rv1126-ai-cam.dtsi +++ b/arch/arm/boot/dts/rv1126-ai-cam.dtsi @@ -250,13 +250,13 @@ soc_slppin_gpio: soc_slppin_gpio { /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>; }; }; }; diff --git a/arch/arm/boot/dts/rv1126-bat-ipc-v10.dts b/arch/arm/boot/dts/rv1126-bat-ipc-v10.dts index 0378e4948c86..93d35900ca2a 100644 --- a/arch/arm/boot/dts/rv1126-bat-ipc-v10.dts +++ b/arch/arm/boot/dts/rv1126-bat-ipc-v10.dts @@ -309,7 +309,7 @@ charger_io: charger-io { }; 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 { diff --git a/arch/arm/boot/dts/rv1126-evb-v10.dtsi b/arch/arm/boot/dts/rv1126-evb-v10.dtsi index a0c95cf18043..76dddea8d1c1 100644 --- a/arch/arm/boot/dts/rv1126-evb-v10.dtsi +++ b/arch/arm/boot/dts/rv1126-evb-v10.dtsi @@ -1068,13 +1068,13 @@ soc_slppin_gpio: soc_slppin_gpio { /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 @@ wifi_enable_h: wifi-enable-h { 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>; }; }; }; diff --git a/arch/arm/boot/dts/rv1126-iotest-v10.dts b/arch/arm/boot/dts/rv1126-iotest-v10.dts index 8a39d072521a..c2cfb853b9c8 100644 --- a/arch/arm/boot/dts/rv1126-iotest-v10.dts +++ b/arch/arm/boot/dts/rv1126-iotest-v10.dts @@ -315,13 +315,13 @@ soc_slppin_gpio: soc_slppin_gpio { /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>; }; }; }; diff --git a/arch/arm/boot/dts/rv1126-ipc.dtsi b/arch/arm/boot/dts/rv1126-ipc.dtsi index d9c69e99d440..4778f0b60f55 100644 --- a/arch/arm/boot/dts/rv1126-ipc.dtsi +++ b/arch/arm/boot/dts/rv1126-ipc.dtsi @@ -116,13 +116,13 @@ soc_slppin_gpio: soc_slppin_gpio { /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>; }; }; }; diff --git a/arch/arm/boot/dts/rv1126-rmsl-ddr3-v1.dts b/arch/arm/boot/dts/rv1126-rmsl-ddr3-v1.dts index d72fe824e91a..5349d7bc1780 100644 --- a/arch/arm/boot/dts/rv1126-rmsl-ddr3-v1.dts +++ b/arch/arm/boot/dts/rv1126-rmsl-ddr3-v1.dts @@ -264,12 +264,12 @@ &pinctrl { 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 { diff --git a/arch/arm/boot/dts/rv1126-rmsl.dtsi b/arch/arm/boot/dts/rv1126-rmsl.dtsi index 3a47ea669a99..75ba8e00ddc9 100644 --- a/arch/arm/boot/dts/rv1126-rmsl.dtsi +++ b/arch/arm/boot/dts/rv1126-rmsl.dtsi @@ -175,13 +175,13 @@ soc_slppin_gpio: soc_slppin_gpio { /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>; }; }; };