ARM: tegra: pinmux/colibri_t20: fix nand pinmux

Fix FUNCMUX_NDFLASH_KBC_8_BIT and pingroup ATC clashing.

Please note that the first patch has already been submitted once but based on feedback from Stephen I now split it up into a generic fix part plus a board specific ATC pingroup clashing workaround. That's why I call this series already v2 to avoid any confusion.

Lucas Stach (1):
tegra: pinmux: fix FUNCMUX_NDFLASH_KBC_8_BIT

Marcel Ziswiler (1):
ARM: tegra: colibri_t20: fix nand pinmux

 arch/arm/mach-tegra/tegra20/funcmux.c   | 2 ++
 board/toradex/colibri_t20/colibri_t20.c | 6 ++++++
 2 files changed, 8 insertions(+)

1.9.3

From: Lucas Stach <[email protected]>

Even the 8-bit case needs KBCB configured, as pin D7 is located in this pingroup.

Please note that pingroup ATC seems to come out of reset with its config set to NAND so one needs to explicitly configure some other function to this group in order to avoid clashing settings which is outside the scope of this patch.

---
changes in v2:
- based on Stephen's feedback moved ATC pingroup clashing workaround into separate board specific patch

 arch/arm/mach-tegra/tegra20/funcmux.c | 2 ++
 1 file changed, 2 insertions(+)

index 0df4a07..44a85c5 100644
@@ -252,12 +252,14 @@ 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);

1.9.3

Pingroup ATC seems to come out of reset with config set to NAND, so we need to explicitly configure some other function to this group in order to avoid clashing settings.

---
 board/toradex/colibri_t20/colibri_t20.c | 6 ++++++
 1 file changed, 6 insertions(+)

index 5d8bdec..8ae9ccf 100644
@@ -27,6 +27,12 @@ void pin_mux_mmc(void)
 void pin_mux_nand(void)
 {
 	funcmux_select(PERIPH_ID_NDFLASH, 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);
 }
 #endif
 

1.9.3

The series,

Marcel,

This series applied to u-boot-tegra/next. I'll push an update today or tomorrow to Denx.de.

Tom

-----------------------------------------------------------------------------------
This email message is for the sole use of the intended recipient(s) and may contain confidential information. Any unauthorized review, use, disclosure or distribution is prohibited. If you are not the intended recipient, please contact the sender by reply email and destroy all copies of the original message.
-----------------------------------------------------------------------------------

Very good. Thanks!

Do you happen to know about the plans for my remaining three patches?

http://article.gmane.org/gmane.comp.boot-loaders.u-boot/216038

http://thread.gmane.org/gmane.comp.boot-loaders.u-boot/216039

http://thread.gmane.org/gmane.comp.boot-loaders.u-boot/216040

Sorry, I just noticed they already made it in there as well.

Thank you very much, Tom.