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

Commit 144ef626 authored by Bjorn Andersson's avatar Bjorn Andersson Committed by Linus Walleij
Browse files

pinctrl: qcom: Make muxing of gpio function explicit 



Instead of relying on pinmux->disable(), make the gpio function an
explicit function for all pins that supports it.

Signed-off-by: default avatarBjorn Andersson <bjorn.andersson@sonymobile.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 3a198059

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -46,7 +46,7 @@ Valid values for pins are: 
  gpio0-gpio89

  gpio0-gpio89





Valid values for function are:

Valid values for function are:

  cam_mclk, codec_mic_i2s, codec_spkr_i2s, gsbi1, gsbi2, gsbi3, gsbi4,

  cam_mclk, codec_mic_i2s, codec_spkr_i2s, gpio, gsbi1, gsbi2, gsbi3, gsbi4,

  gsbi4_cam_i2c, gsbi5, gsbi5_spi_cs1, gsbi5_spi_cs2, gsbi5_spi_cs3, gsbi6,

  gsbi4_cam_i2c, gsbi5, gsbi5_spi_cs1, gsbi5_spi_cs2, gsbi5_spi_cs3, gsbi6,

  gsbi6_spi_cs1, gsbi6_spi_cs2, gsbi6_spi_cs3, gsbi7, gsbi7_spi_cs1,

  gsbi6_spi_cs1, gsbi6_spi_cs2, gsbi6_spi_cs3, gsbi7, gsbi7_spi_cs1,

  gsbi7_spi_cs2, gsbi7_spi_cs3, gsbi_cam_i2c, hdmi, mi2s, riva_bt, riva_fm,

  gsbi7_spi_cs2, gsbi7_spi_cs3, gsbi_cam_i2c, hdmi, mi2s, riva_bt, riva_fm,

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -51,7 +51,7 @@ Valid values for qcom,pins are: 








Valid values for function are:

Valid values for function are:

  mdio, mi2s, pdm, ssbi, spmi, audio_pcm, gsbi1, gsbi2, gsbi4, gsbi5,

  mdio, mi2s, pdm, ssbi, spmi, audio_pcm, gpio, gsbi1, gsbi2, gsbi4, gsbi5,

  gsbi5_spi_cs1, gsbi5_spi_cs2, gsbi5_spi_cs3, gsbi6, gsbi7, nss_spi, sdc1,

  gsbi5_spi_cs1, gsbi5_spi_cs2, gsbi5_spi_cs3, gsbi6, gsbi7, nss_spi, sdc1,

  spdif, nand, tsif1, tsif2, usb_fs_n, usb_fs, usb2_hsic, rgmii2, sata,

  spdif, nand, tsif1, tsif2, usb_fs_n, usb_fs, usb2_hsic, rgmii2, sata,

  pcie1_rst, pcie1_prsnt, pcie1_pwren_n, pcie1_pwren, pcie1_pwrflt,

  pcie1_rst, pcie1_prsnt, pcie1_pwren_n, pcie1_pwren, pcie1_pwrflt,

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -83,7 +83,7 @@ to specify in a pin configuration subnode: 
		    sdc3_data

		    sdc3_data





- function:

- function:

	Usage: optional

	Usage: required

	Value type: <string>

	Value type: <string>

	Definition: Specify the alternative function to be configured for the

	Definition: Specify the alternative function to be configured for the

		    specified pins. Functions are only valid for gpio pins.

		    specified pins. Functions are only valid for gpio pins.
@@ -92,7 +92,7 @@ to specify in a pin configuration subnode: 
		    codec_mic_i2s, codec_spkr_i2s, ext_gps, fm, gps_blanking,

		    codec_mic_i2s, codec_spkr_i2s, ext_gps, fm, gps_blanking,

		    gps_pps_in, gps_pps_out, gp_clk_0a, gp_clk_0b, gp_clk_1a,

		    gps_pps_in, gps_pps_out, gp_clk_0a, gp_clk_0b, gp_clk_1a,

		    gp_clk_1b, gp_clk_2a, gp_clk_2b, gp_mn, gp_pdm_0a,

		    gp_clk_1b, gp_clk_2a, gp_clk_2b, gp_mn, gp_pdm_0a,

		    gp_pdm_0b, gp_pdm_1a, gp_pdm_1b, gp_pdm_2a, gp_pdm_2b,

		    gp_pdm_0b, gp_pdm_1a, gp_pdm_1b, gp_pdm_2a, gp_pdm_2b, gpio,

		    gsbi1, gsbi1_spi_cs1_n, gsbi1_spi_cs2a_n, gsbi1_spi_cs2b_n,

		    gsbi1, gsbi1_spi_cs1_n, gsbi1_spi_cs2a_n, gsbi1_spi_cs2b_n,

		    gsbi1_spi_cs3_n, gsbi2, gsbi2_spi_cs1_n, gsbi2_spi_cs2_n,

		    gsbi1_spi_cs3_n, gsbi2, gsbi2_spi_cs1_n, gsbi2_spi_cs2_n,

		    gsbi2_spi_cs3_n, gsbi3, gsbi4, gsbi4_3d_cam_i2c_l,

		    gsbi2_spi_cs3_n, gsbi3, gsbi4, gsbi4_3d_cam_i2c_l,

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -70,7 +70,7 @@ Valid values for function are: 
  cam_mckl0, cam_mclk1, cam_mclk2, cam_mclk3, mdp_vsync, hdmi_cec, hdmi_ddc,

  cam_mckl0, cam_mclk1, cam_mclk2, cam_mclk3, mdp_vsync, hdmi_cec, hdmi_ddc,

  hdmi_hpd, edp_hpd, gp_pdm0, gp_pdm1, gp_pdm2, gp_pdm3, gp0_clk, gp1_clk,

  hdmi_hpd, edp_hpd, gp_pdm0, gp_pdm1, gp_pdm2, gp_pdm3, gp0_clk, gp1_clk,

  gp_mn, tsif1, tsif2, hsic, grfc, audio_ref_clk, qua_mi2s, pri_mi2s, spkr_mi2s,

  gp_mn, tsif1, tsif2, hsic, grfc, audio_ref_clk, qua_mi2s, pri_mi2s, spkr_mi2s,

  ter_mi2s, sec_mi2s, bt, fm, wlan, slimbus

  ter_mi2s, sec_mi2s, bt, fm, wlan, slimbus, gpio





  (Note that this is not yet the complete list of functions)

  (Note that this is not yet the complete list of functions)

drivers/pinctrl/qcom/pinctrl-apq8064.c

+18 −1
Original line number Original line Diff line number Diff line
@@ -230,7 +230,7 @@ static const unsigned int sdc3_data_pins[] = { 95 }; 
		.pins = gpio##id##_pins,		\

		.pins = gpio##id##_pins,		\

		.npins = ARRAY_SIZE(gpio##id##_pins),	\

		.npins = ARRAY_SIZE(gpio##id##_pins),	\

		.funcs = (int[]){			\

		.funcs = (int[]){			\

			APQ_MUX_NA, /* gpio mode */	\

			APQ_MUX_gpio,			\

			APQ_MUX_##f1,			\

			APQ_MUX_##f1,			\

			APQ_MUX_##f2,			\

			APQ_MUX_##f2,			\

			APQ_MUX_##f3,			\

			APQ_MUX_##f3,			\
@@ -293,6 +293,7 @@ enum apq8064_functions { 
	APQ_MUX_cam_mclk,

	APQ_MUX_cam_mclk,

	APQ_MUX_codec_mic_i2s,

	APQ_MUX_codec_mic_i2s,

	APQ_MUX_codec_spkr_i2s,

	APQ_MUX_codec_spkr_i2s,

	APQ_MUX_gpio,

	APQ_MUX_gsbi1,

	APQ_MUX_gsbi1,

	APQ_MUX_gsbi2,

	APQ_MUX_gsbi2,

	APQ_MUX_gsbi3,

	APQ_MUX_gsbi3,
@@ -335,6 +336,21 @@ static const char * const codec_mic_i2s_groups[] = { 
static const char * const codec_spkr_i2s_groups[] = {

static const char * const codec_spkr_i2s_groups[] = {

	"gpio39", "gpio40", "gpio41", "gpio42"

	"gpio39", "gpio40", "gpio41", "gpio42"

};

};

static const char * const gpio_groups[] = {

	"gpio0", "gpio1", "gpio2", "gpio3", "gpio4", "gpio5", "gpio6", "gpio7",

	"gpio8", "gpio9", "gpio10", "gpio11", "gpio12", "gpio13", "gpio14",

	"gpio15", "gpio16", "gpio17", "gpio18", "gpio19", "gpio20", "gpio21",

	"gpio22", "gpio23", "gpio24", "gpio25", "gpio26", "gpio27", "gpio28",

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

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

	"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"

};

static const char * const gsbi1_groups[] = {

static const char * const gsbi1_groups[] = {

	"gpio18", "gpio19", "gpio20", "gpio21"

	"gpio18", "gpio19", "gpio20", "gpio21"

};

};
@@ -430,6 +446,7 @@ static const struct msm_function apq8064_functions[] = { 
	FUNCTION(cam_mclk),

	FUNCTION(cam_mclk),

	FUNCTION(codec_mic_i2s),

	FUNCTION(codec_mic_i2s),

	FUNCTION(codec_spkr_i2s),

	FUNCTION(codec_spkr_i2s),

	FUNCTION(gpio),

	FUNCTION(gsbi1),

	FUNCTION(gsbi1),

	FUNCTION(gsbi2),

	FUNCTION(gsbi2),

	FUNCTION(gsbi3),

	FUNCTION(gsbi3),