Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

This reverts commit 0d5358330c20d50e52e3e65ff07a5db8007041fc.

+14 -20
+4 -4
drivers/pinctrl/tegra/pinctrl-tegra.c
··· 632 632 u32 val; 633 633 634 634 for (i = 0; i < pmx->soc->ngroups; ++i) { 635 - if (pmx->soc->groups[i].parked_reg >= 0) { 636 - g = &pmx->soc->groups[i]; 637 - val = pmx_readl(pmx, g->parked_bank, g->parked_reg); 635 + g = &pmx->soc->groups[i]; 636 + if (g->parked_bit >= 0) { 637 + val = pmx_readl(pmx, g->mux_bank, g->mux_reg); 638 638 val &= ~(1 << g->parked_bit); 639 - pmx_writel(pmx, val, g->parked_bank, g->parked_reg); 639 + pmx_writel(pmx, val, g->mux_bank, g->mux_reg); 640 640 } 641 641 } 642 642 }
+1 -5
drivers/pinctrl/tegra/pinctrl-tegra.h
··· 93 93 * @tri_reg: Tri-state register offset. 94 94 * @tri_bank: Tri-state register bank. 95 95 * @tri_bit: Tri-state register bit. 96 - * @parked_reg: Parked register offset. -1 if unsupported. 97 - * @parked_bank: Parked register bank. 0 if unsupported. 98 - * @parked_bit: Parked register bit. 0 if unsupported. 96 + * @parked_bit: Parked register bit. -1 if unsupported. 99 97 * @einput_bit: Enable-input register bit. 100 98 * @odrain_bit: Open-drain register bit. 101 99 * @lock_bit: Lock register bit. ··· 136 138 s16 pupd_reg; 137 139 s16 tri_reg; 138 140 s16 drv_reg; 139 - s16 parked_reg; 140 141 u32 mux_bank:2; 141 142 u32 pupd_bank:2; 142 143 u32 tri_bank:2; 143 144 u32 drv_bank:2; 144 - u32 parked_bank:2; 145 145 s32 mux_bit:6; 146 146 s32 pupd_bit:6; 147 147 s32 tri_bit:6;
+2 -2
drivers/pinctrl/tegra/pinctrl-tegra114.c
··· 1578 1578 .lock_bit = 7, \ 1579 1579 .ioreset_bit = PINGROUP_BIT_##ior(8), \ 1580 1580 .rcv_sel_bit = PINGROUP_BIT_##rcv_sel(9), \ 1581 - .parked_reg = -1, \ 1581 + .parked_bit = -1, \ 1582 1582 .drv_reg = -1, \ 1583 1583 } 1584 1584 ··· 1599 1599 .rcv_sel_bit = -1, \ 1600 1600 .drv_reg = DRV_PINGROUP_REG(r), \ 1601 1601 .drv_bank = 0, \ 1602 - .parked_reg = -1, \ 1602 + .parked_bit = -1, \ 1603 1603 .hsm_bit = hsm_b, \ 1604 1604 .schmitt_bit = schmitt_b, \ 1605 1605 .lpmd_bit = lpmd_b, \
+2 -2
drivers/pinctrl/tegra/pinctrl-tegra124.c
··· 1747 1747 .lock_bit = 7, \ 1748 1748 .ioreset_bit = PINGROUP_BIT_##ior(8), \ 1749 1749 .rcv_sel_bit = PINGROUP_BIT_##rcv_sel(9), \ 1750 - .parked_reg = -1, \ 1750 + .parked_bit = -1, \ 1751 1751 .drv_reg = -1, \ 1752 1752 } 1753 1753 ··· 1768 1768 .rcv_sel_bit = -1, \ 1769 1769 .drv_reg = DRV_PINGROUP_REG(r), \ 1770 1770 .drv_bank = 0, \ 1771 - .parked_reg = -1, \ 1771 + .parked_bit = -1, \ 1772 1772 .hsm_bit = hsm_b, \ 1773 1773 .schmitt_bit = schmitt_b, \ 1774 1774 .lpmd_bit = lpmd_b, \
+2 -2
drivers/pinctrl/tegra/pinctrl-tegra20.c
··· 1994 1994 .tri_reg = ((tri_r) - TRISTATE_REG_A), \ 1995 1995 .tri_bank = 0, \ 1996 1996 .tri_bit = tri_b, \ 1997 - .parked_reg = -1, \ 1997 + .parked_bit = -1, \ 1998 1998 .einput_bit = -1, \ 1999 1999 .odrain_bit = -1, \ 2000 2000 .lock_bit = -1, \ ··· 2014 2014 .pupd_bank = 2, \ 2015 2015 .pupd_bit = pupd_b, \ 2016 2016 .drv_reg = -1, \ 2017 - .parked_reg = -1, \ 2017 + .parked_bit = -1, \ 2018 2018 } 2019 2019 2020 2020 /* Pin groups for drive strength registers (configurable version) */
+1 -3
drivers/pinctrl/tegra/pinctrl-tegra210.c
··· 1310 1310 .lock_bit = 7, \ 1311 1311 .ioreset_bit = -1, \ 1312 1312 .rcv_sel_bit = PINGROUP_BIT_##e_io_hv(10), \ 1313 - .parked_reg = PINGROUP_REG(r), \ 1314 - .parked_bank = 1, \ 1315 1313 .parked_bit = 5, \ 1316 1314 .hsm_bit = PINGROUP_BIT_##hsm(9), \ 1317 1315 .schmitt_bit = 12, \ ··· 1343 1345 .rcv_sel_bit = -1, \ 1344 1346 .drv_reg = DRV_PINGROUP_REG(r), \ 1345 1347 .drv_bank = 0, \ 1346 - .parked_reg = -1, \ 1348 + .parked_bit = -1, \ 1347 1349 .hsm_bit = -1, \ 1348 1350 .schmitt_bit = -1, \ 1349 1351 .lpmd_bit = -1, \
+2 -2
drivers/pinctrl/tegra/pinctrl-tegra30.c
··· 2139 2139 .lock_bit = 7, \ 2140 2140 .ioreset_bit = PINGROUP_BIT_##ior(8), \ 2141 2141 .rcv_sel_bit = -1, \ 2142 - .parked_reg = -1, \ 2142 + .parked_bit = -1, \ 2143 2143 .drv_reg = -1, \ 2144 2144 } 2145 2145 ··· 2160 2160 .rcv_sel_bit = -1, \ 2161 2161 .drv_reg = DRV_PINGROUP_REG(r), \ 2162 2162 .drv_bank = 0, \ 2163 - .parked_reg = -1, \ 2163 + .parked_bit = -1, \ 2164 2164 .hsm_bit = hsm_b, \ 2165 2165 .schmitt_bit = schmitt_b, \ 2166 2166 .lpmd_bit = lpmd_b, \