Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 61266429 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "pinctrl: msm: Correct function group for mdp_vsync_out_*"

parents 7cf4acd0 70a30740

drivers/pinctrl/qcom/pinctrl-bengal.c

+12 −2
Original line number Diff line number Diff line
@@ -520,6 +520,8 @@ enum bengal_functions { 
	msm_mux_uim1_present,

	msm_mux_dac_calib19,

	msm_mux_mdp_vsync,

	msm_mux_mdp_vsync_out_0,

	msm_mux_mdp_vsync_out_1,

	msm_mux_dac_calib20,

	msm_mux_dac_calib21,

	msm_mux_atest_bbrx1,
@@ -1030,6 +1032,12 @@ static const char * const dac_calib19_groups[] = { 
static const char * const mdp_vsync_groups[] = {

	"gpio81", "gpio96", "gpio97",

};

static const char * const mdp_vsync_out_0_groups[] = {

	"gpio81",

};

static const char * const mdp_vsync_out_1_groups[] = {

	"gpio81",

};

static const char * const dac_calib20_groups[] = {

	"gpio81",

};
@@ -1262,6 +1270,8 @@ static const struct msm_function bengal_functions[] = { 
	FUNCTION(uim1_present),

	FUNCTION(dac_calib19),

	FUNCTION(mdp_vsync),

	FUNCTION(mdp_vsync_out_0),

	FUNCTION(mdp_vsync_out_1),

	FUNCTION(dac_calib20),

	FUNCTION(dac_calib21),

	FUNCTION(atest_bbrx1),
@@ -1444,8 +1454,8 @@ static const struct msm_pingroup bengal_groups[] = { 
			NA, 0x71000, 5),

	[80] = PINGROUP(80, WEST, qup2, dac_calib19, NA, NA, NA, NA, NA, NA,

			NA, 0x71000, 13),

	[81] = PINGROUP(81, WEST, mdp_vsync, mdp_vsync, mdp_vsync, dac_calib20,

			NA, NA, NA, NA, NA, 0x71000, 14),

	[81] = PINGROUP(81, WEST, mdp_vsync_out_0, mdp_vsync_out_1, mdp_vsync,

			dac_calib20, NA, NA, NA, NA, NA, 0x71000, 14),

	[82] = PINGROUP(82, WEST, qup0, dac_calib21, NA, NA, NA, NA, NA, NA,

			NA, 0, -1),

	[83] = PINGROUP(83, WEST, NA, NA, NA, NA, NA, NA, NA, NA, NA,