hdmirx: set pinmux for each port separately

PD#161978: hdmirx: set pinmux for each port separately

Change-Id: I51b933523cdc334f32662c4bb2ea75791adfad0b
Signed-off-by: Hang Cheng <hang.cheng@amlogic.com>

diff --git a/arch/arm64/boot/dts/amlogic/mesontxlx.dtsi b/arch/arm64/boot/dts/amlogic/mesontxlx.dtsi
index 45077bc..482289f 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/mesontxlx.dtsi
+++ b/arch/arm64/boot/dts/amlogic/mesontxlx.dtsi
@@ -1133,24 +1133,33 @@
                };
        };
 
-       hdmirx_pins: hdmirx {
-               hdmirx_a_mux {
+       hdmirx_a_mux:hdmirx_a_mux {
+               mux {
                        groups = "hdmirx_hpd_a", "hdmirx_det_a",
                                "hdmirx_sda_a", "hdmirx_sck_a";
                        function = "hdmirx_a";
                };
-               hdmirx_b_mux {
+       };
+
+       hdmirx_b_mux:hdmirx_b_mux {
+               mux {
                        groups = "hdmirx_hpd_b", "hdmirx_det_b",
                                "hdmirx_sda_b", "hdmirx_sck_b";
                        function = "hdmirx_b";
                };
-               hdmirx_c_mux {
-                       groups = "hdmirx_hpd_c","hdmirx_det_c",
+       };
+
+       hdmirx_c_mux:hdmirx_c_mux {
+               mux {
+                       groups = "hdmirx_hpd_c", "hdmirx_det_c",
                                "hdmirx_sda_c", "hdmirx_sck_c";
                        function = "hdmirx_c";
                };
-               hdmirx_d_mux {
-                       groups = "hdmirx_hpd_d","hdmirx_det_d",
+       };
+
+       hdmirx_d_mux:hdmirx_d_mux {
+               mux {
+                       groups = "hdmirx_hpd_d", "hdmirx_det_d",
                                "hdmirx_sda_d", "hdmirx_sck_d";
                        function = "hdmirx_d";
                };

diff --git a/arch/arm64/boot/dts/amlogic/txlx_t962e_r321.dts b/arch/arm64/boot/dts/amlogic/txlx_t962e_r321.dts
index 2e9ef1a..258784e 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/txlx_t962e_r321.dts
+++ b/arch/arm64/boot/dts/amlogic/txlx_t962e_r321.dts
@@ -433,7 +433,7 @@
                dev_name = "hdmirx";
                status = "okay";
                pinctrl-names = "hdmirx_pins";
-               pinctrl-0 = <&hdmirx_pins>;
+               pinctrl-0 = <&hdmirx_a_mux &hdmirx_b_mux &hdmirx_d_mux>;
                repeat = <0>;
                interrupts = <0 56 1>;
                clocks = <&clkc CLKID_HDMIRX_MODET_COMP>,

diff --git a/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_1g.dts b/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_1g.dts
index eddd72d..9dfde59 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_1g.dts
+++ b/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_1g.dts
@@ -425,7 +425,8 @@
                dev_name = "hdmirx";
                status = "okay";
                pinctrl-names = "hdmirx_pins";
-               pinctrl-0 = <&hdmirx_pins>;
+               pinctrl-0 = <&hdmirx_a_mux &hdmirx_b_mux
+                       &hdmirx_c_mux &hdmirx_d_mux>;
                repeat = <0>;
                interrupts = <0 56 1>;
                clocks = <&clkc CLKID_HDMIRX_MODET_COMP>,

diff --git a/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_2g.dts b/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_2g.dts
index cf7bf9c..bd70959 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_2g.dts
+++ b/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_2g.dts
@@ -434,7 +434,8 @@
                dev_name = "hdmirx";
                status = "okay";
                pinctrl-names = "hdmirx_pins";
-               pinctrl-0 = <&hdmirx_pins>;
+               pinctrl-0 = <&hdmirx_a_mux &hdmirx_b_mux
+                       &hdmirx_c_mux &hdmirx_d_mux>;
                repeat = <0>;
                interrupts = <0 56 1>;
                clocks = <&clkc CLKID_HDMIRX_MODET_COMP>,