diff options
author | Christian Dietrich <qy03fugy@stud.informatik.uni-erlangen.de> | 2010-07-15 22:29:02 -0400 |
---|---|---|
committer | Josh Boyer <jwboyer@linux.vnet.ibm.com> | 2010-07-26 09:06:04 -0400 |
commit | c76986cca8379db619de4b6c6b7359125df0e341 (patch) | |
tree | caed6e53e9fecbbd3d75f96fa9723a5daf203a22 /drivers | |
parent | cccd23428347251713b643d4bc5edb610308fd49 (diff) |
Remove REDWOOD_[456] config options and conditional code
The config options for REDWOOD_[456] were commented out in the powerpc
Kconfig. The ifdefs referencing this options therefore are dead and all
references to this can be removed (Also dependencies in other KConfig
files).
Signed-off-by: Christian Dietrich <qy03fugy@stud.informatik.uni-erlangen.de>
Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
Acked-by: David S. Miller <davem@davemloft.net>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/mtd/maps/Kconfig | 2 | ||||
-rw-r--r-- | drivers/mtd/maps/redwood.c | 43 | ||||
-rw-r--r-- | drivers/net/Kconfig | 2 | ||||
-rw-r--r-- | drivers/net/smc91x.h | 37 |
4 files changed, 2 insertions, 82 deletions
diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig index f22bc9f05ddb..6629d09f3b38 100644 --- a/drivers/mtd/maps/Kconfig +++ b/drivers/mtd/maps/Kconfig | |||
@@ -321,7 +321,7 @@ config MTD_CFI_FLAGADM | |||
321 | 321 | ||
322 | config MTD_REDWOOD | 322 | config MTD_REDWOOD |
323 | tristate "CFI Flash devices mapped on IBM Redwood" | 323 | tristate "CFI Flash devices mapped on IBM Redwood" |
324 | depends on MTD_CFI && ( REDWOOD_4 || REDWOOD_5 || REDWOOD_6 ) | 324 | depends on MTD_CFI |
325 | help | 325 | help |
326 | This enables access routines for the flash chips on the IBM | 326 | This enables access routines for the flash chips on the IBM |
327 | Redwood board. If you have one of these boards and would like to | 327 | Redwood board. If you have one of these boards and would like to |
diff --git a/drivers/mtd/maps/redwood.c b/drivers/mtd/maps/redwood.c index 933c0b63b016..d2c9db00db0c 100644 --- a/drivers/mtd/maps/redwood.c +++ b/drivers/mtd/maps/redwood.c | |||
@@ -22,8 +22,6 @@ | |||
22 | 22 | ||
23 | #include <asm/io.h> | 23 | #include <asm/io.h> |
24 | 24 | ||
25 | #if !defined (CONFIG_REDWOOD_6) | ||
26 | |||
27 | #define WINDOW_ADDR 0xffc00000 | 25 | #define WINDOW_ADDR 0xffc00000 |
28 | #define WINDOW_SIZE 0x00400000 | 26 | #define WINDOW_SIZE 0x00400000 |
29 | 27 | ||
@@ -69,47 +67,6 @@ static struct mtd_partition redwood_flash_partitions[] = { | |||
69 | } | 67 | } |
70 | }; | 68 | }; |
71 | 69 | ||
72 | #else /* CONFIG_REDWOOD_6 */ | ||
73 | /* FIXME: the window is bigger - armin */ | ||
74 | #define WINDOW_ADDR 0xff800000 | ||
75 | #define WINDOW_SIZE 0x00800000 | ||
76 | |||
77 | #define RW_PART0_OF 0 | ||
78 | #define RW_PART0_SZ 0x400000 /* 4 MiB data */ | ||
79 | #define RW_PART1_OF RW_PART0_OF + RW_PART0_SZ | ||
80 | #define RW_PART1_SZ 0x10000 /* 64K VPD */ | ||
81 | #define RW_PART2_OF RW_PART1_OF + RW_PART1_SZ | ||
82 | #define RW_PART2_SZ 0x400000 - (0x10000 + 0x20000) | ||
83 | #define RW_PART3_OF RW_PART2_OF + RW_PART2_SZ | ||
84 | #define RW_PART3_SZ 0x20000 | ||
85 | |||
86 | static struct mtd_partition redwood_flash_partitions[] = { | ||
87 | { | ||
88 | .name = "Redwood filesystem", | ||
89 | .offset = RW_PART0_OF, | ||
90 | .size = RW_PART0_SZ | ||
91 | }, | ||
92 | { | ||
93 | .name = "Redwood OpenBIOS Vital Product Data", | ||
94 | .offset = RW_PART1_OF, | ||
95 | .size = RW_PART1_SZ, | ||
96 | .mask_flags = MTD_WRITEABLE /* force read-only */ | ||
97 | }, | ||
98 | { | ||
99 | .name = "Redwood kernel", | ||
100 | .offset = RW_PART2_OF, | ||
101 | .size = RW_PART2_SZ | ||
102 | }, | ||
103 | { | ||
104 | .name = "Redwood OpenBIOS", | ||
105 | .offset = RW_PART3_OF, | ||
106 | .size = RW_PART3_SZ, | ||
107 | .mask_flags = MTD_WRITEABLE /* force read-only */ | ||
108 | } | ||
109 | }; | ||
110 | |||
111 | #endif /* CONFIG_REDWOOD_6 */ | ||
112 | |||
113 | struct map_info redwood_flash_map = { | 70 | struct map_info redwood_flash_map = { |
114 | .name = "IBM Redwood", | 71 | .name = "IBM Redwood", |
115 | .size = WINDOW_SIZE, | 72 | .size = WINDOW_SIZE, |
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index ce2fcdd4ab90..313d3060fc1d 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
@@ -913,7 +913,7 @@ config SMC91X | |||
913 | tristate "SMC 91C9x/91C1xxx support" | 913 | tristate "SMC 91C9x/91C1xxx support" |
914 | select CRC32 | 914 | select CRC32 |
915 | select MII | 915 | select MII |
916 | depends on ARM || REDWOOD_5 || REDWOOD_6 || M32R || SUPERH || \ | 916 | depends on ARM || M32R || SUPERH || \ |
917 | MIPS || BLACKFIN || MN10300 || COLDFIRE | 917 | MIPS || BLACKFIN || MN10300 || COLDFIRE |
918 | help | 918 | help |
919 | This is a driver for SMC's 91x series of Ethernet chipsets, | 919 | This is a driver for SMC's 91x series of Ethernet chipsets, |
diff --git a/drivers/net/smc91x.h b/drivers/net/smc91x.h index 8d2772cc42f2..ee747919a766 100644 --- a/drivers/net/smc91x.h +++ b/drivers/net/smc91x.h | |||
@@ -83,43 +83,6 @@ static inline void SMC_outw(u16 val, void __iomem *ioaddr, int reg) | |||
83 | } | 83 | } |
84 | } | 84 | } |
85 | 85 | ||
86 | #elif defined(CONFIG_REDWOOD_5) || defined(CONFIG_REDWOOD_6) | ||
87 | |||
88 | /* We can only do 16-bit reads and writes in the static memory space. */ | ||
89 | #define SMC_CAN_USE_8BIT 0 | ||
90 | #define SMC_CAN_USE_16BIT 1 | ||
91 | #define SMC_CAN_USE_32BIT 0 | ||
92 | #define SMC_NOWAIT 1 | ||
93 | |||
94 | #define SMC_IO_SHIFT 0 | ||
95 | |||
96 | #define SMC_inw(a, r) in_be16((volatile u16 *)((a) + (r))) | ||
97 | #define SMC_outw(v, a, r) out_be16((volatile u16 *)((a) + (r)), v) | ||
98 | #define SMC_insw(a, r, p, l) \ | ||
99 | do { \ | ||
100 | unsigned long __port = (a) + (r); \ | ||
101 | u16 *__p = (u16 *)(p); \ | ||
102 | int __l = (l); \ | ||
103 | insw(__port, __p, __l); \ | ||
104 | while (__l > 0) { \ | ||
105 | *__p = swab16(*__p); \ | ||
106 | __p++; \ | ||
107 | __l--; \ | ||
108 | } \ | ||
109 | } while (0) | ||
110 | #define SMC_outsw(a, r, p, l) \ | ||
111 | do { \ | ||
112 | unsigned long __port = (a) + (r); \ | ||
113 | u16 *__p = (u16 *)(p); \ | ||
114 | int __l = (l); \ | ||
115 | while (__l > 0) { \ | ||
116 | /* Believe it or not, the swab isn't needed. */ \ | ||
117 | outw( /* swab16 */ (*__p++), __port); \ | ||
118 | __l--; \ | ||
119 | } \ | ||
120 | } while (0) | ||
121 | #define SMC_IRQ_FLAGS (0) | ||
122 | |||
123 | #elif defined(CONFIG_SA1100_PLEB) | 86 | #elif defined(CONFIG_SA1100_PLEB) |
124 | /* We can only do 16-bit reads and writes in the static memory space. */ | 87 | /* We can only do 16-bit reads and writes in the static memory space. */ |
125 | #define SMC_CAN_USE_8BIT 1 | 88 | #define SMC_CAN_USE_8BIT 1 |