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

Commit 64516c46 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: Add dirconn info for sdxpoorwills"

parents ff37b931 f166e3f8

drivers/pinctrl/qcom/pinctrl-msm.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1455,7 +1455,7 @@ static void msm_gpio_setup_dir_connects(struct msm_pinctrl *pctrl) 
	 * Statically choose the GPIOs for mapping to PDC. Dynamic mux mapping

	 * Statically choose the GPIOs for mapping to PDC. Dynamic mux mapping

	 * is very difficult.

	 * is very difficult.

	 */

	 */

	for (i = 0; i < pctrl->soc->n_pdc_mux_out; i++) {

	for (i = 0; i < pctrl->soc->n_gpio_mux_in; i++) {

		unsigned int irq;

		unsigned int irq;

		struct irq_data *d;

		struct irq_data *d;

		struct msm_gpio_mux_input *gpio_in =

		struct msm_gpio_mux_input *gpio_in =

drivers/pinctrl/qcom/pinctrl-sdxpoorwills.c

+5 −2
Original line number Original line Diff line number Diff line
@@ -50,6 +50,7 @@ 
		.intr_cfg_reg = REG_BASE + 0x8 + REG_SIZE * id,		\

		.intr_cfg_reg = REG_BASE + 0x8 + REG_SIZE * id,		\

		.intr_status_reg = REG_BASE + 0xc + REG_SIZE * id,	\

		.intr_status_reg = REG_BASE + 0xc + REG_SIZE * id,	\

		.intr_target_reg = REG_BASE + 0x8 + REG_SIZE * id,	\

		.intr_target_reg = REG_BASE + 0x8 + REG_SIZE * id,	\

		.dir_conn_reg = REG_BASE + 0xab000,\

		.mux_bit = 2,			\

		.mux_bit = 2,			\

		.pull_bit = 0,			\

		.pull_bit = 0,			\

		.drv_bit = 6,			\

		.drv_bit = 6,			\
@@ -64,6 +65,7 @@ 
		.intr_polarity_bit = 1,		\

		.intr_polarity_bit = 1,		\

		.intr_detection_bit = 2,	\

		.intr_detection_bit = 2,	\

		.intr_detection_width = 2,	\

		.intr_detection_width = 2,	\

		.dir_conn_en_bit = 8,		\

	}

	}





#define SDC_QDSD_PINGROUP(pg_name, ctl, pull, drv)	\

#define SDC_QDSD_PINGROUP(pg_name, ctl, pull, drv)	\
@@ -1151,7 +1153,7 @@ static struct msm_gpio_mux_input sdxpoorwills_mux_in[] = { 
	{42, 80},

	{42, 80},

	{43, 82},

	{43, 82},

	{44, 83},

	{44, 83},

	{45, 84},

	{45, 84, 1},

	{46, 86},

	{46, 86},

	{47, 87},

	{47, 87},

	{48, 88},

	{48, 88},
@@ -1197,7 +1199,7 @@ static struct msm_pdc_mux_output sdxpoorwills_mux_out[] = { 
};

};





static struct msm_dir_conn sdxpoorwills_dir_conn[] = {

static struct msm_dir_conn sdxpoorwills_dir_conn[] = {

	{84, 220, 1},

	{0, 220},

	{0, 219},

	{0, 219},

	{0, 218},

	{0, 218},

	{0, 217},

	{0, 217},
@@ -1222,6 +1224,7 @@ static const struct msm_pinctrl_soc_data sdxpoorwills_pinctrl = { 
	.ngpios = 100,

	.ngpios = 100,

	.dir_conn_irq_base = 220,

	.dir_conn_irq_base = 220,

	.dir_conn = sdxpoorwills_dir_conn,

	.dir_conn = sdxpoorwills_dir_conn,

	.n_dir_conns = ARRAY_SIZE(sdxpoorwills_dir_conn),

};

};





static int sdxpoorwills_pinctrl_probe(struct platform_device *pdev)

static int sdxpoorwills_pinctrl_probe(struct platform_device *pdev)