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

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

Merge "pinctrl: qcom: Update configuration for Shima"

parents 64477521 39b98536

drivers/pinctrl/qcom/pinctrl-shima.c

+2 −12
Original line number Diff line number Diff line
@@ -713,8 +713,6 @@ enum shima_functions { 
	msm_mux_qup7,

	msm_mux_qup8,

	msm_mux_qup9,

	msm_mux_qup_l0,

	msm_mux_qup_l1,

	msm_mux_qup_l4,

	msm_mux_qup_l5,

	msm_mux_qup_l6,
@@ -1242,12 +1240,6 @@ static const char * const qup8_groups[] = { 
static const char * const qup9_groups[] = {

	"gpio60", "gpio61", "gpio62", "gpio63",

};

static const char * const qup_l0_groups[] = {

	"gpio107",

};

static const char * const qup_l1_groups[] = {

	"gpio108",

};

static const char * const qup_l4_groups[] = {

	"gpio2", "gpio6", "gpio58",

};
@@ -1441,9 +1433,7 @@ static const struct msm_function shima_functions[] = { 
	FUNCTION(cci_async),

	FUNCTION(qdss_gpio6),

	FUNCTION(cci_i2c),

	FUNCTION(qup_l0),

	FUNCTION(qdss_gpio7),

	FUNCTION(qup_l1),

	FUNCTION(qdss_gpio8),

	FUNCTION(qdss_gpio),

	FUNCTION(qdss_gpio9),
@@ -1699,9 +1689,9 @@ static const struct msm_pingroup shima_groups[] = { 
			 0xCC014, 9),

	[106] = PINGROUP(106, cci_async, NA, NA, qdss_gpio6, NA, NA, NA, NA,

			 NA, 0, -1),

	[107] = PINGROUP(107, cci_i2c, qup_l0, NA, qdss_gpio7, NA, NA, NA, NA,

	[107] = PINGROUP(107, cci_i2c, NA, NA, qdss_gpio7, NA, NA, NA, NA,

			 NA, 0xCC014, 10),

	[108] = PINGROUP(108, cci_i2c, qup_l1, NA, qdss_gpio8, NA, NA, NA, NA,

	[108] = PINGROUP(108, cci_i2c, NA, NA, qdss_gpio8, NA, NA, NA, NA,

			 NA, 0, -1),

	[109] = PINGROUP(109, cci_i2c, NA, NA, qdss_gpio, NA, NA, NA, NA, NA,

			 0, -1),