Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-05 03:21:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

pinctrl: tegra: driver layout/consistency fixes

Browse Source 
Various non-semantic tweaks and layout/consistency fixes for existing
Tegra pinctrl drivers.

Move the definition of DRV_PINGROUP_REG() before the definition of
PINGROUP() so that a future SoC driver can invoke the former from the
latter.

PINGROUP_BIT_Y(n) is just n, so replace it with n.

Re-wrap the parameters to *PINGROUP().

Keep various enums sorted in the Tegra124 driver.

Various white-space consistency fixes.

These changes aim to update existing drivers to be consistent with future
SoC drivers. While we could ignore these tweaks to the existing drivers,
I'd like to keep everything as consistent as possible for easy comparison.
Besides, I auto-generate the drivers, and maintaining special-cases to
keep the differences in place is annoying.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Tested-by: Alexandre Courbot <acourbot@nvidia.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Stephen Warren 2015-02-24 14:00:48 -07:00 committed by Linus Walleij
parent b5eec4d061
commit 8d4684b39b
3 changed files with 75 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/pinctrl/pinctrl-tegra114.c
View File

@ -1547,6 +1547,7 @@ static struct tegra_function tegra114_functions[] = {
#define DRV_PINGROUP_REG_A 0x868 /* bank 0 */ #define DRV_PINGROUP_REG_A 0x868 /* bank 0 */
#define PINGROUP_REG_A 0x3000 /* bank 1 */ #define PINGROUP_REG_A 0x3000 /* bank 1 */
#define DRV_PINGROUP_REG(r) ((r) - DRV_PINGROUP_REG_A)
#define PINGROUP_REG(r) ((r) - PINGROUP_REG_A) #define PINGROUP_REG(r) ((r) - PINGROUP_REG_A)
#define PINGROUP_BIT_Y(b) (b) #define PINGROUP_BIT_Y(b) (b)
@ -1572,20 +1573,17 @@ static struct tegra_function tegra114_functions[] = {
.tri_reg = PINGROUP_REG(r), \ .tri_reg = PINGROUP_REG(r), \
.tri_bank = 1, \ .tri_bank = 1, \
.tri_bit = 4, \ .tri_bit = 4, \
.einput_bit = PINGROUP_BIT_Y(5), \ .einput_bit = 5, \
.odrain_bit = PINGROUP_BIT_##od(6), \ .odrain_bit = PINGROUP_BIT_##od(6), \
.lock_bit = PINGROUP_BIT_Y(7), \ .lock_bit = 7, \
.ioreset_bit = PINGROUP_BIT_##ior(8), \ .ioreset_bit = PINGROUP_BIT_##ior(8), \
.rcv_sel_bit = PINGROUP_BIT_##rcv_sel(9), \ .rcv_sel_bit = PINGROUP_BIT_##rcv_sel(9), \
.drv_reg = -1, \ .drv_reg = -1, \
} }
#define DRV_PINGROUP_REG(r) ((r) - DRV_PINGROUP_REG_A) #define DRV_PINGROUP(pg_name, r, hsm_b, schmitt_b, lpmd_b, drvdn_b, \
drvdn_w, drvup_b, drvup_w, slwr_b, slwr_w, \
#define DRV_PINGROUP(pg_name, r, hsm_b, schmitt_b, lpmd_b, \ slwf_b, slwf_w, drvtype) \
drvdn_b, drvdn_w, drvup_b, drvup_w, \
slwr_b, slwr_w, slwf_b, slwf_w, \
drvtype) \
{ \ { \
.name = "drive_" #pg_name, \ .name = "drive_" #pg_name, \
.pins = drive_##pg_name##_pins, \ .pins = drive_##pg_name##_pins, \

29
drivers/pinctrl/pinctrl-tegra124.c
View File

@ -1536,6 +1536,7 @@ enum tegra_mux {
TEGRA_MUX_CLK, TEGRA_MUX_CLK,
TEGRA_MUX_CLK12, TEGRA_MUX_CLK12,
TEGRA_MUX_CPU, TEGRA_MUX_CPU,
TEGRA_MUX_CSI,
TEGRA_MUX_DAP, TEGRA_MUX_DAP,
TEGRA_MUX_DAP1, TEGRA_MUX_DAP1,
TEGRA_MUX_DAP2, TEGRA_MUX_DAP2,
@ -1544,6 +1545,7 @@ enum tegra_mux {
TEGRA_MUX_DISPLAYA_ALT, TEGRA_MUX_DISPLAYA_ALT,
TEGRA_MUX_DISPLAYB, TEGRA_MUX_DISPLAYB,
TEGRA_MUX_DP, TEGRA_MUX_DP,
TEGRA_MUX_DSI_B,
TEGRA_MUX_DTV, TEGRA_MUX_DTV,
TEGRA_MUX_EXTPERIPH1, TEGRA_MUX_EXTPERIPH1,
TEGRA_MUX_EXTPERIPH2, TEGRA_MUX_EXTPERIPH2,
@ -1613,8 +1615,6 @@ enum tegra_mux {
TEGRA_MUX_VI_ALT3, TEGRA_MUX_VI_ALT3,
TEGRA_MUX_VIMCLK2, TEGRA_MUX_VIMCLK2,
TEGRA_MUX_VIMCLK2_ALT, TEGRA_MUX_VIMCLK2_ALT,
TEGRA_MUX_CSI,
TEGRA_MUX_DSI_B,
}; };
#define FUNCTION(fname) \ #define FUNCTION(fname) \
@ -1630,6 +1630,7 @@ static struct tegra_function tegra124_functions[] = {
FUNCTION(clk), FUNCTION(clk),
FUNCTION(clk12), FUNCTION(clk12),
FUNCTION(cpu), FUNCTION(cpu),
FUNCTION(csi),
FUNCTION(dap), FUNCTION(dap),
FUNCTION(dap1), FUNCTION(dap1),
FUNCTION(dap2), FUNCTION(dap2),
@ -1638,6 +1639,7 @@ static struct tegra_function tegra124_functions[] = {
FUNCTION(displaya_alt), FUNCTION(displaya_alt),
FUNCTION(displayb), FUNCTION(displayb),
FUNCTION(dp), FUNCTION(dp),
FUNCTION(dsi_b),
FUNCTION(dtv), FUNCTION(dtv),
FUNCTION(extperiph1), FUNCTION(extperiph1),
FUNCTION(extperiph2), FUNCTION(extperiph2),
@ -1707,15 +1709,15 @@ static struct tegra_function tegra124_functions[] = {
FUNCTION(vi_alt3), FUNCTION(vi_alt3),
FUNCTION(vimclk2), FUNCTION(vimclk2),
FUNCTION(vimclk2_alt), FUNCTION(vimclk2_alt),
FUNCTION(csi),
FUNCTION(dsi_b),
}; };
#define DRV_PINGROUP_REG_A 0x868 /* bank 0 */ #define DRV_PINGROUP_REG_A 0x868 /* bank 0 */
#define PINGROUP_REG_A 0x3000 /* bank 1 */ #define PINGROUP_REG_A 0x3000 /* bank 1 */
#define MIPI_PAD_CTRL_PINGROUP_REG_A 0x820 /* bank 2 */ #define MIPI_PAD_CTRL_PINGROUP_REG_A 0x820 /* bank 2 */
#define DRV_PINGROUP_REG(r) ((r) - DRV_PINGROUP_REG_A)
#define PINGROUP_REG(r) ((r) - PINGROUP_REG_A) #define PINGROUP_REG(r) ((r) - PINGROUP_REG_A)
#define MIPI_PAD_CTRL_PINGROUP_REG_Y(r) ((r) - MIPI_PAD_CTRL_PINGROUP_REG_A)
#define PINGROUP_BIT_Y(b) (b) #define PINGROUP_BIT_Y(b) (b)
#define PINGROUP_BIT_N(b) (-1) #define PINGROUP_BIT_N(b) (-1)
@ -1740,20 +1742,17 @@ static struct tegra_function tegra124_functions[] = {
.tri_reg = PINGROUP_REG(r), \ .tri_reg = PINGROUP_REG(r), \
.tri_bank = 1, \ .tri_bank = 1, \
.tri_bit = 4, \ .tri_bit = 4, \
.einput_bit = PINGROUP_BIT_Y(5), \ .einput_bit = 5, \
.odrain_bit = PINGROUP_BIT_##od(6), \ .odrain_bit = PINGROUP_BIT_##od(6), \
.lock_bit = PINGROUP_BIT_Y(7), \ .lock_bit = 7, \
.ioreset_bit = PINGROUP_BIT_##ior(8), \ .ioreset_bit = PINGROUP_BIT_##ior(8), \
.rcv_sel_bit = PINGROUP_BIT_##rcv_sel(9), \ .rcv_sel_bit = PINGROUP_BIT_##rcv_sel(9), \
.drv_reg = -1, \ .drv_reg = -1, \
} }
#define DRV_PINGROUP_REG(r) ((r) - DRV_PINGROUP_REG_A) #define DRV_PINGROUP(pg_name, r, hsm_b, schmitt_b, lpmd_b, drvdn_b, \
drvdn_w, drvup_b, drvup_w, slwr_b, slwr_w, \
#define DRV_PINGROUP(pg_name, r, hsm_b, schmitt_b, lpmd_b, \ slwf_b, slwf_w, drvtype) \
drvdn_b, drvdn_w, drvup_b, drvup_w, \
slwr_b, slwr_w, slwf_b, slwf_w, \
drvtype) \
{ \ { \
.name = "drive_" #pg_name, \ .name = "drive_" #pg_name, \
.pins = drive_##pg_name##_pins, \ .pins = drive_##pg_name##_pins, \
@ -1782,8 +1781,6 @@ static struct tegra_function tegra124_functions[] = {
.drvtype_bit = PINGROUP_BIT_##drvtype(6), \ .drvtype_bit = PINGROUP_BIT_##drvtype(6), \
} }
#define MIPI_PAD_CTRL_PINGROUP_REG_Y(r) ((r) - MIPI_PAD_CTRL_PINGROUP_REG_A)
#define MIPI_PAD_CTRL_PINGROUP(pg_name, r, b, f0, f1) \ #define MIPI_PAD_CTRL_PINGROUP(pg_name, r, b, f0, f1) \
{ \ { \
.name = "mipi_pad_ctrl_" #pg_name, \ .name = "mipi_pad_ctrl_" #pg_name, \
@ -2044,8 +2041,8 @@ static const struct tegra_pingroup tegra124_groups[] = {
DRV_PINGROUP(sdio4, 0x9c4, 2, 3, 4, 12, 5, 20, 5, 28, 2, 30, 2, N), DRV_PINGROUP(sdio4, 0x9c4, 2, 3, 4, 12, 5, 20, 5, 28, 2, 30, 2, N),
DRV_PINGROUP(ao4, 0x9c8, 2, 3, 4, 12, 7, 20, 7, 28, 2, 30, 2, Y), DRV_PINGROUP(ao4, 0x9c8, 2, 3, 4, 12, 7, 20, 7, 28, 2, 30, 2, Y),
/* pg_name, r b f0, f1 */ /* pg_name, r, b, f0, f1 */
MIPI_PAD_CTRL_PINGROUP(dsi_b, 0x820, 1, CSI, DSI_B) MIPI_PAD_CTRL_PINGROUP(dsi_b, 0x820, 1, CSI, DSI_B),
}; };
static const struct tegra_pinctrl_soc_data tegra124_pinctrl = { static const struct tegra_pinctrl_soc_data tegra124_pinctrl = {

13
drivers/pinctrl/pinctrl-tegra30.c
View File

@ -2108,6 +2108,7 @@ static struct tegra_function tegra30_functions[] = {
#define DRV_PINGROUP_REG_A 0x868 /* bank 0 */ #define DRV_PINGROUP_REG_A 0x868 /* bank 0 */
#define PINGROUP_REG_A 0x3000 /* bank 1 */ #define PINGROUP_REG_A 0x3000 /* bank 1 */
#define DRV_PINGROUP_REG(r) ((r) - DRV_PINGROUP_REG_A)
#define PINGROUP_REG(r) ((r) - PINGROUP_REG_A) #define PINGROUP_REG(r) ((r) - PINGROUP_REG_A)
#define PINGROUP_BIT_Y(b) (b) #define PINGROUP_BIT_Y(b) (b)
@ -2133,19 +2134,17 @@ static struct tegra_function tegra30_functions[] = {
.tri_reg = PINGROUP_REG(r), \ .tri_reg = PINGROUP_REG(r), \
.tri_bank = 1, \ .tri_bank = 1, \
.tri_bit = 4, \ .tri_bit = 4, \
.einput_bit = PINGROUP_BIT_Y(5), \ .einput_bit = 5, \
.odrain_bit = PINGROUP_BIT_##od(6), \ .odrain_bit = PINGROUP_BIT_##od(6), \
.lock_bit = PINGROUP_BIT_Y(7), \ .lock_bit = 7, \
.ioreset_bit = PINGROUP_BIT_##ior(8), \ .ioreset_bit = PINGROUP_BIT_##ior(8), \
.rcv_sel_bit = -1, \ .rcv_sel_bit = -1, \
.drv_reg = -1, \ .drv_reg = -1, \
} }
#define DRV_PINGROUP_REG(r) ((r) - DRV_PINGROUP_REG_A) #define DRV_PINGROUP(pg_name, r, hsm_b, schmitt_b, lpmd_b, drvdn_b, \
drvdn_w, drvup_b, drvup_w, slwr_b, slwr_w, \
#define DRV_PINGROUP(pg_name, r, hsm_b, schmitt_b, lpmd_b, \ slwf_b, slwf_w) \
drvdn_b, drvdn_w, drvup_b, drvup_w, \
slwr_b, slwr_w, slwf_b, slwf_w) \
{ \ { \
.name = "drive_" #pg_name, \ .name = "drive_" #pg_name, \
.pins = drive_##pg_name##_pins, \ .pins = drive_##pg_name##_pins, \