Tegra114: pinmux: Update pinmux tables & code, fix a bug w/SDMMC3 init
Subsystems (2)
PATCH 1/1 Tegra114: pinmux: Update pinmux tables & code, fix a bug w/SDMMC3 init
Use the latest tables & code from our internal U-Boot repo. The SDMMC3_CD, CLK_LB_IN and CLK_LB_OUT offsets in the pingroup table were off by a few indices, causing the pinmux init code to write bad data to the PINMUX_AUX_ regs. This also enabled the lock bit, which made it impossible to reconfig the pads correctly for SDMMC3 (SD card on Dalmore) operation. Also fixes SPI_CS2_N, USB_VBUS_EN0, HDMI_CEC and UART2_RXD/TXD muxes.
--- arch/arm/cpu/tegra114-common/pinmux.c | 214 +++++++----- arch/arm/include/asm/arch-tegra114/pinmux.h | 146 ++------ board/nvidia/dalmore/dalmore.c | 3 + board/nvidia/dalmore/pinmux-config-dalmore.h | 463 ++++++++++++++++---------- 4 files changed, 449 insertions(+), 377 deletions(-)
arch/arm/cpu/tegra114-common/pinmux.c +127 -87
@@ -37,6 +37,7 @@ struct tegra_pingroup_desc {#define PMUX_OD_SHIFT 6#define PMUX_LOCK_SHIFT 7#define PMUX_IO_RESET_SHIFT 8 +#define PMUX_RCV_SEL_SHIFT 9/* Convenient macro for defining pin group properties */ #define PIN (pg_name, vdd, f0, f1, f2, f3, iod) \
@@ -58,6 +59,10 @@ struct tegra_pingroup_desc {#define PINO (pg_name, vdd, f0, f1, f2, f3) \ PIN(pg_name, vdd, f0, f1, f2, f3, OUTPUT) +/* A pin group number which is not used */ +#define PIN_RESERVED \ + PIN(NONE, NONE, INVALID, INVALID, INVALID, INVALID, NONE) +const struct tegra_pingroup_desc tegra_soc_pingroups[PINGRP_COUNT ] = {/* NAME VDD f0 f1 f2 f3 */ PINI (ULPI_DATA0 ,BB ,SPI3 ,HSI ,UARTA ,ULPI ),
@@ -84,71 +89,71 @@ const struct tegra_pingroup_desc tegra_soc_pingroups[PINGRP_COUNT] = {PINI (SDMMC1_DAT2 ,SDMMC1 ,SDMMC1 ,PWM0 ,SPI4 ,UARTA ),PINI (SDMMC1_DAT1 ,SDMMC1 ,SDMMC1 ,PWM1 ,SPI4 ,UARTA ),PINI (SDMMC1_DAT0 ,SDMMC1 ,SDMMC1 ,RSVD2 ,SPI4 ,UARTA ), -PINI (GPIO_PV2 ,BB ,RSVD1 ,RSVD2 ,RSVD3 ,RSVD4 ), -PINI (GPIO_PV3 ,BB ,RSVD1 ,RSVD2 ,RSVD3 ,RSVD4 ), +PIN_RESERVED ,/* Reserved by t114: 0x3060 - 0x3064 */ +PIN_RESERVED ,PINI (CLK2_OUT ,SDMMC1 ,EXTPERIPH2 ,RSVD2 ,RSVD3 ,RSVD4 ),PINI (CLK2_REQ ,SDMMC1 ,DAP ,RSVD2 ,RSVD3 ,RSVD4 ), -PINO (LCD_PWR1 ,LCD ,RSVD1 ,RSVD2 ,RSVD3 ,RSVD4 ), -PINO (LCD_PWR2 ,LCD ,RSVD1 ,RSVD2 ,RSVD3 ,RSVD4 ), -PINO (LCD_SDIN ,LCD ,RSVD1 ,RSVD2 ,RSVD3 ,RSVD4 ), -PINO (LCD_SDOUT ,LCD ,RSVD1 ,RSVD2 ,RSVD3 ,RSVD4 ), -PINO (LCD_WR_N ,LCD ,RSVD1 ,RSVD2 ,RSVD3 ,RSVD4 ), -PINO (LCD_CS0_N ,LCD ,RSVD1 ,RSVD2 ,RSVD3 ,RSVD4 ), -PINO (LCD_DC0 ,LCD ,RSVD1 ,RSVD2 ,RSVD3 ,RSVD4 ), -PINO (LCD_SCK ,LCD ,RSVD1 ,RSVD2 ,RSVD3 ,RSVD4 ), -PINO (LCD_PWR0 ,LCD ,RSVD1 ,RSVD2 ,RSVD3 ,RSVD4 ), -PINO (LCD_PCLK ,LCD ,RSVD1 ,RSVD2 ,RSVD3 ,RSVD4 ), -PINO (LCD_DE ,LCD ,RSVD1 ,RSVD2 ,RSVD3 ,RSVD4 ), -PINO (LCD_HSYNC ,LCD ,RSVD1 ,RSVD2 ,RSVD3 ,RSVD4 ), -PINO (LCD_VSYNC ,LCD ,RSVD1 ,RSVD2 ,RSVD3 ,RSVD4 ), -PINO (LCD_D0 ,LCD ,RSVD1 ,RSVD2 ,RSVD3 ,RSVD4 ), -PINO (LCD_D1 ,LCD ,RSVD1 ,RSVD2 ,RSVD3 ,RSVD4 ), -PINO (LCD_D2 ,LCD ,RSVD1 ,RSVD2 ,RSVD3 ,RSVD4 ), -PINO (LCD_D3 ,LCD ,RSVD1 ,RSVD2 ,RSVD3 ,RSVD4 ), -PINO (LCD_D4 ,LCD ,RSVD1 ,RSVD2 ,RSVD3 ,RSVD4 ), -PINO (LCD_D5 ,LCD ,RSVD1 ,RSVD2 ,RSVD3 ,RSVD4 ), -PINO (LCD_D6 ,LCD ,RSVD1 ,RSVD2 ,RSVD3 ,RSVD4 ), -PINO (LCD_D7 ,LCD ,RSVD1 ,RSVD2 ,RSVD3 ,RSVD4 ), -PINO (LCD_D8 ,LCD ,RSVD1 ,RSVD2 ,RSVD3 ,RSVD4 ), -PINO (LCD_D9 ,LCD ,RSVD1 ,RSVD2 ,RSVD3 ,RSVD4 ), -PINO (LCD_D10 ,LCD ,RSVD1 ,RSVD2 ,RSVD3 ,RSVD4 ), -PINO (LCD_D11 ,LCD ,RSVD1 ,RSVD2 ,RSVD3 ,RSVD4 ), -PINO (LCD_D12 ,LCD ,RSVD1 ,RSVD2 ,RSVD3 ,RSVD4 ), -PINO (LCD_D13 ,LCD ,RSVD1 ,RSVD2 ,RSVD3 ,RSVD4 ), -PINO (LCD_D14 ,LCD ,RSVD1 ,RSVD2 ,RSVD3 ,RSVD4 ), -PINO (LCD_D15 ,LCD ,RSVD1 ,RSVD2 ,RSVD3 ,RSVD4 ), -PINO (LCD_D16 ,LCD ,RSVD1 ,RSVD2 ,RSVD3 ,RSVD4 ), -PINO (LCD_D17 ,LCD ,RSVD1 ,RSVD2 ,RSVD3 ,RSVD4 ), -PINO (LCD_D18 ,LCD ,RSVD1 ,RSVD2 ,RSVD3 ,RSVD4 ), -PINO (LCD_D19 ,LCD ,RSVD1 ,RSVD2 ,RSVD3 ,RSVD4 ), -PINO (LCD_D20 ,LCD ,RSVD1 ,RSVD2 ,RSVD3 ,RSVD4 ), -PINO (LCD_D21 ,LCD ,RSVD1 ,RSVD2 ,RSVD3 ,RSVD4 ), -PINO (LCD_D22 ,LCD ,RSVD1 ,RSVD2 ,RSVD3 ,RSVD4 ), -PINO (LCD_D23 ,LCD ,RSVD1 ,RSVD2 ,RSVD3 ,RSVD4 ), -PINO (LCD_CS1_N ,LCD ,RSVD1 ,RSVD2 ,RSVD3 ,RSVD4 ), -PINO (LCD_M1 ,LCD ,RSVD1 ,RSVD2 ,RSVD3 ,RSVD4 ), -PINO (LCD_DC1 ,LCD ,RSVD1 ,RSVD2 ,RSVD3 ,RSVD4 ), +PIN_RESERVED ,/* Reserved by t114: 0x3070 - 0x310c */ +PIN_RESERVED , +PIN_RESERVED , +PIN_RESERVED , +PIN_RESERVED , +PIN_RESERVED , +PIN_RESERVED , +PIN_RESERVED , +PIN_RESERVED , +PIN_RESERVED , +PIN_RESERVED , +PIN_RESERVED , +PIN_RESERVED , +PIN_RESERVED , +PIN_RESERVED , +PIN_RESERVED , +PIN_RESERVED , +PIN_RESERVED , +PIN_RESERVED , +PIN_RESERVED , +PIN_RESERVED , +PIN_RESERVED , +PIN_RESERVED , +PIN_RESERVED , +PIN_RESERVED , +PIN_RESERVED , +PIN_RESERVED , +PIN_RESERVED , +PIN_RESERVED , +PIN_RESERVED , +PIN_RESERVED , +PIN_RESERVED , +PIN_RESERVED , +PIN_RESERVED , +PIN_RESERVED , +PIN_RESERVED , +PIN_RESERVED , +PIN_RESERVED , +PIN_RESERVED , +PIN_RESERVED ,PINI (HDMI_INT ,LCD ,RSVD1 ,RSVD2 ,RSVD3 ,RSVD4 ),PINI (DDC_SCL ,LCD ,I2C4 ,RSVD2 ,RSVD3 ,RSVD4 ),PINI (DDC_SDA ,LCD ,I2C4 ,RSVD2 ,RSVD3 ,RSVD4 ), -PINI (CRT_HSYNC ,LCD ,RSVD1 ,RSVD2 ,RSVD3 ,RSVD4 ), -PINI (CRT_VSYNC ,LCD ,RSVD1 ,RSVD2 ,RSVD3 ,RSVD4 ), -PINI (VI_D0 ,VI ,RSVD1 ,RSVD2 ,RSVD3 ,RSVD4 ), -PINI (VI_D1 ,VI ,RSVD1 ,RSVD2 ,RSVD3 ,RSVD4 ), -PINI (VI_D2 ,VI ,RSVD1 ,RSVD2 ,RSVD3 ,RSVD4 ), -PINI (VI_D3 ,VI ,RSVD1 ,RSVD2 ,RSVD3 ,RSVD4 ), -PINI (VI_D4 ,VI ,RSVD1 ,RSVD2 ,RSVD3 ,RSVD4 ), -PINI (VI_D5 ,VI ,RSVD1 ,RSVD2 ,RSVD3 ,RSVD4 ), -PINI (VI_D6 ,VI ,RSVD1 ,RSVD2 ,RSVD3 ,RSVD4 ), -PINI (VI_D7 ,VI ,RSVD1 ,RSVD2 ,RSVD3 ,RSVD4 ), -PINI (VI_D8 ,VI ,RSVD1 ,RSVD2 ,RSVD3 ,RSVD4 ), -PINI (VI_D9 ,VI ,RSVD1 ,RSVD2 ,RSVD3 ,RSVD4 ), -PINI (VI_D10 ,VI ,RSVD1 ,RSVD2 ,RSVD3 ,RSVD4 ), -PINI (VI_D11 ,VI ,RSVD1 ,RSVD2 ,RSVD3 ,RSVD4 ), -PINI (VI_PCLK ,VI ,RSVD1 ,RSVD2 ,RSVD3 ,RSVD4 ), -PINI (VI_MCLK ,VI ,RSVD1 ,RSVD3 ,RSVD3 ,RSVD4 ), -PINI (VI_VSYNC ,VI ,RSVD1 ,RSVD2 ,RSVD3 ,RSVD4 ), -PINI (VI_HSYNC ,VI ,RSVD1 ,RSVD2 ,RSVD3 ,RSVD4 ), +PIN_RESERVED ,/* Reserved by t114: 0x311c - 0x3160 */ +PIN_RESERVED , +PIN_RESERVED , +PIN_RESERVED , +PIN_RESERVED , +PIN_RESERVED , +PIN_RESERVED , +PIN_RESERVED , +PIN_RESERVED , +PIN_RESERVED , +PIN_RESERVED , +PIN_RESERVED , +PIN_RESERVED , +PIN_RESERVED , +PIN_RESERVED , +PIN_RESERVED , +PIN_RESERVED , +PIN_RESERVED ,PINI (UART2_RXD ,UART ,UARTB ,SPDIF ,UARTA ,SPI4 ),PINI (UART2_TXD ,UART ,UARTB ,SPDIF ,UARTA ,SPI4 ), PINI(UART2_RTS_N, UART, UARTA, UARTB, RSVD3, SPI4),
@@ -220,7 +225,7 @@ const struct tegra_pingroup_desc tegra_soc_pingroups[PINGRP_COUNT] = {PINI (SDMMC4_DAT5 ,SDMMC4 ,SDMMC4 ,SPI3 ,GMI ,RSVD4 ),PINI (SDMMC4_DAT6 ,SDMMC4 ,SDMMC4 ,SPI3 ,GMI ,RSVD4 ),PINI (SDMMC4_DAT7 ,SDMMC4 ,SDMMC4 ,RSVD2 ,GMI ,RSVD4 ), -PINI (SDMMC4_RST_N ,SDMMC4 ,RSVD1 ,RSVD2 ,RSVD3 ,SDMMC4 ), +PIN_RESERVED ,/* Reserved by t114: 0x3280 */ PINI (CAM_MCLK ,CAM ,VI ,VI_ALT1 ,VI_ALT2 ,RSVD4 ),PINI (GPIO_PCC1 ,CAM ,I2S4 ,RSVD2 ,RSVD3 ,RSVD4 ), PINI(GPIO_PBB0, CAM, I2S4, VI, VI_ALT1, VI_ALT3),
@@ -246,11 +251,11 @@ const struct tegra_pingroup_desc tegra_soc_pingroups[PINGRP_COUNT] = {PINI (KB_ROW8 ,SYS ,KBC ,RSVD2 ,RSVD3 ,UARTA ),PINI (KB_ROW9 ,SYS ,KBC ,RSVD2 ,RSVD3 ,UARTA ),PINI (KB_ROW10 ,SYS ,KBC ,RSVD2 ,RSVD3 ,UARTA ), -PINI (KB_ROW11 ,SYS ,RSVD1 ,RSVD2 ,RSVD3 ,RSVD4 ), -PINI (KB_ROW12 ,SYS ,RSVD1 ,RSVD2 ,RSVD3 ,RSVD4 ), -PINI (KB_ROW13 ,SYS ,RSVD1 ,RSVD2 ,RSVD3 ,RSVD4 ), -PINI (KB_ROW14 ,SYS ,RSVD1 ,RSVD2 ,RSVD3 ,RSVD4 ), -PINI (KB_ROW15 ,SYS ,RSVD1 ,RSVD2 ,RSVD3 ,RSVD4 ), +PIN_RESERVED ,/* Reserved by t114: 0x32e8 - 0x32f8 */ +PIN_RESERVED , +PIN_RESERVED , +PIN_RESERVED , +PIN_RESERVED ,PINI (KB_COL0 ,SYS ,KBC ,USB ,SPI2 ,EMC_DLL ),PINI (KB_COL1 ,SYS ,KBC ,RSVD2 ,SPI2 ,EMC_DLL ), PINI(KB_COL2, SYS, KBC, RSVD2, SPI2, RSVD4),
@@ -278,36 +283,46 @@ const struct tegra_pingroup_desc tegra_soc_pingroups[PINGRP_COUNT] = {PINI (DAP2_DIN ,AUDIO ,I2S1 ,HDA ,RSVD3 ,RSVD4 ),PINI (DAP2_DOUT ,AUDIO ,I2S1 ,HDA ,RSVD3 ,RSVD4 ),PINI (DAP2_SCLK ,AUDIO ,I2S1 ,HDA ,RSVD3 ,RSVD4 ), -PINI (SPI2_MOSI ,AUDIO ,SPI6 ,CLDVFS ,RSVD3 ,RSVD4 ), -PINI (SPI2_MISO ,AUDIO ,SPI6 ,RSVD2 ,RSVD3 ,RSVD4 ), -PINI (SPI2_CS0_N ,AUDIO ,SPI6 ,SPI1 ,RSVD3 ,RSVD4 ), -PINI (SPI2_SCK ,AUDIO ,SPI6 ,CLDVFS ,RSVD3 ,RSVD4 ), -PINI (SPI1_MOSI ,AUDIO ,RSVD1 ,SPI1 ,SPI2 ,DAP2 ), -PINI (SPI1_SCK ,AUDIO ,RSVD1 ,SPI1 ,SPI2 ,RSVD4 ), -PINI (SPI1_CS0_N ,AUDIO ,SPI6 ,SPI1 ,SPI2 ,RSVD4 ), -PINI (SPI1_MISO ,AUDIO ,RSVD1 ,SPI1 ,SPI2 ,RSVD4 ), -PINI (SPI2_CS1_N ,AUDIO ,RSVD1 ,RSVD2 ,RSVD3 ,RSVD4 ), -PINI (SPI2_CS2_N ,AUDIO ,RSVD1 ,RSVD2 ,RSVD3 ,RSVD4 ), +PINI (DVFS_PWM ,AUDIO ,SPI6 ,CLDVFS ,RSVD3 ,RSVD4 ), +PINI (GPIO_X1_AUD ,AUDIO ,SPI6 ,RSVD2 ,RSVD3 ,RSVD4 ), +PINI (GPIO_X3_AUD ,AUDIO ,SPI6 ,SPI1 ,RSVD3 ,RSVD4 ), +PINI (DVFS_CLK ,AUDIO ,SPI6 ,CLDVFS ,RSVD3 ,RSVD4 ), +PINI (GPIO_X4_AUD ,AUDIO ,RSVD1 ,SPI1 ,SPI2 ,DAP2 ), +PINI (GPIO_X5_AUD ,AUDIO ,RSVD1 ,SPI1 ,SPI2 ,RSVD4 ), +PINI (GPIO_X6_AUD ,AUDIO ,SPI6 ,SPI1 ,SPI2 ,RSVD4 ), +PINI (GPIO_X7_AUD ,AUDIO ,RSVD1 ,SPI1 ,SPI2 ,RSVD4 ), +PIN_RESERVED ,/* Reserved by t114: 0x3388 - 0x3338c */ +PIN_RESERVED ,PINI (SDMMC3_CLK ,SDMMC3 ,SDMMC3 ,RSVD2 ,RSVD3 ,SPI3 ),PINI (SDMMC3_CMD ,SDMMC3 ,SDMMC3 ,PWM3 ,UARTA ,SPI3 ),PINI (SDMMC3_DAT0 ,SDMMC3 ,SDMMC3 ,RSVD2 ,RSVD3 ,SPI3 ),PINI (SDMMC3_DAT1 ,SDMMC3 ,SDMMC3 ,PWM2 ,UARTA ,SPI3 ),PINI (SDMMC3_DAT2 ,SDMMC3 ,SDMMC3 ,PWM1 ,DISPA ,SPI3 ),PINI (SDMMC3_DAT3 ,SDMMC3 ,SDMMC3 ,PWM0 ,DISPB ,SPI3 ), -PINI (SDMMC3_DAT4 ,SDMMC3 ,RSVD1 ,RSVD2 ,RSVD3 ,RSVD4 ), -PINI (SDMMC3_DAT5 ,SDMMC3 ,RSVD1 ,RSVD2 ,RSVD3 ,RSVD4 ), -PINI (SDMMC3_DAT6 ,SDMMC3 ,RSVD1 ,RSVD2 ,RSVD3 ,RSVD4 ), -PINI (SDMMC3_DAT7 ,SDMMC3 ,RSVD1 ,RSVD2 ,RSVD3 ,RSVD4 ), +PIN_RESERVED ,/* Reserved by t114: 0x33a8 - 0x33dc */ +PIN_RESERVED , +PIN_RESERVED , +PIN_RESERVED , +PIN_RESERVED , +PIN_RESERVED , +PIN_RESERVED , +PIN_RESERVED , +PIN_RESERVED , +PIN_RESERVED , +PIN_RESERVED , +PIN_RESERVED , +PIN_RESERVED , +PIN_RESERVED ,PINI (HDMI_CEC ,SYS ,CEC ,SDMMC3 ,RSVD3 ,SOC ),PINI (SDMMC1_WP_N ,SDMMC1 ,SDMMC1 ,CLK12 ,SPI4 ,UARTA ), -PINI (SDMMC3_CD_N ,SDMMC3 ,SDMMC3 ,OWR ,RSVD3 ,RSVD4 ), -PINI (SPI1_CS1_N ,AUDIO ,SPI6 ,RSVD2 ,SPI2 ,I2C1 ), -PINI (SPI1_CS2_N ,AUDIO ,SPI6 ,SPI1 ,SPI2 ,I2C1 ), -PINI (USB_VBUS_EN0 ,SYS ,USB ,RSVD2 ,RSVD3 ,RSVD4 ), -PINI (USB_VBUS_EN1 ,SYS ,USB ,RSVD2 ,RSVD3 ,RSVD4 ), +PINI (SDMMC3_CD_N ,SYS ,SDMMC3 ,OWR ,RSVD3 ,RSVD4 ), +PINI (GPIO_W2_AUD ,AUDIO ,SPI6 ,RSVD2 ,SPI2 ,I2C1 ), +PINI (GPIO_W3_AUD ,AUDIO ,SPI6 ,SPI1 ,SPI2 ,I2C1 ), +PINI (USB_VBUS_EN0 ,LCD ,USB ,RSVD2 ,RSVD3 ,RSVD4 ), +PINI (USB_VBUS_EN1 ,LCD ,USB ,RSVD2 ,RSVD3 ,RSVD4 ),PINI (SDMMC3_CLK_LB_IN ,SDMMC3 ,SDMMC3 ,RSVD2 ,RSVD3 ,RSVD4 ), -PINO (SDMMC3_CLK_LB_OUT ,SDMMC3 ,SDMMC3 ,RSVD2 ,RSVD3 ,RSVD4 ), -PINO (NAND_GMI_CLK_LB ,GMI ,SDMMC2 ,NAND ,GMI ,RSVD4 ), +PINI (SDMMC3_CLK_LB_OUT ,SDMMC3 ,SDMMC3 ,RSVD2 ,RSVD3 ,RSVD4 ), +PIN_RESERVED ,/* Reserved by t114: 0x3404 */ PINO(RESET_OUT_N, SYS, RSVD1, RSVD2, RSVD3, RESET_OUT_N), };
@@ -484,6 +499,30 @@ static int pinmux_set_ioreset(enum pmux_pingrp pin,return 0 ; } +static int pinmux_set_rcv_sel (enum pmux_pingrp pin, +enum pmux_pin_rcv_sel rcv_sel) +{ +struct pmux_tri_ctlr *pmt = + (struct pmux_tri_ctlr *)NV_PA_APB_MISC_BASE ; +u32 *pin_rcv_sel = &pmt->pmt_ctl[pin]; +u32 reg; + +/* Error check on pin and rcv_sel */ +assert (pmux_pingrp_isvalid (pin)); +assert (pmux_pin_rcv_sel_isvalid (rcv_sel)); + +if (rcv_sel ==PMUX_PIN_RCV_SEL_DEFAULT ) +return 0 ; + + reg =readl (pin_rcv_sel); + reg &= ~(0x1 <<PMUX_RCV_SEL_SHIFT ); +if (rcv_sel ==PMUX_PIN_RCV_SEL_HIGH ) + reg |= (0x1 <<PMUX_RCV_SEL_SHIFT ); +writel (reg, pin_rcv_sel); + +return 0 ; +} +void pinmux_config_pingroup (struct pingroup_config *config) {enum pmux_pingrp pin = config->pingroup;
@@ -495,6 +534,7 @@ void pinmux_config_pingroup(struct pingroup_config *config)pinmux_set_lock (pin, config->lock);pinmux_set_od (pin, config->od);pinmux_set_ioreset (pin, config->ioreset); +pinmux_set_rcv_sel (pin, config->rcv_sel); }void pinmux_config_table (struct pingroup_config *config,int len)
arch/arm/include/asm/arch-tegra114/pinmux.h +36 -110
239 lines not on this page · raw message
board/nvidia/dalmore/dalmore.c +3 -0
@@ -24,6 +24,9 @@*/ void pinmux_init (void ) { +pinmux_config_table (tegra114_pinmux_set_nontristate, +ARRAY_SIZE (tegra114_pinmux_set_nontristate)); +pinmux_config_table (tegra114_pinmux_common,ARRAY_SIZE (tegra114_pinmux_common));
board/nvidia/dalmore/pinmux-config-dalmore.h +283 -180
497 lines not on this page · raw message
Signature · 1 line
1.7.0.4
PATCH 1/1 Tegra114: pinmux: Update pinmux tables & code, fix a bug w/SDMMC3 init
Quoted 7 lines · Tom Warren
Use the latest tables & code from our internal U-Boot repo. The
SDMMC3_CD,CLK_LB_INandCLK_LB_OUToffsets in the pingroup table were off by a few indices, causing the pinmux init code to write bad data to thePINMUX_AUX_regs. This also enabled the lock bit, which made it impossible to reconfig the pads correctly for SDMMC3 (SD card on Dalmore) operation. Also fixesSPI_CS2_N,USB_VBUS_EN0,HDMI_CECand UART2_RXD/TXD muxes.
Partially,
At least the table in pinmux.c:tegra_soc_pingroups matches the kernel's list of pins in terms of pin name and register offsets. I didn't check any other aspect of the changes, but the changes are conceptually fine by me.
It might be nice to validate the entire of the pinmux driver tables and Dalmore configuration against the kernel's drivers/pinctrl/pinctrl-tegra114.c (and arch/arm/boot/dts/tegra114-dalmore.dts once pinctrl nodes are added there) some time.
arch/arm/cpu/tegra114-common/pinmux.c struct tegra_pingroup_desc { · line 66
Quoted 3 lines
arch/arm/cpu/tegra114-common/pinmux.c +0
-0const struct tegra_pingroup_desc tegra_soc_pingroups[PINGRP_COUNT ] = {
FYI, the JTAG_RTCK entry that already exists here isn't in the kernel's driver. That could be simply an oversight in the kernel driver though.
arch/arm/cpu/tegra114-common/pinmux.c const struct tegra_pingroup_desc tegra_soc_pingroups[PINGRP_COUNT] = { · line 294
Quoted 1 line
arch/arm/cpu/tegra114-common/pinmux.c +1
-0+ PIN_RESERVED, /* Reserved by t114: 0x3388 - 0x3338c */
Nit: 0x3338c should be 0x338c.