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

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

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

parents 3a0b900f 374cd1d9

Documentation/devicetree/bindings/pinctrl/qcom,sm6150-pinctrl

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

		    dac_calib15, hdmi_rcv, dac_calib16, hdmi_cec, pwr_modem,

		    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, pcie_ep,

		    dac_calib22, dac_calib23, dac_calib24, tsif1_sync, dac_calib25,

		    sd_write, tsif1_error, blsp_spi2, blsp_uart2, blsp_uim2,

		    qdss_cti, blsp_i2c2, blsp_spi3, blsp_uart3, blsp_uim3, blsp_i2c3,
@@ -133,10 +133,9 @@ to specify in a pin configuration subnode: 
		    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,

		    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,

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

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

		    gpio

		    pcie_clk, pa_indicator, adsp_ext, ddr_bist, qdss_tracedata_11,

		    qdss_tracedata_12, modem_tsync, nav_dr, nav_pps, gsm_tx, qspi_cs,

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



- bias-disable:

	Usage: optional

drivers/pinctrl/qcom/pinctrl-sm6150.c

+33 −29
Original line number Diff line number Diff line
@@ -474,7 +474,8 @@ enum sm6150_functions { 
	msm_mux_qlink_request,

	msm_mux_qlink_enable,

	msm_mux_pa_indicator,

	msm_mux_NAV_PPS,

	msm_mux_NAV_PPS_IN,

	msm_mux_NAV_PPS_OUT,

	msm_mux_GPS_TX,

	msm_mux_phase_flag23,

	msm_mux_GP_PDM0,
@@ -587,20 +588,18 @@ static const char * const gpio_groups[] = { 
	"gpio22", "gpio23", "gpio24", "gpio25", "gpio26", "gpio27", "gpio28",

	"gpio29", "gpio30", "gpio31", "gpio32", "gpio33", "gpio34", "gpio35",

	"gpio36", "gpio37", "gpio38", "gpio39", "gpio40", "gpio41", "gpio42",

	"gpio43", "gpio44", "gpio45", "gpio45", "gpio46", "gpio47", "gpio48",

	"gpio48", "gpio49", "gpio49", "gpio50", "gpio50", "gpio51", "gpio52",

	"gpio53", "gpio54", "gpio55", "gpio56", "gpio57", "gpio58", "gpio59",

	"gpio60", "gpio61", "gpio62", "gpio63", "gpio64", "gpio65", "gpio66",

	"gpio67", "gpio68", "gpio69", "gpio70", "gpio71", "gpio72", "gpio73",

	"gpio74", "gpio75", "gpio76", "gpio77", "gpio78", "gpio79", "gpio80",

	"gpio81", "gpio82", "gpio83", "gpio84", "gpio84", "gpio85", "gpio86",

	"gpio87", "gpio88", "gpio88", "gpio89", "gpio90", "gpio91", "gpio92",

	"gpio93", "gpio94", "gpio95", "gpio96", "gpio97", "gpio98", "gpio98",

	"gpio99", "gpio100", "gpio100", "gpio101", "gpio102", "gpio103",

	"gpio104", "gpio105", "gpio106", "gpio107", "gpio108", "gpio109",

	"gpio110", "gpio111", "gpio112", "gpio113", "gpio114", "gpio115",

	"gpio116", "gpio117", "gpio118", "gpio119", "gpio120", "gpio121",

	"gpio122",

	"gpio43", "gpio44", "gpio45", "gpio46", "gpio47", "gpio48", "gpio49",

	"gpio50", "gpio51", "gpio52", "gpio53", "gpio54", "gpio55", "gpio56",

	"gpio57", "gpio58", "gpio59", "gpio60", "gpio61", "gpio62", "gpio63",

	"gpio64", "gpio65", "gpio66", "gpio67", "gpio68", "gpio69", "gpio70",

	"gpio71", "gpio72", "gpio73", "gpio74", "gpio75", "gpio76", "gpio77",

	"gpio78", "gpio79", "gpio80", "gpio81", "gpio82", "gpio83", "gpio84",

	"gpio85", "gpio86", "gpio87", "gpio88", "gpio89", "gpio90", "gpio91",

	"gpio92", "gpio93", "gpio94", "gpio95", "gpio96", "gpio97", "gpio98",

	"gpio99", "gpio100", "gpio101", "gpio102", "gpio103", "gpio104",

	"gpio105", "gpio106", "gpio107", "gpio108", "gpio109", "gpio110",

	"gpio111", "gpio112", "gpio113", "gpio114", "gpio115", "gpio116",

	"gpio117", "gpio118", "gpio119", "gpio120", "gpio121", "gpio122",

};

static const char * const qdss_gpio6_groups[] = {

	"gpio0", "gpio30",
@@ -845,9 +844,13 @@ static const char * const qlink_enable_groups[] = { 
static const char * const pa_indicator_groups[] = {

	"gpio53",

};

static const char * const NAV_PPS_groups[] = {

	"gpio53", "gpio53", "gpio56", "gpio56", "gpio57", "gpio57", "gpio59",

	"gpio59", "gpio60", "gpio60",

static const char * const NAV_PPS_IN_groups[] = {

	"gpio53", "gpio56", "gpio57", "gpio59",

	"gpio60",

};

static const char * const NAV_PPS_OUT_groups[] = {

	"gpio53", "gpio56", "gpio57", "gpio59",

	"gpio60",

};

static const char * const GPS_TX_groups[] = {

	"gpio53", "gpio54", "gpio56", "gpio57", "gpio59", "gpio60",
@@ -1232,7 +1235,8 @@ static const struct msm_function sm6150_functions[] = { 
	FUNCTION(qlink_request),

	FUNCTION(qlink_enable),

	FUNCTION(pa_indicator),

	FUNCTION(NAV_PPS),

	FUNCTION(NAV_PPS_IN),

	FUNCTION(NAV_PPS_OUT),

	FUNCTION(GPS_TX),

	FUNCTION(phase_flag23),

	FUNCTION(GP_PDM0),
@@ -1433,21 +1437,21 @@ static const struct msm_pingroup sm6150_groups[] = { 
			NA),

	[52] = PINGROUP(52, SOUTH, qlink_enable, NA, NA, NA, NA, NA, NA, NA,

			NA),

	[53] = PINGROUP(53, SOUTH, pa_indicator, NAV_PPS, NAV_PPS, GPS_TX, NA,

			phase_flag23, NA, NA, NA),

	[53] = PINGROUP(53, SOUTH, pa_indicator, NAV_PPS_IN, NAV_PPS_OUT,

			GPS_TX, NA, phase_flag23, NA, NA, NA),

	[54] = PINGROUP(54, SOUTH, NA, GPS_TX, GP_PDM0, NA, phase_flag22,

			atest_usb13, ddr_pxi1, NA, NA),

	[55] = PINGROUP(55, SOUTH, NA, NA, phase_flag4, atest_usb12, ddr_pxi1,

			NA, NA, NA, NA),

	[56] = PINGROUP(56, SOUTH, NA, NAV_PPS, NAV_PPS, GPS_TX, NA, NA, NA,

			NA, NA),

	[57] = PINGROUP(57, SOUTH, NA, NAV_PPS, GPS_TX, NAV_PPS, gcc_gp1, NA,

			NA, NA, NA),

	[56] = PINGROUP(56, SOUTH, NA, NAV_PPS_IN, NAV_PPS_OUT, GPS_TX, NA,

			NA, NA, NA, NA),

	[57] = PINGROUP(57, SOUTH, NA, NAV_PPS_IN, GPS_TX, NAV_PPS_OUT,

			gcc_gp1, NA, NA, NA, NA),

	[58] = PINGROUP(58, SOUTH, NA, gcc_gp2, NA, NA, NA, NA, NA, NA, NA),

	[59] = PINGROUP(59, SOUTH, NA, NAV_PPS, NAV_PPS, GPS_TX, gcc_gp3, NA,

			NA, NA, NA),

	[60] = PINGROUP(60, SOUTH, NA, NAV_PPS, NAV_PPS, GPS_TX, CRI_TRNG0, NA,

			NA, NA, NA),

	[59] = PINGROUP(59, SOUTH, NA, NAV_PPS_IN, NAV_PPS_OUT, GPS_TX,

			gcc_gp3, NA, NA, NA, NA),

	[60] = PINGROUP(60, SOUTH, NA, NAV_PPS_IN, NAV_PPS_OUT, GPS_TX,

			CRI_TRNG0, NA, NA, NA, NA),

	[61] = PINGROUP(61, SOUTH, NA, CRI_TRNG, NA, NA, NA, NA, NA, NA, NA),

	[62] = PINGROUP(62, SOUTH, NA, CRI_TRNG1, NA, NA, NA, NA, NA, NA, NA),

	[63] = PINGROUP(63, SOUTH, NA, NA, GP_PDM2, NA, NA, NA, NA, NA, NA),