aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-nomadik/cpu-8815.c
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2013-08-07 04:41:16 -0400
committerLinus Walleij <linus.walleij@linaro.org>2013-09-24 15:25:19 -0400
commit4c6d92b3cd05e08452ecb2480c49dd9109ba788a (patch)
tree0b9f6404e892cf4b886902cb18580565c6c88002 /arch/arm/mach-nomadik/cpu-8815.c
parentd9f37d9e6af8a6477e36f2686a1a9a09d9b3cacf (diff)
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 <linus.walleij@linaro.org>
Diffstat (limited to 'arch/arm/mach-nomadik/cpu-8815.c')
-rw-r--r--arch/arm/mach-nomadik/cpu-8815.c15
1 files changed, 1 insertions, 14 deletions
diff --git a/arch/arm/mach-nomadik/cpu-8815.c b/arch/arm/mach-nomadik/cpu-8815.c
index 13e0df9c11ce..7a00506dc9e1 100644
--- a/arch/arm/mach-nomadik/cpu-8815.c
+++ b/arch/arm/mach-nomadik/cpu-8815.c
@@ -33,7 +33,6 @@
33#include <linux/of_platform.h> 33#include <linux/of_platform.h>
34#include <linux/mtd/fsmc.h> 34#include <linux/mtd/fsmc.h>
35#include <linux/gpio.h> 35#include <linux/gpio.h>
36#include <linux/amba/mmci.h>
37 36
38#include <asm/mach/arch.h> 37#include <asm/mach/arch.h>
39#include <asm/mach/map.h> 38#include <asm/mach/map.h>
@@ -190,15 +189,6 @@ static int __init cpu8815_eth_init(void)
190device_initcall(cpu8815_eth_init); 189device_initcall(cpu8815_eth_init);
191 190
192/* 191/*
193 * TODO:
194 * cannot be set from device tree, convert to a proper DT
195 * binding.
196 */
197static struct mmci_platform_data mmcsd_plat_data = {
198 .ocr_mask = MMC_VDD_29_30,
199};
200
201/*
202 * This GPIO pin turns on a line that is used to detect card insertion 192 * This GPIO pin turns on a line that is used to detect card insertion
203 * on this board. 193 * on this board.
204 */ 194 */
@@ -232,13 +222,10 @@ static int __init cpu8815_mmcsd_init(void)
232} 222}
233device_initcall(cpu8815_mmcsd_init); 223device_initcall(cpu8815_mmcsd_init);
234 224
235 225/* This still waits for a device tree enablement patch */
236/* These are mostly to get the right device names for the clock lookups */
237static struct of_dev_auxdata cpu8815_auxdata_lookup[] __initdata = { 226static struct of_dev_auxdata cpu8815_auxdata_lookup[] __initdata = {
238 OF_DEV_AUXDATA("stericsson,fsmc-nand", NOMADIK_FSMC_BASE, 227 OF_DEV_AUXDATA("stericsson,fsmc-nand", NOMADIK_FSMC_BASE,
239 NULL, &cpu8815_nand_data), 228 NULL, &cpu8815_nand_data),
240 OF_DEV_AUXDATA("arm,primecell", NOMADIK_SDI_BASE,
241 NULL, &mmcsd_plat_data),
242 { /* sentinel */ }, 229 { /* sentinel */ },
243}; 230};
244 231