From 14547f064155f9d94e7799df2657372799ccc457 Mon Sep 17 00:00:00 2001
From: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Date: Tue, 8 Jan 2013 16:34:38 +0100
Subject: colibri_t30: get rid of obsolete NAND handling

Get rid of obsolete NAND aka Colibri T30 v1.0a prototype handling.
---
 arch/arm/configs/colibri_t30_defconfig  | 10 -----
 arch/arm/mach-tegra/board-colibri_t30.c | 74 ---------------------------------
 2 files changed, 84 deletions(-)

(limited to 'arch/arm')

diff --git a/arch/arm/configs/colibri_t30_defconfig b/arch/arm/configs/colibri_t30_defconfig
index e2a49273d8f1..6e631d3b94ad 100644
--- a/arch/arm/configs/colibri_t30_defconfig
+++ b/arch/arm/configs/colibri_t30_defconfig
@@ -151,13 +151,6 @@ CONFIG_MAC80211=y
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
 # CONFIG_FIRMWARE_IN_KERNEL is not set
-CONFIG_MTD=y
-CONFIG_MTD_CMDLINE_PARTS=y
-CONFIG_MTD_CHAR=y
-CONFIG_MTD_BLOCK=y
-CONFIG_MTD_NAND_TEGRA=y
-CONFIG_MTD_NAND=y
-CONFIG_MTD_UBI=y
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_MISC_DEVICES=y
 CONFIG_UID_STAT=y
@@ -322,9 +315,6 @@ CONFIG_VFAT_FS=y
 CONFIG_NTFS_FS=m
 CONFIG_NTFS_RW=y
 CONFIG_TMPFS=y
-CONFIG_YAFFS_FS=y
-CONFIG_YAFFS_DISABLE_TAGS_ECC=y
-CONFIG_UBIFS_FS=y
 CONFIG_NFS_FS=y
 CONFIG_NFS_V3=y
 CONFIG_NFS_V3_ACL=y
diff --git a/arch/arm/mach-tegra/board-colibri_t30.c b/arch/arm/mach-tegra/board-colibri_t30.c
index 0a742a14f8d4..471bad11fbf4 100644
--- a/arch/arm/mach-tegra/board-colibri_t30.c
+++ b/arch/arm/mach-tegra/board-colibri_t30.c
@@ -317,77 +317,6 @@ static void __init colibri_t30_sdhci_init(void)
 #endif
 }
 
-#ifdef COLIBRI_T30_V10
-/* NAND */
-
-#if defined(CONFIG_MTD_NAND_TEGRA)
-static struct resource nand_resources[] = {
-	[0] = {
-		.start	= INT_NANDFLASH,
-		.end	= INT_NANDFLASH,
-		.flags	= IORESOURCE_IRQ
-	},
-	[1] = {
-		.start	= TEGRA_NAND_BASE,
-		.end	= TEGRA_NAND_BASE + TEGRA_NAND_SIZE - 1,
-		.flags	= IORESOURCE_MEM
-	}
-};
-
-static struct tegra_nand_chip_parms nand_chip_parms[] = {
-	/* Micron MT29F16G08CBACA */
-	[0] = {
-		.vendor_id		= 0x2c,
-		.device_id		= 0x48,
-		.read_id_fourth_byte	= 0x4a,
-		.capacity		= 2048,
-		.timing = {
-			/* mode 4 */
-			.trp		= 12,
-			.trh		= 10,	/* tREH */
-			.twp		= 12,
-			.twh		= 10,
-			.tcs		= 20,	/* Max(tCS, tCH, tALS, tALH) */
-			.twhr		= 60,
-			.tcr_tar_trr	= 20,	/* Max(tCR, tAR, tRR) */
-			.twb		= 100,
-			.trp_resp	= 12,	/* tRP */
-			.tadl		= 70,
-		},
-	},
-};
-
-static struct tegra_nand_platform nand_data = {
-	.max_chips	= 8,
-	.chip_parms	= nand_chip_parms,
-	.nr_chip_parms  = ARRAY_SIZE(nand_chip_parms),
-};
-
-static struct platform_device tegra_nand_device = {
-	.name          = "tegra_nand",
-	.id            = -1,
-	.resource      = nand_resources,
-	.num_resources = ARRAY_SIZE(nand_resources),
-	.dev = {
-		.platform_data = &nand_data,
-	},
-};
-
-static void __init colibri_t30_nand_init(void)
-{
-	/* eMMC vs. NAND flash detection */
-	tegra_gpio_enable(EMMC_DETECT);
-	if (!gpio_get_value(EMMC_DETECT)) {
-		pr_info("Detected NAND flash variant, registering controller driver.\n");
-		platform_device_register(&tegra_nand_device);
-	}
-	tegra_gpio_disable(EMMC_DETECT);
-}
-#else /* CONFIG_MTD_NAND_TEGRA */
-static inline void colibri_t30_nand_init(void) {}
-#endif /* CONFIG_MTD_NAND_TEGRA */
-#endif /* COLIBRI_T30_V10 */
-
 /* RTC */
 
 #if defined(CONFIG_RTC_DRV_TEGRA)
@@ -887,9 +816,6 @@ static void __init colibri_t30_init(void)
 	colibri_t30_panel_init();
 //	colibri_t30_sensors_init();
 	colibri_t30_emc_init();
-#ifdef COLIBRI_T30_V10
-	colibri_t30_nand_init();
-#endif
 	colibri_t30_register_spidev();
 
 	tegra_release_bootloader_fb();
-- 
cgit v1.2.3