summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-nomadik
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2013-08-07 10:41:16 +0200
committerLinus Walleij <linus.walleij@linaro.org>2013-09-24 21:25:19 +0200
commit4c6d92b3cd05e08452ecb2480c49dd9109ba788a (patch)
tree0b9f6404e892cf4b886902cb18580565c6c88002 /arch/arm/mach-nomadik
parentd9f37d9e6af8a6477e36f2686a1a9a09d9b3cacf (diff)
downloadop-kernel-dev-4c6d92b3cd05e08452ecb2480c49dd9109ba788a.zip
op-kernel-dev-4c6d92b3cd05e08452ecb2480c49dd9109ba788a.tar.gz
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')
-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 13e0df9..7a00506 100644
--- a/arch/arm/mach-nomadik/cpu-8815.c
+++ b/arch/arm/mach-nomadik/cpu-8815.c
@@ -33,7 +33,6 @@
#include <linux/of_platform.h>
#include <linux/mtd/fsmc.h>
#include <linux/gpio.h>
-#include <linux/amba/mmci.h>
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
@@ -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 */ },
};
OpenPOWER on IntegriCloud