From 2469090ab05acf37a4ecc6910225ae4683185143 Mon Sep 17 00:00:00 2001 From: wuwl10 Date: Fri, 4 Jun 2021 15:48:56 +0800 Subject: [PATCH] pinctrl-holi: revert qcom change for i2c_7 Below change will cause i2c_7 bus hung. Rever it change first until qcom provide new patch. pinctrl: qcom: function group for qup11_f* instance for holi This reverts commit 7a2620f882cb8b2a015bbed538685c088804aedb. Change-Id: Ie7b47d1fc0dd6b3fe9537bf06ea6c79bff076773 Signed-off-by: wuwl10 Reviewed-on: https://gerrit.mot.com/1970100 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Hujun Liao Submit-Approved: Jira Key --- drivers/pinctrl/qcom/pinctrl-holi.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/drivers/pinctrl/qcom/pinctrl-holi.c b/drivers/pinctrl/qcom/pinctrl-holi.c index c2125c904876..2b546eae6451 100644 --- a/drivers/pinctrl/qcom/pinctrl-holi.c +++ b/drivers/pinctrl/qcom/pinctrl-holi.c @@ -578,8 +578,7 @@ enum holi_functions { msm_mux_qup01, msm_mux_qup02, msm_mux_qup10, - msm_mux_qup11_f1, - msm_mux_qup11_f2, + msm_mux_qup11, msm_mux_qup12, msm_mux_qup13_f1, msm_mux_qup13_f2, @@ -1027,10 +1026,7 @@ static const char * const qup02_groups[] = { static const char * const qup10_groups[] = { "gpio13", "gpio14", "gpio15", "gpio16", "gpio17", }; -static const char * const qup11_f1_groups[] = { - "gpio27", "gpio28", -}; -static const char * const qup11_f2_groups[] = { +static const char * const qup11_groups[] = { "gpio27", "gpio28", }; static const char * const qup12_groups[] = { @@ -1148,8 +1144,7 @@ static const struct msm_function holi_functions[] = { FUNCTION(edp_lcd), FUNCTION(qup13_f1), FUNCTION(qup13_f2), - FUNCTION(qup11_f1), - FUNCTION(qup11_f2), + FUNCTION(qup11), FUNCTION(PLL_BIST), FUNCTION(qdss_gpio14), FUNCTION(qdss_gpio15), @@ -1335,10 +1330,10 @@ static const struct msm_pingroup holi_groups[] = { 0x9C00C, 15), [26] = PINGROUP(26, qup13_f1, qup13_f2, NA, NA, NA, NA, NA, NA, NA, 0, -1), - [27] = PINGROUP(27, qup11_f1, qup11_f2, MDP_VSYNC, PLL_BIST, NA, - qdss_gpio14, NA, NA, NA, 0x9C010, 0), - [28] = PINGROUP(28, qup11_f1, qup11_f2, MDP_VSYNC, NA, qdss_gpio15, - NA, NA, NA, NA, 0x9C010, 1), + [27] = PINGROUP(27, qup11, qup11, MDP_VSYNC, PLL_BIST, NA, qdss_gpio14, + NA, NA, NA, 0x9C010, 0), + [28] = PINGROUP(28, qup11, qup11, MDP_VSYNC, NA, qdss_gpio15, NA, NA, + NA, NA, 0x9C010, 1), [29] = PINGROUP(29, cam_mclk, NA, NA, NA, NA, NA, NA, NA, NA, 0, -1), [30] = PINGROUP(30, cam_mclk, NA, NA, NA, NA, NA, NA, NA, NA, 0, -1), [31] = PINGROUP(31, cam_mclk, NA, NA, NA, NA, NA, NA, NA, NA, 0, -1),