summaryrefslogtreecommitdiff
authorHang Cheng <hang.cheng@amlogic.com>2019-10-10 08:49:23 (GMT)
committer Jianxin Pan <jianxin.pan@amlogic.com>2019-10-16 02:57:17 (GMT)
commit93b805b886707aec84993bcb55b5642e93bc9db5 (patch)
tree17bc8c11dc269c30465c007023fabe8cc3a1b8d7
parent578aff7cf0d304ca0b8ff945c128e98bb2433c9b (diff)
downloadcommon-93b805b886707aec84993bcb55b5642e93bc9db5.zip
common-93b805b886707aec84993bcb55b5642e93bc9db5.tar.gz
common-93b805b886707aec84993bcb55b5642e93bc9db5.tar.bz2
hdmirx: pinmux later so as to prevent abnormal hpd pulse [1/1]
PD#SWPL-15003 Problem: There's a pull high pulse of hpd when bootup. Reason: pinctl-names is set "default" in dts, when bootup, hdmirx related pinmux will be set by device driver which is before hdmirx probe. As hpd pin of ic is default low, after reverse by triode, it will output high on hdmi receptacle. And after hdmirx probe, hpd invertion will be enabled before finally output from ic, so it will become normally low again on hdmi receptacle. So there's a pull high pulse(1~4ms) output. Solution: GPIOW is high(1.4V) before pinmux, so hpd pin of receptacle is low before pinmux. Need to enable hpd invertion before GPIOW is muxed to hpd function. the way to delay pinmux is to change pinctrl-names of dts from default to others. Verify: TL1 Change-Id: Ica54484fa4c3da46e7b1ddc72a3c5f44fd4a71f6 Signed-off-by: Hang Cheng <hang.cheng@amlogic.com>
Diffstat
-rw-r--r--arch/arm/boot/dts/amlogic/tl1_pxp.dts2
-rw-r--r--arch/arm/boot/dts/amlogic/tl1_t962x2_skt.dts2
-rw-r--r--arch/arm/boot/dts/amlogic/tl1_t962x2_t309.dts2
-rw-r--r--arch/arm/boot/dts/amlogic/tl1_t962x2_x301_1g.dts2
-rw-r--r--arch/arm/boot/dts/amlogic/tl1_t962x2_x301_1g_drm.dts2
-rw-r--r--arch/arm/boot/dts/amlogic/tl1_t962x2_x301_2g.dts2
-rw-r--r--arch/arm/boot/dts/amlogic/tl1_t962x2_x301_2g_drm.dts2
-rw-r--r--arch/arm/boot/dts/amlogic/tm2_pxp.dts2
-rw-r--r--arch/arm/boot/dts/amlogic/tm2_t962e2_ab311.dts2
-rw-r--r--arch/arm/boot/dts/amlogic/tm2_t962e2_ab319.dts2
-rw-r--r--arch/arm/boot/dts/amlogic/tm2_t962x3_ab301.dts2
-rw-r--r--arch/arm/boot/dts/amlogic/tm2_t962x3_ab309.dts2
-rw-r--r--arch/arm/boot/dts/amlogic/tm2_t962x3_t312.dts2
-rw-r--r--arch/arm64/boot/dts/amlogic/tl1_t962x2_t309.dts2
-rw-r--r--arch/arm64/boot/dts/amlogic/tl1_t962x2_x301_1g.dts2
-rw-r--r--arch/arm64/boot/dts/amlogic/tl1_t962x2_x301_1g_drm.dts2
-rw-r--r--arch/arm64/boot/dts/amlogic/tl1_t962x2_x301_2g.dts2
-rw-r--r--arch/arm64/boot/dts/amlogic/tl1_t962x2_x301_2g_drm.dts2
-rw-r--r--arch/arm64/boot/dts/amlogic/tm2_pxp.dts2
-rw-r--r--arch/arm64/boot/dts/amlogic/tm2_t962e2_ab311.dts2
-rw-r--r--arch/arm64/boot/dts/amlogic/tm2_t962e2_ab319.dts2
-rw-r--r--arch/arm64/boot/dts/amlogic/tm2_t962x3_ab301.dts2
-rw-r--r--arch/arm64/boot/dts/amlogic/tm2_t962x3_ab309.dts2
-rw-r--r--arch/arm64/boot/dts/amlogic/tm2_t962x3_t312.dts2
24 files changed, 24 insertions, 24 deletions
diff --git a/arch/arm/boot/dts/amlogic/tl1_pxp.dts b/arch/arm/boot/dts/amlogic/tl1_pxp.dts
index 2bc492c..070ace6 100644
--- a/arch/arm/boot/dts/amlogic/tl1_pxp.dts
+++ b/arch/arm/boot/dts/amlogic/tl1_pxp.dts
@@ -534,7 +534,7 @@
#size-cells=<1>;
memory-region = <&hdmirx_emp_cma_reserved>;
status = "okay";
- pinctrl-names = "default";
+ pinctrl-names = "hdmirx_pins";
pinctrl-0 = <&hdmirx_a_mux &hdmirx_b_mux
&hdmirx_c_mux>;
repeat = <0>;
diff --git a/arch/arm/boot/dts/amlogic/tl1_t962x2_skt.dts b/arch/arm/boot/dts/amlogic/tl1_t962x2_skt.dts
index 769b910..93309e6 100644
--- a/arch/arm/boot/dts/amlogic/tl1_t962x2_skt.dts
+++ b/arch/arm/boot/dts/amlogic/tl1_t962x2_skt.dts
@@ -830,7 +830,7 @@
#size-cells=<1>;
memory-region = <&hdmirx_emp_cma_reserved>;
status = "okay";
- pinctrl-names = "default";
+ pinctrl-names = "hdmirx_pins";
pinctrl-0 = <&hdmirx_a_mux &hdmirx_b_mux
&hdmirx_c_mux>;
repeat = <0>;
diff --git a/arch/arm/boot/dts/amlogic/tl1_t962x2_t309.dts b/arch/arm/boot/dts/amlogic/tl1_t962x2_t309.dts
index b22f1b4..351483f 100644
--- a/arch/arm/boot/dts/amlogic/tl1_t962x2_t309.dts
+++ b/arch/arm/boot/dts/amlogic/tl1_t962x2_t309.dts
@@ -820,7 +820,7 @@
#size-cells=<1>;
memory-region = <&hdmirx_emp_cma_reserved>;
status = "okay";
- pinctrl-names = "default";
+ pinctrl-names = "hdmirx_pins";
pinctrl-0 = <&hdmirx_a_mux &hdmirx_b_mux
&hdmirx_c_mux>;
repeat = <0>;
diff --git a/arch/arm/boot/dts/amlogic/tl1_t962x2_x301_1g.dts b/arch/arm/boot/dts/amlogic/tl1_t962x2_x301_1g.dts
index 9a992ce..6930889 100644
--- a/arch/arm/boot/dts/amlogic/tl1_t962x2_x301_1g.dts
+++ b/arch/arm/boot/dts/amlogic/tl1_t962x2_x301_1g.dts
@@ -876,7 +876,7 @@
#size-cells=<1>;
memory-region = <&hdmirx_emp_cma_reserved>;
status = "okay";
- pinctrl-names = "default";
+ pinctrl-names = "hdmirx_pins";
pinctrl-0 = <&hdmirx_a_mux &hdmirx_b_mux
&hdmirx_c_mux>;
repeat = <0>;
diff --git a/arch/arm/boot/dts/amlogic/tl1_t962x2_x301_1g_drm.dts b/arch/arm/boot/dts/amlogic/tl1_t962x2_x301_1g_drm.dts
index d042d2f..a559538 100644
--- a/arch/arm/boot/dts/amlogic/tl1_t962x2_x301_1g_drm.dts
+++ b/arch/arm/boot/dts/amlogic/tl1_t962x2_x301_1g_drm.dts
@@ -870,7 +870,7 @@
#size-cells=<1>;
memory-region = <&hdmirx_emp_cma_reserved>;
status = "okay";
- pinctrl-names = "default";
+ pinctrl-names = "hdmirx_pins";
pinctrl-0 = <&hdmirx_a_mux &hdmirx_b_mux
&hdmirx_c_mux>;
repeat = <0>;
diff --git a/arch/arm/boot/dts/amlogic/tl1_t962x2_x301_2g.dts b/arch/arm/boot/dts/amlogic/tl1_t962x2_x301_2g.dts
index b6fef34..8c80a97 100644
--- a/arch/arm/boot/dts/amlogic/tl1_t962x2_x301_2g.dts
+++ b/arch/arm/boot/dts/amlogic/tl1_t962x2_x301_2g.dts
@@ -871,7 +871,7 @@
#size-cells=<1>;
memory-region = <&hdmirx_emp_cma_reserved>;
status = "okay";
- pinctrl-names = "default";
+ pinctrl-names = "hdmirx_pins";
pinctrl-0 = <&hdmirx_a_mux &hdmirx_b_mux
&hdmirx_c_mux>;
repeat = <0>;
diff --git a/arch/arm/boot/dts/amlogic/tl1_t962x2_x301_2g_drm.dts b/arch/arm/boot/dts/amlogic/tl1_t962x2_x301_2g_drm.dts
index 02c3c78..b1006f83 100644
--- a/arch/arm/boot/dts/amlogic/tl1_t962x2_x301_2g_drm.dts
+++ b/arch/arm/boot/dts/amlogic/tl1_t962x2_x301_2g_drm.dts
@@ -865,7 +865,7 @@
#size-cells=<1>;
memory-region = <&hdmirx_emp_cma_reserved>;
status = "okay";
- pinctrl-names = "default";
+ pinctrl-names = "hdmirx_pins";
pinctrl-0 = <&hdmirx_a_mux &hdmirx_b_mux
&hdmirx_c_mux>;
repeat = <0>;
diff --git a/arch/arm/boot/dts/amlogic/tm2_pxp.dts b/arch/arm/boot/dts/amlogic/tm2_pxp.dts
index 34910ea..739c2a5 100644
--- a/arch/arm/boot/dts/amlogic/tm2_pxp.dts
+++ b/arch/arm/boot/dts/amlogic/tm2_pxp.dts
@@ -570,7 +570,7 @@
#size-cells=<1>;
memory-region = <&hdmirx_emp_cma_reserved>;
status = "okay";
- pinctrl-names = "default";
+ pinctrl-names = "hdmirx_pins";
pinctrl-0 = <&hdmirx_a_mux &hdmirx_b_mux
&hdmirx_c_mux>;
repeat = <0>;
diff --git a/arch/arm/boot/dts/amlogic/tm2_t962e2_ab311.dts b/arch/arm/boot/dts/amlogic/tm2_t962e2_ab311.dts
index ef9dabb..2428ec7 100644
--- a/arch/arm/boot/dts/amlogic/tm2_t962e2_ab311.dts
+++ b/arch/arm/boot/dts/amlogic/tm2_t962e2_ab311.dts
@@ -868,7 +868,7 @@
#size-cells=<1>;
memory-region = <&hdmirx_emp_cma_reserved>;
status = "okay";
- pinctrl-names = "default";
+ pinctrl-names = "hdmirx_pins";
pinctrl-0 = <&hdmirx_a_mux &hdmirx_b_mux
&hdmirx_c_mux>;
repeat = <0>;
diff --git a/arch/arm/boot/dts/amlogic/tm2_t962e2_ab319.dts b/arch/arm/boot/dts/amlogic/tm2_t962e2_ab319.dts
index d728aa6..2452c87 100644
--- a/arch/arm/boot/dts/amlogic/tm2_t962e2_ab319.dts
+++ b/arch/arm/boot/dts/amlogic/tm2_t962e2_ab319.dts
@@ -872,7 +872,7 @@
#size-cells=<1>;
memory-region = <&hdmirx_emp_cma_reserved>;
status = "okay";
- pinctrl-names = "default";
+ pinctrl-names = "hdmirx_pins";
pinctrl-0 = <&hdmirx_a_mux &hdmirx_b_mux
&hdmirx_c_mux>;
repeat = <0>;
diff --git a/arch/arm/boot/dts/amlogic/tm2_t962x3_ab301.dts b/arch/arm/boot/dts/amlogic/tm2_t962x3_ab301.dts
index c9342f1..31e9d0c 100644
--- a/arch/arm/boot/dts/amlogic/tm2_t962x3_ab301.dts
+++ b/arch/arm/boot/dts/amlogic/tm2_t962x3_ab301.dts
@@ -850,7 +850,7 @@
#size-cells=<1>;
memory-region = <&hdmirx_emp_cma_reserved>;
status = "okay";
- pinctrl-names = "default";
+ pinctrl-names = "hdmirx_pins";
pinctrl-0 = <&hdmirx_a_mux &hdmirx_b_mux
&hdmirx_c_mux>;
repeat = <0>;
diff --git a/arch/arm/boot/dts/amlogic/tm2_t962x3_ab309.dts b/arch/arm/boot/dts/amlogic/tm2_t962x3_ab309.dts
index 78d8627..79440ee 100644
--- a/arch/arm/boot/dts/amlogic/tm2_t962x3_ab309.dts
+++ b/arch/arm/boot/dts/amlogic/tm2_t962x3_ab309.dts
@@ -855,7 +855,7 @@
#size-cells=<1>;
memory-region = <&hdmirx_emp_cma_reserved>;
status = "okay";
- pinctrl-names = "default";
+ pinctrl-names = "hdmirx_pins";
pinctrl-0 = <&hdmirx_a_mux &hdmirx_b_mux
&hdmirx_c_mux>;
repeat = <0>;
diff --git a/arch/arm/boot/dts/amlogic/tm2_t962x3_t312.dts b/arch/arm/boot/dts/amlogic/tm2_t962x3_t312.dts
index b38f50a..e20277b 100644
--- a/arch/arm/boot/dts/amlogic/tm2_t962x3_t312.dts
+++ b/arch/arm/boot/dts/amlogic/tm2_t962x3_t312.dts
@@ -856,7 +856,7 @@
#size-cells=<1>;
memory-region = <&hdmirx_emp_cma_reserved>;
status = "okay";
- pinctrl-names = "default";
+ pinctrl-names = "hdmirx_pins";
pinctrl-0 = <&hdmirx_a_mux &hdmirx_b_mux
&hdmirx_c_mux>;
repeat = <0>;
diff --git a/arch/arm64/boot/dts/amlogic/tl1_t962x2_t309.dts b/arch/arm64/boot/dts/amlogic/tl1_t962x2_t309.dts
index 9118312..831b75fa2 100644
--- a/arch/arm64/boot/dts/amlogic/tl1_t962x2_t309.dts
+++ b/arch/arm64/boot/dts/amlogic/tl1_t962x2_t309.dts
@@ -818,7 +818,7 @@
#size-cells=<1>;
memory-region = <&hdmirx_emp_cma_reserved>;
status = "okay";
- pinctrl-names = "default";
+ pinctrl-names = "hdmirx_pins";
pinctrl-0 = <&hdmirx_a_mux &hdmirx_b_mux
&hdmirx_c_mux>;
repeat = <0>;
diff --git a/arch/arm64/boot/dts/amlogic/tl1_t962x2_x301_1g.dts b/arch/arm64/boot/dts/amlogic/tl1_t962x2_x301_1g.dts
index 4dfd3bf..19ac8c2 100644
--- a/arch/arm64/boot/dts/amlogic/tl1_t962x2_x301_1g.dts
+++ b/arch/arm64/boot/dts/amlogic/tl1_t962x2_x301_1g.dts
@@ -873,7 +873,7 @@
#size-cells=<1>;
memory-region = <&hdmirx_emp_cma_reserved>;
status = "okay";
- pinctrl-names = "default";
+ pinctrl-names = "hdmirx_pins";
pinctrl-0 = <&hdmirx_a_mux &hdmirx_b_mux
&hdmirx_c_mux>;
repeat = <0>;
diff --git a/arch/arm64/boot/dts/amlogic/tl1_t962x2_x301_1g_drm.dts b/arch/arm64/boot/dts/amlogic/tl1_t962x2_x301_1g_drm.dts
index c800f71..ddbc0b5 100644
--- a/arch/arm64/boot/dts/amlogic/tl1_t962x2_x301_1g_drm.dts
+++ b/arch/arm64/boot/dts/amlogic/tl1_t962x2_x301_1g_drm.dts
@@ -866,7 +866,7 @@
#size-cells=<1>;
memory-region = <&hdmirx_emp_cma_reserved>;
status = "okay";
- pinctrl-names = "default";
+ pinctrl-names = "hdmirx_pins";
pinctrl-0 = <&hdmirx_a_mux &hdmirx_b_mux
&hdmirx_c_mux>;
repeat = <0>;
diff --git a/arch/arm64/boot/dts/amlogic/tl1_t962x2_x301_2g.dts b/arch/arm64/boot/dts/amlogic/tl1_t962x2_x301_2g.dts
index ff8f8b3..8db4501 100644
--- a/arch/arm64/boot/dts/amlogic/tl1_t962x2_x301_2g.dts
+++ b/arch/arm64/boot/dts/amlogic/tl1_t962x2_x301_2g.dts
@@ -867,7 +867,7 @@
#size-cells=<1>;
memory-region = <&hdmirx_emp_cma_reserved>;
status = "okay";
- pinctrl-names = "default";
+ pinctrl-names = "hdmirx_pins";
pinctrl-0 = <&hdmirx_a_mux &hdmirx_b_mux
&hdmirx_c_mux>;
repeat = <0>;
diff --git a/arch/arm64/boot/dts/amlogic/tl1_t962x2_x301_2g_drm.dts b/arch/arm64/boot/dts/amlogic/tl1_t962x2_x301_2g_drm.dts
index 4505f99..a41eb68 100644
--- a/arch/arm64/boot/dts/amlogic/tl1_t962x2_x301_2g_drm.dts
+++ b/arch/arm64/boot/dts/amlogic/tl1_t962x2_x301_2g_drm.dts
@@ -860,7 +860,7 @@
#size-cells=<1>;
memory-region = <&hdmirx_emp_cma_reserved>;
status = "okay";
- pinctrl-names = "default";
+ pinctrl-names = "hdmirx_pins";
pinctrl-0 = <&hdmirx_a_mux &hdmirx_b_mux
&hdmirx_c_mux>;
repeat = <0>;
diff --git a/arch/arm64/boot/dts/amlogic/tm2_pxp.dts b/arch/arm64/boot/dts/amlogic/tm2_pxp.dts
index d21ddfe..94844443 100644
--- a/arch/arm64/boot/dts/amlogic/tm2_pxp.dts
+++ b/arch/arm64/boot/dts/amlogic/tm2_pxp.dts
@@ -570,7 +570,7 @@
#size-cells=<1>;
memory-region = <&hdmirx_emp_cma_reserved>;
status = "okay";
- pinctrl-names = "default";
+ pinctrl-names = "hdmirx_pins";
pinctrl-0 = <&hdmirx_a_mux &hdmirx_b_mux
&hdmirx_c_mux>;
repeat = <0>;
diff --git a/arch/arm64/boot/dts/amlogic/tm2_t962e2_ab311.dts b/arch/arm64/boot/dts/amlogic/tm2_t962e2_ab311.dts
index 5b4aeae..6d16810 100644
--- a/arch/arm64/boot/dts/amlogic/tm2_t962e2_ab311.dts
+++ b/arch/arm64/boot/dts/amlogic/tm2_t962e2_ab311.dts
@@ -864,7 +864,7 @@
#size-cells=<1>;
memory-region = <&hdmirx_emp_cma_reserved>;
status = "okay";
- pinctrl-names = "default";
+ pinctrl-names = "hdmirx_pins";
pinctrl-0 = <&hdmirx_a_mux &hdmirx_b_mux
&hdmirx_c_mux>;
repeat = <0>;
diff --git a/arch/arm64/boot/dts/amlogic/tm2_t962e2_ab319.dts b/arch/arm64/boot/dts/amlogic/tm2_t962e2_ab319.dts
index 4561ec5..3461406 100644
--- a/arch/arm64/boot/dts/amlogic/tm2_t962e2_ab319.dts
+++ b/arch/arm64/boot/dts/amlogic/tm2_t962e2_ab319.dts
@@ -872,7 +872,7 @@
#size-cells=<1>;
memory-region = <&hdmirx_emp_cma_reserved>;
status = "okay";
- pinctrl-names = "default";
+ pinctrl-names = "hdmirx_pins";
pinctrl-0 = <&hdmirx_a_mux &hdmirx_b_mux
&hdmirx_c_mux>;
repeat = <0>;
diff --git a/arch/arm64/boot/dts/amlogic/tm2_t962x3_ab301.dts b/arch/arm64/boot/dts/amlogic/tm2_t962x3_ab301.dts
index 7e70672..b355b51 100644
--- a/arch/arm64/boot/dts/amlogic/tm2_t962x3_ab301.dts
+++ b/arch/arm64/boot/dts/amlogic/tm2_t962x3_ab301.dts
@@ -848,7 +848,7 @@
#size-cells=<1>;
memory-region = <&hdmirx_emp_cma_reserved>;
status = "okay";
- pinctrl-names = "default";
+ pinctrl-names = "hdmirx_pins";
pinctrl-0 = <&hdmirx_a_mux &hdmirx_b_mux
&hdmirx_c_mux>;
repeat = <0>;
diff --git a/arch/arm64/boot/dts/amlogic/tm2_t962x3_ab309.dts b/arch/arm64/boot/dts/amlogic/tm2_t962x3_ab309.dts
index 0159322..21413af 100644
--- a/arch/arm64/boot/dts/amlogic/tm2_t962x3_ab309.dts
+++ b/arch/arm64/boot/dts/amlogic/tm2_t962x3_ab309.dts
@@ -855,7 +855,7 @@
#size-cells=<1>;
memory-region = <&hdmirx_emp_cma_reserved>;
status = "okay";
- pinctrl-names = "default";
+ pinctrl-names = "hdmirx_pins";
pinctrl-0 = <&hdmirx_a_mux &hdmirx_b_mux
&hdmirx_c_mux>;
repeat = <0>;
diff --git a/arch/arm64/boot/dts/amlogic/tm2_t962x3_t312.dts b/arch/arm64/boot/dts/amlogic/tm2_t962x3_t312.dts
index dbcd7a3..b0e3324 100644
--- a/arch/arm64/boot/dts/amlogic/tm2_t962x3_t312.dts
+++ b/arch/arm64/boot/dts/amlogic/tm2_t962x3_t312.dts
@@ -859,7 +859,7 @@
#size-cells=<1>;
memory-region = <&hdmirx_emp_cma_reserved>;
status = "okay";
- pinctrl-names = "default";
+ pinctrl-names = "hdmirx_pins";
pinctrl-0 = <&hdmirx_a_mux &hdmirx_b_mux
&hdmirx_c_mux>;
repeat = <0>;