diff options
| author | Nitin Sehgal <nsehgal@nvidia.com> | 2013-05-28 15:52:04 +0530 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2013-09-14 13:17:30 -0700 |
| commit | e93052e30d217a8816a6fa89a1dcd85fb5764644 (patch) | |
| tree | 49e54436c89635b88d7b57756de370092cdd83b9 /drivers/mtd | |
| parent | 3a8ff444666ea1459d959889a67c12e03f349aff (diff) | |
arm: tegra: gmi: Fix driver dependencies for devices on gmi bus.
- nor mapping driver, pca gmi & sram driver could be selected independently.
- efs & pflash should depend on nor mapping driver.
bug 1294819
Change-Id: I8d201f6aad5ec742ff57d2c11a2507b2bc4f5a8d
Signed-off-by: Nitin Sehgal <nsehgal@nvidia.com>
Reviewed-on: http://git-master/r/235036
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
Diffstat (limited to 'drivers/mtd')
| -rw-r--r-- | drivers/mtd/maps/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/mtd/maps/tegra_nor_gmi.c | 8 |
2 files changed, 6 insertions, 3 deletions
diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig index 1d450f321163..07bdfa6656b9 100644 --- a/drivers/mtd/maps/Kconfig +++ b/drivers/mtd/maps/Kconfig @@ -434,6 +434,7 @@ config MTD_NOR_TEGRA config MTD_NOR_TEGRA_GMI bool "NOR Flash mapping driver for NVIDIA Tegra based Embedded Entertainment boards" depends on MTD_COMPLEX_MAPPINGS && ARCH_TEGRA && MTD_CFI_ADV_OPTIONS + select TEGRA_GMI help This enables access routines for the flash chips on the NVIDIA Tegra based embedded entertainment boards. Supports extended gpio & diff --git a/drivers/mtd/maps/tegra_nor_gmi.c b/drivers/mtd/maps/tegra_nor_gmi.c index 76ef58705e26..a82037d1001c 100644 --- a/drivers/mtd/maps/tegra_nor_gmi.c +++ b/drivers/mtd/maps/tegra_nor_gmi.c @@ -92,7 +92,9 @@ do { \ } while (0) +#if defined(CONFIG_TEGRA_EFS) || defined(CONFIG_TEGRA_PFLASH) static struct map_info_list nor_gmi_map_list; +#endif static inline unsigned long tegra_snor_readl(struct tegra_nor_info *tnor, unsigned long reg) @@ -444,7 +446,7 @@ static int tegra_snor_controller_init(struct tegra_nor_info *info) return 0; } -#ifdef CONFIG_TEGRA_EFS +#if defined(CONFIG_TEGRA_EFS) || defined(CONFIG_TEGRA_PFLASH) struct map_info *get_map_info(unsigned int bank_index) { struct map_info *map = &nor_gmi_map_list.map[bank_index]; @@ -512,7 +514,7 @@ static int flash_probe(struct tegra_nor_info *info) info->concat_mtd->owner = THIS_MODULE; -#ifdef CONFIG_TEGRA_EFS +#if defined(CONFIG_TEGRA_EFS) || defined(CONFIG_TEGRA_PFLASH) nor_gmi_map_list.totalflashsize = size; #endif @@ -707,7 +709,7 @@ static int tegra_nor_probe(struct platform_device *pdev) if (err) goto out_dma_free_coherent; -#ifdef CONFIG_TEGRA_EFS +#if defined(CONFIG_TEGRA_EFS) || defined(CONFIG_TEGRA_PFLASH) nor_gmi_map_list.map = info->map; nor_gmi_map_list.n_maps = info->n_maps; #endif |