Merge "pinctrl: qcom: function group for qup11_f* instance for holi" (bf9040dc) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/pinctrl/qcom/pinctrl-holi.c

+13 −8

Original line number	Diff line number	Diff line
		// SPDX-License-Identifier: GPL-2.0-only
		/*
		* Copyright (c) 2020, The Linux Foundation. All rights reserved.
		* Copyright (c) 2020-2021, The Linux Foundation. All rights reserved.
		*/

		#include <linux/module.h>
		@@ -578,7 +578,8 @@ enum holi_functions {
		msm_mux_qup01,
		msm_mux_qup02,
		msm_mux_qup10,
		msm_mux_qup11,
		msm_mux_qup11_f1,
		msm_mux_qup11_f2,
		msm_mux_qup12,
		msm_mux_qup13_f1,
		msm_mux_qup13_f2,
		@@ -1026,7 +1027,10 @@ static const char * const qup02_groups[] = {
		static const char * const qup10_groups[] = {
		"gpio13", "gpio14", "gpio15", "gpio16", "gpio17",
		};
		static const char * const qup11_groups[] = {
		static const char * const qup11_f1_groups[] = {
		"gpio27", "gpio28",
		};
		static const char * const qup11_f2_groups[] = {
		"gpio27", "gpio28",
		};
		static const char * const qup12_groups[] = {
		@@ -1144,7 +1148,8 @@ static const struct msm_function holi_functions[] = {
		FUNCTION(edp_lcd),
		FUNCTION(qup13_f1),
		FUNCTION(qup13_f2),
		FUNCTION(qup11),
		FUNCTION(qup11_f1),
		FUNCTION(qup11_f2),
		FUNCTION(PLL_BIST),
		FUNCTION(qdss_gpio14),
		FUNCTION(qdss_gpio15),
		@@ -1330,10 +1335,10 @@ static const struct msm_pingroup holi_groups[] = {
		0x9C00C, 15),
		[26] = PINGROUP(26, qup13_f1, qup13_f2, NA, NA, NA, NA, NA, NA, NA,
		0, -1),
		[27] = PINGROUP(27, qup11, qup11, MDP_VSYNC, PLL_BIST, NA, qdss_gpio14,
		NA, NA, NA, 0x9C010, 0),
		[28] = PINGROUP(28, qup11, qup11, MDP_VSYNC, NA, qdss_gpio15, NA, NA,
		NA, NA, 0x9C010, 1),
		[27] = PINGROUP(27, qup11_f1, qup11_f2, MDP_VSYNC, PLL_BIST, NA,
		qdss_gpio14, NA, NA, NA, 0x9C010, 0),
		[28] = PINGROUP(28, qup11_f1, qup11_f2, MDP_VSYNC, NA, qdss_gpio15,
		NA, NA, NA, NA, 0x9C010, 1),
		[29] = PINGROUP(29, cam_mclk, NA, NA, NA, NA, NA, NA, NA, NA, 0, -1),
		[30] = PINGROUP(30, cam_mclk, NA, NA, NA, NA, NA, NA, NA, NA, 0, -1),
		[31] = PINGROUP(31, cam_mclk, NA, NA, NA, NA, NA, NA, NA, NA, 0, -1),