Tegra114: pinmux: Fix bad CAM_MCLK func 3 table entry
Subsystems (2)
PATCH 1/1 Tegra114: pinmux: Fix bad CAM_MCLK func 3 table entry
This caused CAM_MCLK's pinmux reg to be locked out, since the table parsing code couldn't find a matching entry for VI_ALT3 and wrote garbage to the register.
--- arch/arm/cpu/tegra114-common/pinmux.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
arch/arm/cpu/tegra114-common/pinmux.c +1 -1
@@ -239,7 +239,7 @@ const struct tegra_pingroup_desc tegra_soc_pingroups[PINGRP_COUNT] = {PINI (SDMMC4_DAT6 ,SDMMC4 ,SDMMC4 ,SPI3 ,GMI ,RSVD4 ),PINI (SDMMC4_DAT7 ,SDMMC4 ,SDMMC4 ,RSVD2 ,GMI ,RSVD4 ),PIN_RESERVED ,/* Reserved by t114: 0x3280 */ -PINI (CAM_MCLK ,CAM ,VI ,VI_ALT1 ,VI_ALT2 ,RSVD4 ), +PINI (CAM_MCLK ,CAM ,VI ,VI_ALT1 ,VI_ALT3 ,RSVD4 ),PINI (GPIO_PCC1 ,CAM ,I2S4 ,RSVD2 ,RSVD3 ,RSVD4 ),PINI (GPIO_PBB0 ,CAM ,I2S4 ,VI ,VI_ALT1 ,VI_ALT3 ), PINI(CAM_I2C_SCL, CAM, VGP1, I2C3, RSVD3, RSVD4),
Signature · 1 line
1.7.0.4
PATCH 1/1 Tegra114: pinmux: Fix bad CAM_MCLK func 3 table entry
arch/arm/cpu/tegra114-common/pinmux.c const struct tegra_pingroup_desc tegra_soc_pingroups[PINGRP_COUNT] = { · line 240
Quoted 10 lines · Tom Warren
This caused CAM_MCLK's pinmux reg to be locked out, since the table parsing code couldn't find a matching entry for
VI_ALT3and wrote garbage to the register.arch/arm/cpu/tegra114-common/pinmux.c +1
-1@@ -239,7 +239,7 @@ const struct tegra_pingroup_desc tegra_soc_pingroups[PINGRP_COUNT] = { - PINI(CAM_MCLK, CAM, VI, VI_ALT1, VI_ALT2, RSVD4), + PINI(CAM_MCLK, CAM, VI, VI_ALT1, VI_ALT3, RSVD4),
This doesn't seem right; the "alt" settings should be assigned in order non-alt, alt1, alt2, alt3.
You say, "the table parsing code couldn't find a matching entry for VI_ALT3". What was looking for that entry?
Also, shouldn't the pinmux driver be fixed not to write garbage to a register, but instead return an error, if it can't find the table entry it's looking for?
PATCH 1/1 Tegra114: pinmux: Fix bad CAM_MCLK func 3 table entry
Quoted 7 lines · Stephen Warren
Quoted 5 lines · Tom Warren
This caused CAM_MCLK's pinmux reg to be locked out, since the table parsing code couldn't find a matching entry for
VI_ALT3and wrote garbage to the register.arch/arm/cpu/tegra114-common/pinmux.c +0
-0
Quoted 7 lines
arch/arm/cpu/tegra114-common/pinmux.c const struct tegra_pingroup_desc tegra_soc_pingroups[PINGRP_COUNT] = { · line 240
Quoted 4 lines
arch/arm/cpu/tegra114-common/pinmux.c +1
-1@@ -239,7 +239,7 @@ const struct tegra_pingroup_desc tegra_soc_pingroups[PINGRP_COUNT] = { - PINI(CAM_MCLK, CAM, VI, VI_ALT1, VI_ALT2, RSVD4), + PINI(CAM_MCLK, CAM, VI, VI_ALT1, VI_ALT3, RSVD4),This doesn't seem right; the "alt" settings should be assigned in order non-alt, alt1, alt2, alt3.
According to the TRM, CAM_MCLK takes the following 4 possible mux settings:
0 = VI
1 = VI_ALT1
2 = VI_ALT3
3 = RSVD3
There is no VI_ALT2 in the Tegra114 TRM. There was in the T30 TRM.
Quoted 3 lines
You say, "the table parsing code couldn't find a matching entry for
VI_ALT3". What was looking for that entry?
The pinmux table entry in board/nvidia/dalmore/pinmux-config-dalmore.h, table tegra114_pinmux_common[], VI_PINMUX(CAM_MCLK, VI_ALT3, ...), which is parsed by pinmux_config_pingroup in pinmux.c.
Quoted 4 lines
Also, shouldn't the pinmux driver be fixed not to write garbage to a register, but instead return an error, if it can't find the table entry it's looking for?
There's an assert if the mux isn't found - I thought that would handle it, but it appears that it will only if DEBUG is enabled. I'll add more error checking to the code - I have a pinmux.c/pinmux.h update coming for other problems I found while chasing this down.
Tom
PATCH 1/1 Tegra114: pinmux: Fix bad CAM_MCLK func 3 table entry
Quoted 16 lines · Tom Warren
Quoted 7 lines · Stephen Warren
Quoted 5 lines · Tom Warren
This caused CAM_MCLK's pinmux reg to be locked out, since the table parsing code couldn't find a matching entry for
VI_ALT3and wrote garbage to the register.arch/arm/cpu/tegra114-common/pinmux.c +0
-0Quoted 7 lines
arch/arm/cpu/tegra114-common/pinmux.c const struct tegra_pingroup_desc tegra_soc_pingroups[PINGRP_COUNT] = { · line 240
Quoted 4 lines
arch/arm/cpu/tegra114-common/pinmux.c +1
-1@@ -239,7 +239,7 @@ const struct tegra_pingroup_desc tegra_soc_pingroups[PINGRP_COUNT] = { - PINI(CAM_MCLK, CAM, VI, VI_ALT1, VI_ALT2, RSVD4), + PINI(CAM_MCLK, CAM, VI, VI_ALT1, VI_ALT3, RSVD4),This doesn't seem right; the "alt" settings should be assigned in order non-alt, alt1, alt2, alt3.
Quoted 8 lines
According to the TRM,
CAM_MCLKtakes the following 4 possible mux settings:0 = VI
1 =VI_ALT1
2 =VI_ALT3
3 = RSVD3There is no
VI_ALT2in the Tegra114 TRM. There was in the T30 TRM.
Uggh, yes. The TRM is screwed up. Best to match it though I suppose.
So, the change is fine, and ends up matching the kernel's pinmux table too. It might be a good idea to check for any other diffs.