|
@@ -266,31 +266,6 @@ static struct physmap_flash_data sx1_flash_data = {
|
|
.nr_parts = ARRAY_SIZE(sx1_partitions),
|
|
.nr_parts = ARRAY_SIZE(sx1_partitions),
|
|
};
|
|
};
|
|
|
|
|
|
-#ifdef CONFIG_SX1_OLD_FLASH
|
|
|
|
-/* MTD Intel StrataFlash - old flashes */
|
|
|
|
-static struct resource sx1_old_flash_resource[] = {
|
|
|
|
- [0] = {
|
|
|
|
- .start = OMAP_CS0_PHYS, /* Physical */
|
|
|
|
- .end = OMAP_CS0_PHYS + SZ_16M - 1,,
|
|
|
|
- .flags = IORESOURCE_MEM,
|
|
|
|
- },
|
|
|
|
- [1] = {
|
|
|
|
- .start = OMAP_CS1_PHYS,
|
|
|
|
- .end = OMAP_CS1_PHYS + SZ_8M - 1,
|
|
|
|
- .flags = IORESOURCE_MEM,
|
|
|
|
- },
|
|
|
|
-};
|
|
|
|
-
|
|
|
|
-static struct platform_device sx1_flash_device = {
|
|
|
|
- .name = "physmap-flash",
|
|
|
|
- .id = 0,
|
|
|
|
- .dev = {
|
|
|
|
- .platform_data = &sx1_flash_data,
|
|
|
|
- },
|
|
|
|
- .num_resources = 2,
|
|
|
|
- .resource = &sx1_old_flash_resource,
|
|
|
|
-};
|
|
|
|
-#else
|
|
|
|
/* MTD Intel 4000 flash - new flashes */
|
|
/* MTD Intel 4000 flash - new flashes */
|
|
static struct resource sx1_new_flash_resource = {
|
|
static struct resource sx1_new_flash_resource = {
|
|
.start = OMAP_CS0_PHYS,
|
|
.start = OMAP_CS0_PHYS,
|
|
@@ -307,7 +282,6 @@ static struct platform_device sx1_flash_device = {
|
|
.num_resources = 1,
|
|
.num_resources = 1,
|
|
.resource = &sx1_new_flash_resource,
|
|
.resource = &sx1_new_flash_resource,
|
|
};
|
|
};
|
|
-#endif
|
|
|
|
|
|
|
|
/*----------- USB -------------------------*/
|
|
/*----------- USB -------------------------*/
|
|
|
|
|