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

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

Merge "pinctrl: sdmmagpie: update gpio, function and group binding"

parents 2009a93f 283bf9cd

Documentation/devicetree/bindings/pinctrl/qcom,sdmmagpie-pinctrl.txt

+3 −3
Original line number Original line Diff line number Diff line
@@ -118,7 +118,7 @@ to specify in a pin configuration subnode: 
		    qdss_tracectl_a, dac_calib13, qdss_traceclk_a, dac_calib14,

		    qdss_tracectl_a, dac_calib13, qdss_traceclk_a, dac_calib14,

		    dac_calib15, hdmi_rcv, dac_calib16, hdmi_cec, pwr_modem,

		    dac_calib15, hdmi_rcv, dac_calib16, hdmi_cec, pwr_modem,

		    dac_calib17, hdmi_ddc, pwr_nav, dac_calib18, pwr_crypto,

		    dac_calib17, hdmi_ddc, pwr_nav, dac_calib18, pwr_crypto,

		    dac_calib19, hdmi_hot, dac_calib20, dac_calib21, pci_e0,

		    dac_calib19, hdmi_hot, dac_calib20, dac_calib21, pci_e,

		    dac_calib22, dac_calib23, dac_calib24, tsif1_sync, dac_calib25,

		    dac_calib22, dac_calib23, dac_calib24, tsif1_sync, dac_calib25,

		    sd_write, tsif1_error, blsp_spi2, blsp_uart2, blsp_uim2,

		    sd_write, tsif1_error, blsp_spi2, blsp_uart2, blsp_uim2,

		    qdss_cti, blsp_i2c2, blsp_spi3, blsp_uart3, blsp_uim3, blsp_i2c3,

		    qdss_cti, blsp_i2c2, blsp_spi3, blsp_uart3, blsp_uim3, blsp_i2c3,
@@ -140,8 +140,8 @@ to specify in a pin configuration subnode: 
		    sd_card, tsif2_data, sdc41, tsif2_sync, sdc40, mdp_vsync_p_b,

		    sd_card, tsif2_data, sdc41, tsif2_sync, sdc40, mdp_vsync_p_b,

		    ldo_en, mdp_vsync_s_b, ldo_update, blsp11_uart_tx_b, blsp11_uart_rx_b,

		    ldo_en, mdp_vsync_s_b, ldo_update, blsp11_uart_tx_b, blsp11_uart_rx_b,

		    blsp11_i2c_sda_b, prng_rosc, blsp11_i2c_scl_b, uim2, uim1, uim_batt,

		    blsp11_i2c_sda_b, prng_rosc, blsp11_i2c_scl_b, uim2, uim1, uim_batt,

		    pci_e2, pa_indicator, adsp_ext, ddr_bist, qdss_tracedata_11,

		    pa_indicator, adsp_ext, ddr_bist, qdss_tracedata_11,

		    qdss_tracedata_12, modem_tsync, nav_dr, nav_pps, pci_e1, gsm_tx,

		    qdss_tracedata_12, modem_tsync, nav_dr, nav_pps, gsm_tx,

		    qspi_cs, ssbi2, ssbi1, mss_lte, qspi_clk, qspi0, qspi1, qspi2, qspi3,

		    qspi_cs, ssbi2, ssbi1, mss_lte, qspi_clk, qspi0, qspi1, qspi2, qspi3,

		    gpio

		    gpio

drivers/pinctrl/qcom/pinctrl-sdmmagpie.c

+15 −10
Original line number Original line Diff line number Diff line
@@ -533,7 +533,8 @@ enum sdmmagpie_functions { 
	msm_mux_uim1_clk,

	msm_mux_uim1_clk,

	msm_mux_uim1_reset,

	msm_mux_uim1_reset,

	msm_mux_uim1_present,

	msm_mux_uim1_present,

	msm_mux_NAV_PPS,

	msm_mux_NAV_PPS_IN,

	msm_mux_NAV_PPS_OUT,

	msm_mux_GPS_TX,

	msm_mux_GPS_TX,

	msm_mux_uim_batt,

	msm_mux_uim_batt,

	msm_mux_edp_hot,

	msm_mux_edp_hot,
@@ -1021,8 +1022,11 @@ static const char * const uim1_reset_groups[] = { 
static const char * const uim1_present_groups[] = {

static const char * const uim1_present_groups[] = {

	"gpio82",

	"gpio82",

};

};

static const char * const NAV_PPS_groups[] = {

static const char * const NAV_PPS_IN_groups[] = {

	"gpio83", "gpio83", "gpio84", "gpio84", "gpio107", "gpio107",

	"gpio83", "gpio84", "gpio107",

};

static const char * const NAV_PPS_OUT_groups[] = {

	"gpio83", "gpio84", "gpio107",

};

};

static const char * const GPS_TX_groups[] = {

static const char * const GPS_TX_groups[] = {

	"gpio83", "gpio84", "gpio107", "gpio109",

	"gpio83", "gpio84", "gpio107", "gpio109",
@@ -1227,7 +1231,8 @@ static const struct msm_function sdmmagpie_functions[] = { 
	FUNCTION(uim1_clk),

	FUNCTION(uim1_clk),

	FUNCTION(uim1_reset),

	FUNCTION(uim1_reset),

	FUNCTION(uim1_present),

	FUNCTION(uim1_present),

	FUNCTION(NAV_PPS),

	FUNCTION(NAV_PPS_IN),

	FUNCTION(NAV_PPS_OUT),

	FUNCTION(GPS_TX),

	FUNCTION(GPS_TX),

	FUNCTION(uim_batt),

	FUNCTION(uim_batt),

	FUNCTION(edp_hot),

	FUNCTION(edp_hot),
@@ -1392,10 +1397,10 @@ static const struct msm_pingroup sdmmagpie_groups[] = { 
	[80] = PINGROUP(80, WEST, uim1_clk, NA, NA, NA, NA, NA, NA, NA, NA),

	[80] = PINGROUP(80, WEST, uim1_clk, NA, NA, NA, NA, NA, NA, NA, NA),

	[81] = PINGROUP(81, WEST, uim1_reset, NA, NA, NA, NA, NA, NA, NA, NA),

	[81] = PINGROUP(81, WEST, uim1_reset, NA, NA, NA, NA, NA, NA, NA, NA),

	[82] = PINGROUP(82, WEST, uim1_present, NA, NA, NA, NA, NA, NA, NA, NA),

	[82] = PINGROUP(82, WEST, uim1_present, NA, NA, NA, NA, NA, NA, NA, NA),

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

	[83] = PINGROUP(83, WEST, NA, NAV_PPS_IN, NAV_PPS_OUT, GPS_TX, NA, NA,

			NA),

			NA, NA, NA),

	[84] = PINGROUP(84, WEST, NA, NAV_PPS, NAV_PPS, GPS_TX, NA, NA, NA, NA,

	[84] = PINGROUP(84, WEST, NA, NAV_PPS_IN, NAV_PPS_OUT, GPS_TX, NA, NA,

			NA),

			NA, NA, NA),

	[85] = PINGROUP(85, WEST, uim_batt, edp_hot, aoss_cti, NA, NA, NA, NA,

	[85] = PINGROUP(85, WEST, uim_batt, edp_hot, aoss_cti, NA, NA, NA, NA,

			NA, NA),

			NA, NA),

	[86] = PINGROUP(86, NORTH, qdss_gpio0, atest_char, NA, NA, NA, NA, NA,

	[86] = PINGROUP(86, NORTH, qdss_gpio0, atest_char, NA, NA, NA, NA, NA,
@@ -1426,8 +1431,8 @@ static const struct msm_pingroup sdmmagpie_groups[] = { 
			 NA),

			 NA),

	[105] = PINGROUP(105, NORTH, NA, NA, NA, NA, NA, NA, NA, NA, NA),

	[105] = PINGROUP(105, NORTH, NA, NA, NA, NA, NA, NA, NA, NA, NA),

	[106] = PINGROUP(106, NORTH, NA, NA, NA, NA, NA, NA, NA, NA, NA),

	[106] = PINGROUP(106, NORTH, NA, NA, NA, NA, NA, NA, NA, NA, NA),

	[107] = PINGROUP(107, WEST, NA, NAV_PPS, NAV_PPS, GPS_TX, NA, NA, NA,

	[107] = PINGROUP(107, WEST, NA, NAV_PPS_IN, NAV_PPS_OUT, GPS_TX, NA,

			 NA, NA),

			 NA, NA, NA, NA),

	[108] = PINGROUP(108, SOUTH, mss_lte, NA, NA, NA, NA, NA, NA, NA, NA),

	[108] = PINGROUP(108, SOUTH, mss_lte, NA, NA, NA, NA, NA, NA, NA, NA),

	[109] = PINGROUP(109, SOUTH, mss_lte, GPS_TX, NA, NA, NA, NA, NA, NA,

	[109] = PINGROUP(109, SOUTH, mss_lte, GPS_TX, NA, NA, NA, NA, NA, NA,

			 NA),

			 NA),