diff mbox

[U-Boot] tegra: pinmux: fix FUNCMUX_NDFLASH_KBC_8_BIT

Message ID 1427200154-9975-1-git-send-email-marcel@ziswiler.com
State Superseded
Delegated to: Tom Warren
Headers show

Commit Message

Marcel Ziswiler March 24, 2015, 12:29 p.m. UTC
From: Lucas Stach <dev@lynxeye.de>

Even the 8-bit case needs KBCB configured, as pin D7 is located in this
pingroup. Also pingroup ATC seems to come out of reset with config set
to NAND, so we need to explictly configure some other function to this
group in order to avoid clashing settings.

Signed-off-by: Lucas Stach <dev@lynxeye.de>
Signed-off-by: Marcel Ziswiler <marcel@ziswiler.com>
Tested-by: Marcel Ziswiler <marcel@ziswiler.com>
---
 arch/arm/mach-tegra/tegra20/funcmux.c | 8 ++++++++
 1 file changed, 8 insertions(+)

Comments

Stephen Warren March 24, 2015, 3:21 p.m. UTC | #1
On 03/24/2015 06:29 AM, Marcel Ziswiler wrote:
> From: Lucas Stach <dev@lynxeye.de>
>
> Even the 8-bit case needs KBCB configured, as pin D7 is located in this
> pingroup. Also pingroup ATC seems to come out of reset with config set
> to NAND, so we need to explictly configure some other function to this
> group in order to avoid clashing settings.

I would rather not touch ATC like this; see below.

> diff --git a/arch/arm/mach-tegra/tegra20/funcmux.c b/arch/arm/mach-tegra/tegra20/funcmux.c

Note that this will conflict with:

09f455dca749 ARM: tegra: collect SoC sources into mach-tegra

... which moved that file.

> @@ -252,17 +252,25 @@ int funcmux_select(enum periph_id id, int config)
...
>   		case FUNCMUX_NDFLASH_KBC_8_BIT:
...
> +			/*
> +			 * configure pingroup ATC to something unrelated to
> +			 * avoid ATC overriding KBC
> +			 */
> +			pinmux_set_func(PMUX_PINGRP_ATC, PMUX_FUNC_GMI);

What if ATC is actually used for some purpose other than GMI? This will 
corrupt the pinmux for that pingroup, and prevent the other peripheral 
from working. For example, PERIPH_ID_SDMMC4/FUNCMUX_SDMMC4_ATC_ATD_8BIT 
actively uses ATC, and this change might break it if both are used 
together on one board.

The best approach is to simply not use funcmux at all, but rather 
program the entire pinmux from a table. That guarantees no conflicts. 
Boards using later SoCs take this approach.

Alternatively, have the board code (rather than funcmux) select some 
other value for ATC. This allows the board code to select the exact 
correct value for that pingroup once (thus avoiding multiple changes to 
the pinmux for that pingroup, which could cause glitches), and 
guarantees that the common code will never corrupt that setting.
Marcel Ziswiler March 25, 2015, 7:42 a.m. UTC | #2
On 24 March 2015 16:21:02 CET, Stephen Warren <swarren@wwwdotorg.org> wrote:
>> diff --git a/arch/arm/mach-tegra/tegra20/funcmux.c
>b/arch/arm/mach-tegra/tegra20/funcmux.c
>
>Note that this will conflict with:
>
>09f455dca749 ARM: tegra: collect SoC sources into mach-tegra
>
>... which moved that file.

OK, sorry. Haven't seen that one yet. Will rebase accordingly.

>What if ATC is actually used for some purpose other than GMI? This will
>
>corrupt the pinmux for that pingroup, and prevent the other peripheral 
>from working. For example, PERIPH_ID_SDMMC4/FUNCMUX_SDMMC4_ATC_ATD_8BIT
>
>actively uses ATC, and this change might break it if both are used 
>together on one board.

Yes, agreed.

>The best approach is to simply not use funcmux at all, but rather 
>program the entire pinmux from a table. That guarantees no conflicts. 
>Boards using later SoCs take this approach.

Yes, that one I knew but nobody does on T20 (yet) plus T20 is kind of special due to its pin groups spanning multiple pins and such.

>Alternatively, have the board code (rather than funcmux) select some 
>other value for ATC. This allows the board code to select the exact 
>correct value for that pingroup once (thus avoiding multiple changes to
>
>the pinmux for that pingroup, which could cause glitches), and 
>guarantees that the common code will never corrupt that setting.

That one for sure would work if above table approach proves to be too cumbersome to do.

Thanks Stephen
Marcel Ziswiler March 25, 2015, 5:46 p.m. UTC | #3
On Tue, 2015-03-24 at 09:21 -0600, Stephen Warren wrote:
> > diff --git a/arch/arm/mach-tegra/tegra20/funcmux.c b/arch/arm/mach-tegra/tegra20/funcmux.c
> 
> Note that this will conflict with:
> 
> 09f455dca749 ARM: tegra: collect SoC sources into mach-tegra
> 
> ... which moved that file.

I had another look but believe above mentioned commit actually did the
following:

 arch/arm/cpu/tegra20-common/*       -> arch/arm/mach-tegra/tegra20/*

And my commit was already rebased to latest master and therefore already
took that into account or am I missing something here?
Stephen Warren March 25, 2015, 6:08 p.m. UTC | #4
On 03/25/2015 11:46 AM, Marcel Ziswiler wrote:
> On Tue, 2015-03-24 at 09:21 -0600, Stephen Warren wrote:
>>> diff --git a/arch/arm/mach-tegra/tegra20/funcmux.c b/arch/arm/mach-tegra/tegra20/funcmux.c
>>
>> Note that this will conflict with:
>>
>> 09f455dca749 ARM: tegra: collect SoC sources into mach-tegra
>>
>> ... which moved that file.
>
> I had another look but believe above mentioned commit actually did the
> following:
>
>   arch/arm/cpu/tegra20-common/*       -> arch/arm/mach-tegra/tegra20/*
>
> And my commit was already rebased to latest master and therefore already
> took that into account or am I missing something here?

Yes, I think I got it backwards; I was confused by the Tegra210 file 
having been added in the old location after the move, or something.
diff mbox

Patch

diff --git a/arch/arm/mach-tegra/tegra20/funcmux.c b/arch/arm/mach-tegra/tegra20/funcmux.c
index 0df4a07..f9b6214 100644
--- a/arch/arm/mach-tegra/tegra20/funcmux.c
+++ b/arch/arm/mach-tegra/tegra20/funcmux.c
@@ -252,17 +252,25 @@  int funcmux_select(enum periph_id id, int config)
 			break;
 		case FUNCMUX_NDFLASH_KBC_8_BIT:
 			pinmux_set_func(PMUX_PINGRP_KBCA, PMUX_FUNC_NAND);
+			pinmux_set_func(PMUX_PINGRP_KBCB, PMUX_FUNC_NAND);
 			pinmux_set_func(PMUX_PINGRP_KBCC, PMUX_FUNC_NAND);
 			pinmux_set_func(PMUX_PINGRP_KBCD, PMUX_FUNC_NAND);
 			pinmux_set_func(PMUX_PINGRP_KBCE, PMUX_FUNC_NAND);
 			pinmux_set_func(PMUX_PINGRP_KBCF, PMUX_FUNC_NAND);
 
 			pinmux_tristate_disable(PMUX_PINGRP_KBCA);
+			pinmux_tristate_disable(PMUX_PINGRP_KBCB);
 			pinmux_tristate_disable(PMUX_PINGRP_KBCC);
 			pinmux_tristate_disable(PMUX_PINGRP_KBCD);
 			pinmux_tristate_disable(PMUX_PINGRP_KBCE);
 			pinmux_tristate_disable(PMUX_PINGRP_KBCF);
 
+			/*
+			 * configure pingroup ATC to something unrelated to
+			 * avoid ATC overriding KBC
+			 */
+			pinmux_set_func(PMUX_PINGRP_ATC, PMUX_FUNC_GMI);
+
 			bad_config = 0;
 			break;
 		}