diff --git a/arch/arm/boot/dts/rk3288-evb-rk628-rgb2dsi-avb.dts b/arch/arm/boot/dts/rk3288-evb-rk628-rgb2dsi-avb.dts index defa206e2a0d..ca0a9d54befc 100644 --- a/arch/arm/boot/dts/rk3288-evb-rk628-rgb2dsi-avb.dts +++ b/arch/arm/boot/dts/rk3288-evb-rk628-rgb2dsi-avb.dts @@ -266,7 +266,7 @@ &rk628_post_process { pinctrl-names = "default"; - pinctrl-0 = <&vop_pins>; + pinctrl-0 = <&rk628_vop_pins>; status = "okay"; ports { diff --git a/arch/arm/boot/dts/rk3288-evb-rk628-rgb2hdmi-avb.dts b/arch/arm/boot/dts/rk3288-evb-rk628-rgb2hdmi-avb.dts index 2d8c6afe5ca4..18ff5ed03d5f 100644 --- a/arch/arm/boot/dts/rk3288-evb-rk628-rgb2hdmi-avb.dts +++ b/arch/arm/boot/dts/rk3288-evb-rk628-rgb2hdmi-avb.dts @@ -27,7 +27,7 @@ &rk628_post_process { pinctrl-names = "default"; - pinctrl-0 = <&vop_pins>; + pinctrl-0 = <&rk628_vop_pins>; status = "okay"; ports { diff --git a/arch/arm/boot/dts/rk3288-evb-rk628-rgb2lvds-avb.dts b/arch/arm/boot/dts/rk3288-evb-rk628-rgb2lvds-avb.dts index 62d0e2feb0ad..81577652ae11 100644 --- a/arch/arm/boot/dts/rk3288-evb-rk628-rgb2lvds-avb.dts +++ b/arch/arm/boot/dts/rk3288-evb-rk628-rgb2lvds-avb.dts @@ -77,7 +77,7 @@ &rk628_post_process { pinctrl-names = "default"; - pinctrl-0 = <&vop_pins>; + pinctrl-0 = <&rk628_vop_pins>; status = "okay"; ports { diff --git a/arch/arm/boot/dts/rk3288-evb-rk628-rgb2lvds-dual-avb.dts b/arch/arm/boot/dts/rk3288-evb-rk628-rgb2lvds-dual-avb.dts index 2153da4dc2d0..5fa6de887356 100644 --- a/arch/arm/boot/dts/rk3288-evb-rk628-rgb2lvds-dual-avb.dts +++ b/arch/arm/boot/dts/rk3288-evb-rk628-rgb2lvds-dual-avb.dts @@ -84,7 +84,7 @@ &rk628_post_process { pinctrl-names = "default"; - pinctrl-0 = <&vop_pins>; + pinctrl-0 = <&rk628_vop_pins>; status = "okay"; ports { diff --git a/arch/arm/boot/dts/rk628.dtsi b/arch/arm/boot/dts/rk628.dtsi index 39b9af6f39dd..47631dbbd23d 100644 --- a/arch/arm/boot/dts/rk628.dtsi +++ b/arch/arm/boot/dts/rk628.dtsi @@ -85,7 +85,7 @@ #interrupt-cells = <2>; }; - i2sm0_pins: i2sm0 { + rk628_i2sm0_pins: i2sm0 { pins = "gpio0a2", /* i2sm0_sck */ "gpio0a3", /* i2sm0_lr */ "gpio0a4", /* i2sm0_d0 */ @@ -95,28 +95,28 @@ function = "i2sm0"; }; - hpd_in_pins: hpd-in { + rk628_hpd_in_pins: hpd-in { pins = "gpio0b0"; function = "hpd_in"; }; - ddc_tx_pins: ddc-tx { + rk628_ddc_tx_pins: ddc-tx { pins = "gpio0b1", /* ddc_tx_sda */ "gpio0b2"; /* ddc_tx_scl */ function = "ddc_tx"; }; - cec_tx_pins: cec-tx { + rk628_cec_tx_pins: cec-tx { pins = "gpio0b3"; function = "cec_tx"; }; - test_clkout_pins: test-clkout { + rk628_test_clkout_pins: test-clkout { pins = "gpio1a0"; function = "test_clkout"; }; - i2sm1_pins: i2sm1 { + rk628_i2sm1_pins: i2sm1 { pins = "gpio1a2", /* i2sm1_sck */ "gpio1a3", /* i2sm1_lr */ "gpio1a4", /* i2sm1_d0 */ @@ -126,23 +126,23 @@ function = "i2sm1"; }; - hpdm0_out_pins: hpdm0-out { + rk628_hpdm0_out_pins: hpdm0-out { pins = "gpio1b0"; function = "hpdm0_out"; }; - ddcm0_rx_pins: ddcm0-rx { + rk628_ddcm0_rx_pins: ddcm0-rx { pins = "gpio1b1", /* ddcm0_rx_sda */ "gpio1b2"; /* ddcm0_rx_scl */ function = "ddcm0_rx"; }; - cecm0_rx_pins: cecm0_rx { + rk628_cecm0_rx_pins: cecm0_rx { pins = "gpio1b3"; function = "cecm0_rx"; }; - vop_pins: vop { + rk628_vop_pins: vop { pins = "gpio2a0", /* vop_d0 */ "gpio2a1", /* vop_d1 */ "gpio2a2", /* vop_d2 */ @@ -175,62 +175,62 @@ drive-strength = <1>; }; - hpdm1_out: hpdm1-out { + rk628_hpdm1_out: hpdm1-out { pins = "gpio3a4"; function = "hpdm1_out"; }; - ddcm1_rx_pins: ddcm1-rx { + rk628_ddcm1_rx_pins: ddcm1-rx { pins = "gpio3a5", /* ddcm1_rx_sda */ "gpio3a6"; /* ddcm1_rx_scl */ function = "ddcm1_rx"; }; - cecm1_rx_pins: cecm1-rx { + rk628_cecm1_rx_pins: cecm1-rx { pins = "gpio3a7"; function = "cecm1_rx"; }; - gvi_hpd_pins: gvi-hpd { + rk628_gvi_hpd_pins: gvi-hpd { pins = "gpio3b1"; function = "gvi_hpd"; }; - gvi_lock_pins: gvi-lock { + rk628_gvi_lock_pins: gvi-lock { pins = "gpio3b2"; function = "gvi_lock"; }; - hdmirx_cec0: hdmirx-cec0 { + rk628_hdmirx_cec0: hdmirx-cec0 { pins = "hdmirx_cec"; function = "hdmirx_cec0"; }; - hdmirx_cec1: hdmirx-cec1 { + rk628_hdmirx_cec1: hdmirx-cec1 { pins = "hdmirx_cec"; function = "hdmirx_cec1"; }; - rxddc_input0: rxddc-input0 { + rk628_rxddc_input0: rxddc-input0 { pins = "rxddc_scl", "rxddc_sda"; function = "rxddc_input0"; }; - rxddc_input1: rxddc-input1 { + rk628_rxddc_input1: rxddc-input1 { pins = "rxddc_scl", "rxddc_sda"; function = "rxddc_input1"; }; - i2sm0_input: i2sm0-input { + rk628_i2sm0_input: i2sm0-input { pins = "i2sm_sck", "i2sm_d", "i2sm_lr"; function = "i2sm0_input"; }; - i2sm1_input: i2sm1-input { + rk628_i2sm1_input: i2sm1-input { pins = "i2sm_sck", "i2sm_d", "i2sm_lr"; @@ -341,7 +341,7 @@ <&rk628_cru CGU_SCLK_VOP>; clock-names = "pclk", "dclk"; pinctrl-names = "default"; - pinctrl-0 = <&hpd_in_pins &ddc_tx_pins &i2sm0_pins>; + pinctrl-0 = <&rk628_hpd_in_pins &rk628_ddc_tx_pins &rk628_i2sm0_pins>; #sound-dai-cells = <0>; status = "disabled"; }; @@ -382,7 +382,7 @@ phys = <&rk628_combrxphy>, <&rk628_combtxphy>; phy-names = "combrxphy", "combtxphy"; pinctrl-names = "default"; - pinctrl-0 = <&hpdm0_out_pins &ddcm0_rx_pins>; + pinctrl-0 = <&rk628_hpdm0_out_pins &rk628_ddcm0_rx_pins>; status = "disabled"; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10-rk628-bt1120-to-hdmi.dts b/arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10-rk628-bt1120-to-hdmi.dts index 0c5ea5eb32ba..106e85c07eb4 100644 --- a/arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10-rk628-bt1120-to-hdmi.dts +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10-rk628-bt1120-to-hdmi.dts @@ -49,7 +49,7 @@ &rk628_post_process { pinctrl-names = "default"; - pinctrl-0 = <&vop_pins>; + pinctrl-0 = <&rk628_vop_pins>; status = "okay"; mode-sync-pol = <0>; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10-rk628-rgb2hdmi.dts b/arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10-rk628-rgb2hdmi.dts index 597fa0b0b089..a4759f1ba85e 100644 --- a/arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10-rk628-rgb2hdmi.dts +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10-rk628-rgb2hdmi.dts @@ -45,7 +45,7 @@ &rk628_post_process { pinctrl-names = "default"; - pinctrl-0 = <&vop_pins>; + pinctrl-0 = <&rk628_vop_pins>; status = "okay"; mode-sync-pol = <0>;