From c05914ddf8cc22bd75b7b53683837b8a3c078712 Mon Sep 17 00:00:00 2001 From: Hang Cheng Date: Mon, 12 Mar 2018 14:33:03 +0800 Subject: [PATCH] hdmirx: set pinmux for each port separately PD#161978: hdmirx: set pinmux for each port separately Change-Id: I51b933523cdc334f32662c4bb2ea75791adfad0b Signed-off-by: Hang Cheng --- arch/arm64/boot/dts/amlogic/mesontxlx.dtsi | 23 +++++++++++++------ .../boot/dts/amlogic/txlx_t962e_r321.dts | 2 +- .../boot/dts/amlogic/txlx_t962x_r311_1g.dts | 3 ++- .../boot/dts/amlogic/txlx_t962x_r311_2g.dts | 3 ++- 4 files changed, 21 insertions(+), 10 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/mesontxlx.dtsi b/arch/arm64/boot/dts/amlogic/mesontxlx.dtsi index 45077bc4b66f..482289f82661 100644 --- 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 2e9ef1a01ec0..258784e3ed25 100644 --- 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 eddd72d99802..9dfde59f6044 100644 --- 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 cf7bf9c767a4..bd7095957d6f 100644 --- 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>,