Tegra114: Fix/update GP padcfg register struct
Subsystems (2)
PATCH v2 1/1 Tegra114: Fix/update GP padcfg register struct
Differences in padcfg registers (some removed, some added) between Tegra30 and Tegra114 weren't picked up when I first ported this file.
Signed-off-by Tom Warren <[email protected]>
---
v2: Restore old offsets in comments to make diff cleaner
arch/arm/include/asm/arch-tegra114/gp_padctrl.h | 34 +++++++++++++++++----- 1 files changed, 26 insertions(+), 8 deletions(-)
arch/arm/include/asm/arch-tegra114/gp_padctrl.h +26 -8
@@ -27,7 +27,7 @@ struct apb_misc_gp_ctlr {u32 emu_revid;/* 0x60: APB_MISC_GP_EMU_REVID */ u32 xactor_scratch;/* 0x64: APB_MISC_GP_XACTOR_SCRATCH */ u32 aocfg1;/* 0x68: APB_MISC_GP_AOCFG1PADCTRL */ -u32 aocfg2;/* 0x6c: APB_MISC_GP_AOCFG2PADCTRL */ +u32 aocfg2;/* 0x6C: APB_MISC_GP_AOCFG2PADCTRL */ u32 atcfg1;/* 0x70: APB_MISC_GP_ATCFG1PADCTRL */ u32 atcfg2;/* 0x74: APB_MISC_GP_ATCFG2PADCTRL */ u32 atcfg3;/* 0x78: APB_MISC_GP_ATCFG3PADCTRL */
@@ -35,25 +35,43 @@ struct apb_misc_gp_ctlr {u32 atcfg5;/* 0x80: APB_MISC_GP_ATCFG5PADCTRL */ u32 cdev1cfg;/* 0x84: APB_MISC_GP_CDEV1CFGPADCTRL */ u32 cdev2cfg;/* 0x88: APB_MISC_GP_CDEV2CFGPADCTRL */ -u32 csuscfg;/* 0x8C: APB_MISC_GP_CSUSCFGPADCTRL */ +u32 reserved1;/* 0x8C: */ u32 dap1cfg;/* 0x90: APB_MISC_GP_DAP1CFGPADCTRL */ u32 dap2cfg;/* 0x94: APB_MISC_GP_DAP2CFGPADCTRL */ u32 dap3cfg;/* 0x98: APB_MISC_GP_DAP3CFGPADCTRL */ u32 dap4cfg;/* 0x9C: APB_MISC_GP_DAP4CFGPADCTRL */ u32 dbgcfg;/* 0xA0: APB_MISC_GP_DBGCFGPADCTRL */ -u32 lcdcfg1;/* 0xA4: APB_MISC_GP_LCDCFG1PADCTRL */ -u32 lcdcfg2;/* 0xA8: APB_MISC_GP_LCDCFG2PADCTRL */ -u32 sdio2cfg;/* 0xAC: APB_MISC_GP_SDIO2CFGPADCTRL */ +u32 reserved2[3 ];/* 0xA4 - 0xAC: */ u32 sdio3cfg;/* 0xB0: APB_MISC_GP_SDIO3CFGPADCTRL */ u32 spicfg;/* 0xB4: APB_MISC_GP_SPICFGPADCTRL */ u32 uaacfg;/* 0xB8: APB_MISC_GP_UAACFGPADCTRL */ u32 uabcfg;/* 0xBC: APB_MISC_GP_UABCFGPADCTRL */ u32 uart2cfg;/* 0xC0: APB_MISC_GP_UART2CFGPADCTRL */ u32 uart3cfg;/* 0xC4: APB_MISC_GP_UART3CFGPADCTRL */ -u32 vicfg1;/* 0xC8: APB_MISC_GP_VICFG1PADCTRL */ -u32 vivttgen;/* 0xCC: APB_MISC_GP_VIVTTGENPADCTRL */ -u32 reserved1[7 ];/* 0xD0-0xE8: */ +u32 reserved3[9 ];/* 0xC8-0xE8: */ u32 sdio1cfg;/* 0xEC: APB_MISC_GP_SDIO1CFGPADCTRL */ +u32 reserved4[3 ];/* 0xF0-0xF8: */ +u32 ddccfg;/* 0xFC: APB_MISC_GP_DDCCFGPADCTRL */ +u32 gmacfg;/* 0x100: APB_MISC_GP_GMACFGPADCTRL */ +u32 reserved5[3 ];/* 0x104-0x10C: */ +u32 gmecfg;/* 0x110: APB_MISC_GP_GMECFGPADCTRL */ +u32 gmfcfg;/* 0x114: APB_MISC_GP_GMFCFGPADCTRL */ +u32 gmgcfg;/* 0x118: APB_MISC_GP_GMGCFGPADCTRL */ +u32 gmhcfg;/* 0x11C: APB_MISC_GP_GMHCFGPADCTRL */ +u32 owrcfg;/* 0x120: APB_MISC_GP_OWRCFGPADCTRL */ +u32 uadcfg;/* 0x124: APB_MISC_GP_UADCFGPADCTRL */ +u32 reserved6;/* 0x128: */ +u32 dev3cfg;/* 0x12C: APB_MISC_GP_DEV3CFGPADCTRL */ +u32 reserved7[2 ];/* 0x130 - 0x134: */ +u32 ceccfg;/* 0x138: APB_MISC_GP_CECCFGPADCTRL */ +u32 reserved8[22 ];/* 0x13C - 0x190: */ +u32 atcfg6;/* 0x194: APB_MISC_GP_ATCFG6PADCTRL */ +u32 dap5cfg;/* 0x198: APB_MISC_GP_DAP5CFGPADCTRL */ +u32 vbuscfg;/* 0x19C: APB_MISC_GP_USBVBUSENCFGPADCTRL */ +u32 aocfg3;/* 0x1A0: APB_MISC_GP_AOCFG3PADCTRL */ +u32 hvccfg0;/* 0x1A4: APB_MISC_GP_HVCCFG0PADCTRL */ +u32 sdio4cfg;/* 0x1A8: APB_MISC_GP_SDIO4CFGPADCTRL */ + u32 aocfg0; /* 0x1AC: APB_MISC_GP_AOCFG0PADCTRL */ };#endif /* _TEGRA114_GP_PADCTRL_H_ */
Signature · 1 line
1.7.0.4
PATCH v2 1/1 Tegra114: Fix/update GP padcfg register struct
Quoted 2 lines · Tom Warren
Differences in padcfg registers (some removed, some added) between Tegra30 and Tegra114 weren't picked up when I first ported this file.
Reviewed-by Stephen Warren <[email protected]>