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

Commit eab7fff1 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "drivers: pinctrl: qcom: Enable emacs_pps special function for sdxpoorwills"

parents 88debe20 dc9b5e89
Loading
Loading
Loading
Loading
+8 −1
Original line number Diff line number Diff line
@@ -456,6 +456,7 @@ enum sdxpoorwills_functions {
	msm_mux_qdss_stm0,
	msm_mux_dbg_out,
	msm_mux_gcc_plltest,
	msm_mux_emac_pps,
	msm_mux_NA,
};

@@ -832,6 +833,10 @@ static const char * const gcc_plltest_groups[] = {
	"gpio73", "gpio74",
};

static const char * const emac_pps_groups[] = {
	"gpio89",
};

static const struct msm_function sdxpoorwills_functions[] = {
	FUNCTION(uim2_data),
	FUNCTION(gpio),
@@ -950,6 +955,7 @@ static const struct msm_function sdxpoorwills_functions[] = {
	FUNCTION(qdss_stm0),
	FUNCTION(dbg_out),
	FUNCTION(gcc_plltest),
	FUNCTION(emac_pps),
};

/* Every pin is maintained as a single group, and missing or non-existing pin
@@ -1087,7 +1093,8 @@ static const struct msm_pingroup sdxpoorwills_groups[] = {
	[86] = PINGROUP(86, NA, NA, NA, NA, NA, NA, NA, NA, NA),
	[87] = PINGROUP(87, NA, NA, NA, NA, NA, NA, NA, NA, NA),
	[88] = PINGROUP(88, qdss_cti, qdss_cti, NA, NA, NA, NA, NA, NA, NA),
	[89] = PINGROUP(89, qdss_cti, qdss_cti, NA, NA, NA, NA, NA, NA, NA),
	[89] = PINGROUP(89, qdss_cti, qdss_cti, emac_pps, NA, NA, NA, NA,
			NA, NA),
	[90] = PINGROUP(90, NA, NA, NA, NA, NA, NA, NA, NA, NA),
	[91] = PINGROUP(91, NA, NA, NA, NA, NA, NA, NA, NA, NA),
	[92] = PINGROUP(92, NA, NA, NA, NA, NA, NA, NA, NA, NA),