From 4c6d92b3cd05e08452ecb2480c49dd9109ba788a Mon Sep 17 00:00:00 2001 From: Linus Walleij Date: Wed, 7 Aug 2013 10:41:16 +0200 Subject: [PATCH] ARM: nomadik: delete MMCI platform data 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 --- arch/arm/mach-nomadik/cpu-8815.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/arch/arm/mach-nomadik/cpu-8815.c b/arch/arm/mach-nomadik/cpu-8815.c index 13e0df9..7a00506 100644 --- a/arch/arm/mach-nomadik/cpu-8815.c +++ b/arch/arm/mach-nomadik/cpu-8815.c @@ -33,7 +33,6 @@ #include #include #include -#include #include #include @@ -190,15 +189,6 @@ static int __init cpu8815_eth_init(void) 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 * on this board. */ @@ -232,13 +222,10 @@ static int __init cpu8815_mmcsd_init(void) } device_initcall(cpu8815_mmcsd_init); - -/* These are mostly to get the right device names for the clock lookups */ +/* This still waits for a device tree enablement patch */ static struct of_dev_auxdata cpu8815_auxdata_lookup[] __initdata = { OF_DEV_AUXDATA("stericsson,fsmc-nand", NOMADIK_FSMC_BASE, NULL, &cpu8815_nand_data), - OF_DEV_AUXDATA("arm,primecell", NOMADIK_SDI_BASE, - NULL, &mmcsd_plat_data), { /* sentinel */ }, }; -- 2.7.4