From 615a177885702bd98c00c27d28fa2e661a58af5b Mon Sep 17 00:00:00 2001 From: Marcel Ziswiler Date: Tue, 4 Dec 2012 22:18:34 +0100 Subject: colibri_t30: NAND: disable NAND on post v1.0a modules Add a commented out define for v1.0a modules with optional NAND variants which are auto detected. --- arch/arm/mach-tegra/board-colibri_t30.c | 4 ++++ arch/arm/mach-tegra/board-colibri_t30.h | 3 +++ 2 files changed, 7 insertions(+) (limited to 'arch/arm') diff --git a/arch/arm/mach-tegra/board-colibri_t30.c b/arch/arm/mach-tegra/board-colibri_t30.c index 54eea22bf4d4..633068aa1bbc 100644 --- a/arch/arm/mach-tegra/board-colibri_t30.c +++ b/arch/arm/mach-tegra/board-colibri_t30.c @@ -287,6 +287,7 @@ static void __init colibri_t30_sdhci_init(void) #endif } +#ifdef COLIBRI_T30_V10 /* NAND */ #if defined(CONFIG_MTD_NAND_TEGRA) @@ -355,6 +356,7 @@ static void __init colibri_t30_nand_init(void) #else /* CONFIG_MTD_NAND_TEGRA */ static inline void colibri_t30_nand_init(void) {} #endif /* CONFIG_MTD_NAND_TEGRA */ +#endif /* COLIBRI_T30_V10 */ /* RTC */ @@ -796,7 +798,9 @@ static void __init colibri_t30_init(void) // colibri_t30_sensors_init(); colibri_t30_pins_state_init(); colibri_t30_emc_init(); +#ifdef COLIBRI_T30_V10 colibri_t30_nand_init(); +#endif tegra_release_bootloader_fb(); #ifdef CONFIG_TEGRA_WDT_RECOVERY tegra_wdt_recovery_init(); diff --git a/arch/arm/mach-tegra/board-colibri_t30.h b/arch/arm/mach-tegra/board-colibri_t30.h index 3faf0593f900..769f4be4db3c 100644 --- a/arch/arm/mach-tegra/board-colibri_t30.h +++ b/arch/arm/mach-tegra/board-colibri_t30.h @@ -57,6 +57,9 @@ /* Uncomment for SD-card on SDMMC4B rather than SDMMC2 */ //#define COLIBRI_T30_SDMMC4B +/* Uncomment for Colibri T30 V1.0a prototypes */ +//#define COLIBRI_T30_V10 + /* Uncomment for camera interface support on Colibri Evaluation carrier board */ //#define COLIBRI_T30_VI -- cgit v1.2.3