diff options
Diffstat (limited to 'arch/arm/mach-ep93xx/simone.c')
| -rw-r--r-- | arch/arm/mach-ep93xx/simone.c | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/arch/arm/mach-ep93xx/simone.c b/arch/arm/mach-ep93xx/simone.c index 388aec95f60..5dded588413 100644 --- a/arch/arm/mach-ep93xx/simone.c +++ b/arch/arm/mach-ep93xx/simone.c | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | #include <linux/kernel.h> | 18 | #include <linux/kernel.h> |
| 19 | #include <linux/init.h> | 19 | #include <linux/init.h> |
| 20 | #include <linux/platform_device.h> | 20 | #include <linux/platform_device.h> |
| 21 | #include <linux/mtd/physmap.h> | ||
| 22 | #include <linux/gpio.h> | 21 | #include <linux/gpio.h> |
| 23 | #include <linux/i2c.h> | 22 | #include <linux/i2c.h> |
| 24 | #include <linux/i2c-gpio.h> | 23 | #include <linux/i2c-gpio.h> |
| @@ -29,26 +28,6 @@ | |||
| 29 | #include <asm/mach-types.h> | 28 | #include <asm/mach-types.h> |
| 30 | #include <asm/mach/arch.h> | 29 | #include <asm/mach/arch.h> |
| 31 | 30 | ||
| 32 | static struct physmap_flash_data simone_flash_data = { | ||
| 33 | .width = 2, | ||
| 34 | }; | ||
| 35 | |||
| 36 | static struct resource simone_flash_resource = { | ||
| 37 | .start = EP93XX_CS6_PHYS_BASE, | ||
| 38 | .end = EP93XX_CS6_PHYS_BASE + SZ_8M - 1, | ||
| 39 | .flags = IORESOURCE_MEM, | ||
| 40 | }; | ||
| 41 | |||
| 42 | static struct platform_device simone_flash = { | ||
| 43 | .name = "physmap-flash", | ||
| 44 | .id = 0, | ||
| 45 | .num_resources = 1, | ||
| 46 | .resource = &simone_flash_resource, | ||
| 47 | .dev = { | ||
| 48 | .platform_data = &simone_flash_data, | ||
| 49 | }, | ||
| 50 | }; | ||
| 51 | |||
| 52 | static struct ep93xx_eth_data __initdata simone_eth_data = { | 31 | static struct ep93xx_eth_data __initdata simone_eth_data = { |
| 53 | .phy_id = 1, | 32 | .phy_id = 1, |
| 54 | }; | 33 | }; |
| @@ -77,8 +56,7 @@ static struct i2c_board_info __initdata simone_i2c_board_info[] = { | |||
| 77 | static void __init simone_init_machine(void) | 56 | static void __init simone_init_machine(void) |
| 78 | { | 57 | { |
| 79 | ep93xx_init_devices(); | 58 | ep93xx_init_devices(); |
| 80 | 59 | ep93xx_register_flash(2, EP93XX_CS6_PHYS_BASE, SZ_8M); | |
| 81 | platform_device_register(&simone_flash); | ||
| 82 | ep93xx_register_eth(&simone_eth_data, 1); | 60 | ep93xx_register_eth(&simone_eth_data, 1); |
| 83 | ep93xx_register_fb(&simone_fb_info); | 61 | ep93xx_register_fb(&simone_fb_info); |
| 84 | ep93xx_register_i2c(&simone_i2c_gpio_data, simone_i2c_board_info, | 62 | ep93xx_register_i2c(&simone_i2c_gpio_data, simone_i2c_board_info, |
