Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ARM: nomadik: delete MMCI platform data

Browse source 
Now that we have a proper regulator set up for the MMCI driver
and managed through the device tree, we no longer need the
platform data providing the OCR voltages for the MMCI block.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Linus Walleij 2013-08-07 10:41:16 +02:00
parent d9f37d9e6a
commit 4c6d92b3cd
1 changed files with 1 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
arch/arm/mach-nomadik/cpu-8815.c
View file

@ -33,7 +33,6 @@
#include <linux/of_platform.h> #include <linux/of_platform.h>
#include <linux/mtd/fsmc.h> #include <linux/mtd/fsmc.h>
#include <linux/gpio.h> #include <linux/gpio.h>
#include <linux/amba/mmci.h>
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach/map.h> #include <asm/mach/map.h>
@ -189,15 +188,6 @@ static int __init cpu8815_eth_init(void)
} }
device_initcall(cpu8815_eth_init); device_initcall(cpu8815_eth_init);
/*
* TODO:
* cannot be set from device tree, convert to a proper DT
* binding.
*/
static struct mmci_platform_data mmcsd_plat_data = {
.ocr_mask = MMC_VDD_29_30,
};
/* /*
* This GPIO pin turns on a line that is used to detect card insertion * This GPIO pin turns on a line that is used to detect card insertion
* on this board. * on this board.
@ -232,13 +222,10 @@ static int __init cpu8815_mmcsd_init(void)
} }
device_initcall(cpu8815_mmcsd_init); device_initcall(cpu8815_mmcsd_init);
/* This still waits for a device tree enablement patch */
/* These are mostly to get the right device names for the clock lookups */
static struct of_dev_auxdata cpu8815_auxdata_lookup[] __initdata = { static struct of_dev_auxdata cpu8815_auxdata_lookup[] __initdata = {
OF_DEV_AUXDATA("stericsson,fsmc-nand", NOMADIK_FSMC_BASE, OF_DEV_AUXDATA("stericsson,fsmc-nand", NOMADIK_FSMC_BASE,
NULL, &cpu8815_nand_data), NULL, &cpu8815_nand_data),
OF_DEV_AUXDATA("arm,primecell", NOMADIK_SDI_BASE,
NULL, &mmcsd_plat_data),
{ /* sentinel */ }, { /* sentinel */ },
}; };