|
@@ -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>
|
|
@@ -189,15 +188,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 */ },
|
|
|
};
|
|
|
|