tegra: add funcmux entry for NAND attached to KBC

Secondary config for the Flash attachment.

Signed-off-by: Lucas Stach <dev@lynxeye.de>
Acked-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Tom Warren <twarren@nvidia.com>

diff --git a/arch/arm/cpu/tegra20-common/funcmux.c b/arch/arm/cpu/tegra20-common/funcmux.c
index b2129adf2fec76da8cc0072583da09cbe645f636..00b8029ebad252be08d43916ba37592ac9f87897 100644 (file)
--- a/arch/arm/cpu/tegra20-common/funcmux.c
+++ b/arch/arm/cpu/tegra20-common/funcmux.c
@@ -235,9 +235,26 @@ int funcmux_select(enum periph_id id, int config)
                break;
 
        case PERIPH_ID_NDFLASH:
-               if (config == FUNCMUX_NDFLASH_ATC) {
+               switch (config) {
+               case FUNCMUX_NDFLASH_ATC:
                        pinmux_set_func(PINGRP_ATC, PMUX_FUNC_NAND);
                        pinmux_tristate_disable(PINGRP_ATC);
+                       break;
+               case FUNCMUX_NDFLASH_KBC_8_BIT:
+                       pinmux_set_func(PINGRP_KBCA, PMUX_FUNC_NAND);
+                       pinmux_set_func(PINGRP_KBCC, PMUX_FUNC_NAND);
+                       pinmux_set_func(PINGRP_KBCD, PMUX_FUNC_NAND);
+                       pinmux_set_func(PINGRP_KBCE, PMUX_FUNC_NAND);
+                       pinmux_set_func(PINGRP_KBCF, PMUX_FUNC_NAND);
+
+                       pinmux_tristate_disable(PINGRP_KBCA);
+                       pinmux_tristate_disable(PINGRP_KBCC);
+                       pinmux_tristate_disable(PINGRP_KBCD);
+                       pinmux_tristate_disable(PINGRP_KBCE);
+                       pinmux_tristate_disable(PINGRP_KBCF);
+
+                       bad_config = 0;
+                       break;
                }
                break;
 

diff --git a/arch/arm/include/asm/arch-tegra20/funcmux.h b/arch/arm/include/asm/arch-tegra20/funcmux.h
index bd511db8532d5d157a9e4dbf440109998a3d3ea9..c986b93b40a03ebacdb54f968d313f020038a3a9 100644 (file)
--- a/arch/arm/include/asm/arch-tegra20/funcmux.h
+++ b/arch/arm/include/asm/arch-tegra20/funcmux.h
@@ -60,6 +60,7 @@ enum {
 
        /* NAND flags */
        FUNCMUX_NDFLASH_ATC = 0,
+       FUNCMUX_NDFLASH_KBC_8_BIT,
 };
 
 /**