Merge "pinctrl: qcom: Enable gps_ext_aggressor function for sdxpoorwills" (ea2b9a49) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/pinctrl/qcom/pinctrl-sdxpoorwills.c

+8 −1

Original line number	Diff line number	Diff line
		@@ -457,6 +457,7 @@ enum sdxpoorwills_functions {
		msm_mux_dbg_out,
		msm_mux_gcc_plltest,
		msm_mux_emac_pps,
		msm_mux_gps_ext_aggressor,
		msm_mux_NA,
		};

		@@ -837,6 +838,10 @@ static const char * const emac_pps_groups[] = {
		"gpio89",
		};

		static const char * const gps_ext_aggressor_groups[] = {
		"gpio42",
		};

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

		/* Every pin is maintained as a single group, and missing or non-existing pin
		@@ -1033,7 +1039,8 @@ static const struct msm_pingroup sdxpoorwills_groups[] = {
		[39] = PINGROUP(39, NA, NA, NA, NA, NA, NA, NA, NA, NA),
		[40] = PINGROUP(40, NA, NA, cri_trng0, NA, NA, NA, NA, NA, NA),
		[41] = PINGROUP(41, NA, NA, cri_trng1, NA, NA, NA, NA, NA, NA),
		[42] = PINGROUP(42, nav_pps, nav_dr, pll_ref, NA, NA, NA, NA, NA, NA),
		[42] = PINGROUP(42, nav_pps, gps_ext_aggressor, nav_dr, pll_ref, NA,
		NA, NA, NA, NA),
		[43] = PINGROUP(43, NA, NA, NA, NA, NA, NA, NA, NA, NA),
		[44] = PINGROUP(44, coex_uart, qdss_tracectl, NA, NA, NA, NA, NA, NA,
		NA),