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

Commit 0bde4897 authored by Linus Walleij's avatar Linus Walleij
Browse files

Revert "Revert "pinctrl: tegra: avoid parked_reg and parked_bank"" 

This reverts commit 0d535833.
parent aeb99c85

drivers/pinctrl/tegra/pinctrl-tegra.c

+4 −4
Original line number Diff line number Diff line
@@ -632,11 +632,11 @@ static void tegra_pinctrl_clear_parked_bits(struct tegra_pmx *pmx) 
	u32 val;



	for (i = 0; i < pmx->soc->ngroups; ++i) {

		if (pmx->soc->groups[i].parked_reg >= 0) {

		g = &pmx->soc->groups[i];

			val = pmx_readl(pmx, g->parked_bank, g->parked_reg);

		if (g->parked_bit >= 0) {

			val = pmx_readl(pmx, g->mux_bank, g->mux_reg);

			val &= ~(1 << g->parked_bit);

			pmx_writel(pmx, val, g->parked_bank, g->parked_reg);

			pmx_writel(pmx, val, g->mux_bank, g->mux_reg);

		}

	}

}

drivers/pinctrl/tegra/pinctrl-tegra.h

+1 −5
Original line number Diff line number Diff line
@@ -93,9 +93,7 @@ struct tegra_function { 
 * @tri_reg:		Tri-state register offset.

 * @tri_bank:		Tri-state register bank.

 * @tri_bit:		Tri-state register bit.

 * @parked_reg:		Parked register offset. -1 if unsupported.

 * @parked_bank:	Parked register bank. 0 if unsupported.

 * @parked_bit:		Parked register bit. 0 if unsupported.

 * @parked_bit:		Parked register bit. -1 if unsupported.

 * @einput_bit:		Enable-input register bit.

 * @odrain_bit:		Open-drain register bit.

 * @lock_bit:		Lock register bit.
@@ -138,12 +136,10 @@ struct tegra_pingroup { 
	s16 pupd_reg;

	s16 tri_reg;

	s16 drv_reg;

	s16 parked_reg;

	u32 mux_bank:2;

	u32 pupd_bank:2;

	u32 tri_bank:2;

	u32 drv_bank:2;

	u32 parked_bank:2;

	s32 mux_bit:6;

	s32 pupd_bit:6;

	s32 tri_bit:6;

drivers/pinctrl/tegra/pinctrl-tegra114.c

+2 −2
Original line number Diff line number Diff line
@@ -1578,7 +1578,7 @@ static struct tegra_function tegra114_functions[] = { 
		.lock_bit = 7,						\

		.ioreset_bit = PINGROUP_BIT_##ior(8),			\

		.rcv_sel_bit = PINGROUP_BIT_##rcv_sel(9),		\

		.parked_reg = -1,					\

		.parked_bit = -1,					\

		.drv_reg = -1,						\

	}
@@ -1599,7 +1599,7 @@ static struct tegra_function tegra114_functions[] = { 
		.rcv_sel_bit = -1,					\

		.drv_reg = DRV_PINGROUP_REG(r),				\

		.drv_bank = 0,						\

		.parked_reg = -1,					\

		.parked_bit = -1,					\

		.hsm_bit = hsm_b,					\

		.schmitt_bit = schmitt_b,				\

		.lpmd_bit = lpmd_b,					\

drivers/pinctrl/tegra/pinctrl-tegra124.c

+2 −2
Original line number Diff line number Diff line
@@ -1747,7 +1747,7 @@ static struct tegra_function tegra124_functions[] = { 
		.lock_bit = 7,						\

		.ioreset_bit = PINGROUP_BIT_##ior(8),			\

		.rcv_sel_bit = PINGROUP_BIT_##rcv_sel(9),		\

		.parked_reg = -1,					\

		.parked_bit = -1,					\

		.drv_reg = -1,						\

	}
@@ -1768,7 +1768,7 @@ static struct tegra_function tegra124_functions[] = { 
		.rcv_sel_bit = -1,					\

		.drv_reg = DRV_PINGROUP_REG(r),				\

		.drv_bank = 0,						\

		.parked_reg = -1,					\

		.parked_bit = -1,					\

		.hsm_bit = hsm_b,					\

		.schmitt_bit = schmitt_b,				\

		.lpmd_bit = lpmd_b,					\

drivers/pinctrl/tegra/pinctrl-tegra20.c

+2 −2
Original line number Diff line number Diff line
@@ -1994,7 +1994,7 @@ static struct tegra_function tegra20_functions[] = { 
		.tri_reg = ((tri_r) - TRISTATE_REG_A),		\

		.tri_bank = 0,					\

		.tri_bit = tri_b,				\

		.parked_reg = -1,				\

		.parked_bit = -1,				\

		.einput_bit = -1,				\

		.odrain_bit = -1,				\

		.lock_bit = -1,					\
@@ -2014,7 +2014,7 @@ static struct tegra_function tegra20_functions[] = { 
		.pupd_bank = 2,					\

		.pupd_bit = pupd_b,				\

		.drv_reg = -1,					\

		.parked_reg = -1,				\

		.parked_bit = -1,				\

	}



/* Pin groups for drive strength registers (configurable version) */