diff options
author | Alexander Clouter <alex@digriz.org.uk> | 2009-02-06 16:57:13 -0500 |
---|---|---|
committer | Alexander Clouter <alex@digriz.org.uk> | 2009-02-06 16:57:13 -0500 |
commit | c3dfdb0823213c81f60987c8a3770b89ea95cad6 (patch) | |
tree | b1291ce72b3ad37934ca65ca96c24fa3477e56fc /arch/arm/mach-orion5x | |
parent | 88800b2f2ffd3e436266e4dff9586d48b5b54500 (diff) |
[ARM] orion5x: remove TS-78xx NOR support as it does not exist
The TS-7800's M25P40 is not available to the kernel, it's used
to load the initial bitstream onto the FPGA and so these hooks
point to nothing and need to be removed.
Signed-off-by: Alexander Clouter <alex@digriz.org.uk>
Diffstat (limited to 'arch/arm/mach-orion5x')
-rw-r--r-- | arch/arm/mach-orion5x/ts78xx-setup.c | 46 |
1 files changed, 0 insertions, 46 deletions
diff --git a/arch/arm/mach-orion5x/ts78xx-setup.c b/arch/arm/mach-orion5x/ts78xx-setup.c index 1368e9fd1a06..0cb34b9a6d87 100644 --- a/arch/arm/mach-orion5x/ts78xx-setup.c +++ b/arch/arm/mach-orion5x/ts78xx-setup.c | |||
@@ -11,7 +11,6 @@ | |||
11 | #include <linux/kernel.h> | 11 | #include <linux/kernel.h> |
12 | #include <linux/init.h> | 12 | #include <linux/init.h> |
13 | #include <linux/platform_device.h> | 13 | #include <linux/platform_device.h> |
14 | #include <linux/mtd/physmap.h> | ||
15 | #include <linux/mv643xx_eth.h> | 14 | #include <linux/mv643xx_eth.h> |
16 | #include <linux/ata_platform.h> | 15 | #include <linux/ata_platform.h> |
17 | #include <linux/m48t86.h> | 16 | #include <linux/m48t86.h> |
@@ -40,12 +39,6 @@ | |||
40 | #define TS78XX_FPGA_REGS_RTC_CTRL (TS78XX_FPGA_REGS_VIRT_BASE | 0x808) | 39 | #define TS78XX_FPGA_REGS_RTC_CTRL (TS78XX_FPGA_REGS_VIRT_BASE | 0x808) |
41 | #define TS78XX_FPGA_REGS_RTC_DATA (TS78XX_FPGA_REGS_VIRT_BASE | 0x80c) | 40 | #define TS78XX_FPGA_REGS_RTC_DATA (TS78XX_FPGA_REGS_VIRT_BASE | 0x80c) |
42 | 41 | ||
43 | /* | ||
44 | * 512kB NOR flash Device | ||
45 | */ | ||
46 | #define TS78XX_NOR_BOOT_BASE 0xff800000 | ||
47 | #define TS78XX_NOR_BOOT_SIZE SZ_512K | ||
48 | |||
49 | /***************************************************************************** | 42 | /***************************************************************************** |
50 | * I/O Address Mapping | 43 | * I/O Address Mapping |
51 | ****************************************************************************/ | 44 | ****************************************************************************/ |
@@ -65,41 +58,6 @@ void __init ts78xx_map_io(void) | |||
65 | } | 58 | } |
66 | 59 | ||
67 | /***************************************************************************** | 60 | /***************************************************************************** |
68 | * 512kB NOR Boot Flash - the chip is a M25P40 | ||
69 | ****************************************************************************/ | ||
70 | static struct mtd_partition ts78xx_nor_boot_flash_resources[] = { | ||
71 | { | ||
72 | .name = "ts-bootrom", | ||
73 | .offset = 0, | ||
74 | /* only the first 256kB is used */ | ||
75 | .size = SZ_256K, | ||
76 | .mask_flags = MTD_WRITEABLE, | ||
77 | }, | ||
78 | }; | ||
79 | |||
80 | static struct physmap_flash_data ts78xx_nor_boot_flash_data = { | ||
81 | .width = 1, | ||
82 | .parts = ts78xx_nor_boot_flash_resources, | ||
83 | .nr_parts = ARRAY_SIZE(ts78xx_nor_boot_flash_resources), | ||
84 | }; | ||
85 | |||
86 | static struct resource ts78xx_nor_boot_flash_resource = { | ||
87 | .flags = IORESOURCE_MEM, | ||
88 | .start = TS78XX_NOR_BOOT_BASE, | ||
89 | .end = TS78XX_NOR_BOOT_BASE + TS78XX_NOR_BOOT_SIZE - 1, | ||
90 | }; | ||
91 | |||
92 | static struct platform_device ts78xx_nor_boot_flash = { | ||
93 | .name = "physmap-flash", | ||
94 | .id = -1, | ||
95 | .dev = { | ||
96 | .platform_data = &ts78xx_nor_boot_flash_data, | ||
97 | }, | ||
98 | .num_resources = 1, | ||
99 | .resource = &ts78xx_nor_boot_flash_resource, | ||
100 | }; | ||
101 | |||
102 | /***************************************************************************** | ||
103 | * Ethernet | 61 | * Ethernet |
104 | ****************************************************************************/ | 62 | ****************************************************************************/ |
105 | static struct mv643xx_eth_platform_data ts78xx_eth_data = { | 63 | static struct mv643xx_eth_platform_data ts78xx_eth_data = { |
@@ -257,10 +215,6 @@ static void __init ts78xx_init(void) | |||
257 | orion5x_uart1_init(); | 215 | orion5x_uart1_init(); |
258 | orion5x_xor_init(); | 216 | orion5x_xor_init(); |
259 | 217 | ||
260 | orion5x_setup_dev_boot_win(TS78XX_NOR_BOOT_BASE, | ||
261 | TS78XX_NOR_BOOT_SIZE); | ||
262 | platform_device_register(&ts78xx_nor_boot_flash); | ||
263 | |||
264 | if (!ts78xx_rtc_init()) | 218 | if (!ts78xx_rtc_init()) |
265 | printk(KERN_INFO "TS-78xx RTC not detected or enabled\n"); | 219 | printk(KERN_INFO "TS-78xx RTC not detected or enabled\n"); |
266 | } | 220 | } |