dts: meson-g12a: update hmditx i2c pinctrl

PD#156734: dts: meson-g12a: update hmditx i2c pinctrl

Remove repetitive i2c definition.

Change-Id: Ide1b6467385b0f31da30aeffe8244d3918d8a0f8
Signed-off-by: Bo Yang <bo.yang@amlogic.com>

diff --git a/arch/arm64/boot/dts/amlogic/g12a_pxp.dts b/arch/arm64/boot/dts/amlogic/g12a_pxp.dts
index 06dbcf8..4bb99c4 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/g12a_pxp.dts
+++ b/arch/arm64/boot/dts/amlogic/g12a_pxp.dts
@@ -144,7 +144,7 @@
                vend-data = <&vend_data>;
                pinctrl-names="default", "hdmitx_i2c";
                pinctrl-0=<&hdmitx_hpd &hdmitx_ddc>;
-               pinctrl-1=<&hdmitx_hpd_gpio &c_i2c_master>;
+               pinctrl-1=<&hdmitx_hpd_gpio &i2c3_master_pins1>;
                clocks = <&clkc CLKID_VAPB_MUX>,
                         <&clkc CLKID_VPU_MUX>;
                clock-names = "hdmi_vapb_clk",

diff --git a/arch/arm64/boot/dts/amlogic/g12a_skt.dts b/arch/arm64/boot/dts/amlogic/g12a_skt.dts
index 0b5fbe3..f529fc2 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/g12a_skt.dts
+++ b/arch/arm64/boot/dts/amlogic/g12a_skt.dts
@@ -178,6 +178,7 @@
 
                internal_phy=<1>;
        };
+
        amhdmitx: amhdmitx{
                compatible = "amlogic, amhdmitx";
                dev_name = "amhdmitx";
@@ -185,7 +186,7 @@
                vend-data = <&vend_data>;
                pinctrl-names="default", "hdmitx_i2c";
                pinctrl-0=<&hdmitx_hpd &hdmitx_ddc>;
-               pinctrl-1=<&hdmitx_hpd_gpio &c_i2c_master>;
+               pinctrl-1=<&hdmitx_hpd_gpio &i2c3_master_pins1>;
                clocks = <&clkc CLKID_VAPB_MUX>,
                         <&clkc CLKID_VPU_MUX>;
                clock-names = "hdmi_vapb_clk",
@@ -205,7 +206,6 @@
                };
        };
 
-
        vdac {
                compatible = "amlogic, vdac";
                dev_name = "vdac";

diff --git a/arch/arm64/boot/dts/amlogic/mesong12a.dtsi b/arch/arm64/boot/dts/amlogic/mesong12a.dtsi
index 5ece33d..407e5e1 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/mesong12a.dtsi
+++ b/arch/arm64/boot/dts/amlogic/mesong12a.dtsi
@@ -1224,15 +1224,6 @@
                };
        };
 
-       c_i2c_master: c_i2c {
-               mux {
-                       groups = "i2c0_sda_c",
-                       "i2c0_sck_c";
-                       function = "i2c3";
-                       bias-disable;
-               };
-       };
-
        eecec_a: ee_ceca {
                mux {
                        groups = "cec_ao_a_ee";