Merge "pinctrl: qcom: function group for qup13_f* instance for holi"

This commit is contained in:
qctecmdr 2020-07-29 04:04:35 -07:00 • committed by Gerrit - the friendly Code Review server
commit f3fcedc943

View file

@ -580,7 +580,8 @@ enum holi_functions {
msm_mux_qup10,
msm_mux_qup11,
msm_mux_qup12,
msm_mux_qup13,
msm_mux_qup13_f1,
msm_mux_qup13_f2,
msm_mux_qup14,
msm_mux_sd_write,
msm_mux_sdc1_tb,
@ -1031,7 +1032,10 @@ static const char * const qup11_groups[] = {
static const char * const qup12_groups[] = {
"gpio19", "gpio20",
};
static const char * const qup13_groups[] = {
static const char * const qup13_f1_groups[] = {
"gpio25", "gpio26",
};
static const char * const qup13_f2_groups[] = {
"gpio25", "gpio26",
};
static const char * const qup14_groups[] = {
@ -1138,7 +1142,8 @@ static const struct msm_function holi_functions[] = {
FUNCTION(gcc_gp2),
FUNCTION(gcc_gp3),
FUNCTION(edp_lcd),
FUNCTION(qup13),
FUNCTION(qup13_f1),
FUNCTION(qup13_f2),
FUNCTION(qup11),
FUNCTION(PLL_BIST),
FUNCTION(qdss_gpio14),
@ -1321,9 +1326,10 @@ static const struct msm_pingroup holi_groups[] = {
0x9C00C, 13),
[24] = PINGROUP(24, MDP_VSYNC, NA, NA, NA, NA, NA, NA, NA, NA,
0x9C00C, 14),
[25] = PINGROUP(25, qup13, qup13, NA, NA, NA, NA, NA, NA, NA,
[25] = PINGROUP(25, qup13_f1, qup13_f2, NA, NA, NA, NA, NA, NA, NA,
0x9C00C, 15),
[26] = PINGROUP(26, qup13, qup13, NA, NA, NA, NA, NA, NA, NA, 0, -1),
[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,