A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-10 06:09:23 -04:00
Code Issues Projects Releases Packages Wiki Activity

Revert "(CR): pinctrl-holi: revert qcom change for i2c_7"

Browse source 
This reverts commit 1957601e86ae219cdbf83594bff8d1db9c418400.
We will fix the issue by adding related dts configuration on i2c_7.

Change-Id: I197b88025ad89f5a73c87a0c95fe3a2fb2218dec
Signed-off-by: wuwl10 <wuwl10@motorola.com>
Reviewed-on: https://gerrit.mot.com/1985492
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Reviewed-by: Huosheng Liao <liaohs@motorola.com>
Submit-Approved: Jira Key
This commit is contained in:
wuwl10 2021-06-18 13:37:50 +08:00 • committed by Xiaojun Ji
commit 80f26a34d5
1 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

19
drivers/pinctrl/qcom/pinctrl-holi.c
View file

@ -578,7 +578,8 @@ enum holi_functions {
msm_mux_qup01,
msm_mux_qup02,
msm_mux_qup10,
msm_mux_qup11,
msm_mux_qup11_f1,
msm_mux_qup11_f2,
msm_mux_qup12,
msm_mux_qup13_f1,
msm_mux_qup13_f2,
@ -1026,7 +1027,10 @@ static const char * const qup02_groups[] = {
static const char * const qup10_groups[] = {
"gpio13", "gpio14", "gpio15", "gpio16", "gpio17",
};
static const char * const qup11_groups[] = {
static const char * const qup11_f1_groups[] = {
"gpio27", "gpio28",
};
static const char * const qup11_f2_groups[] = {
"gpio27", "gpio28",
};
static const char * const qup12_groups[] = {
@ -1144,7 +1148,8 @@ static const struct msm_function holi_functions[] = {
FUNCTION(edp_lcd),
FUNCTION(qup13_f1),
FUNCTION(qup13_f2),
FUNCTION(qup11),
FUNCTION(qup11_f1),
FUNCTION(qup11_f2),
FUNCTION(PLL_BIST),
FUNCTION(qdss_gpio14),
FUNCTION(qdss_gpio15),
@ -1330,10 +1335,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, 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),
[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),
[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),