* [PATCH 5/5] Remove REDWOOD_5 and REDWOOD_6 config options and conditional code [not found] <c3c850bed3f5714f1efcfad24ad4f8bfcb6b5b54.1279116162.git.qy03fugy@stud.informatik.uni-erlangen.de> @ 2010-07-14 14:05 ` Christian Dietrich 2010-07-15 7:42 ` [5/5] " Milton Miller 0 siblings, 1 reply; 9+ messages in thread From: Christian Dietrich @ 2010-07-14 14:05 UTC (permalink / raw) To: Josh Boyer, Matt Porter, Benjamin Herrenschmidt, Paul Mackerras, Solomon Peachy, David Woodhouse, Mike Frysinger, Jiri Kosina, Artem Bityutskiy, Alexander Kurz, David S. Miller, Randy Dunlap, John Linn, Florian Fainelli, linuxppc-dev, linux-kernel, linux-mtd, netdev Cc: vamos-dev The config options for REDWOOD_[56] 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> --- arch/powerpc/platforms/40x/Kconfig | 16 ------------- drivers/mtd/maps/Kconfig | 2 +- drivers/mtd/maps/redwood.c | 43 ------------------------------------ drivers/net/Kconfig | 2 +- 4 files changed, 2 insertions(+), 61 deletions(-) diff --git a/arch/powerpc/platforms/40x/Kconfig b/arch/powerpc/platforms/40x/Kconfig index ec64264..b721764 100644 --- a/arch/powerpc/platforms/40x/Kconfig +++ b/arch/powerpc/platforms/40x/Kconfig @@ -71,22 +71,6 @@ config MAKALU help This option enables support for the AMCC PPC405EX board. -#config REDWOOD_5 -# bool "Redwood-5" -# depends on 40x -# default n -# select STB03xxx -# help -# This option enables support for the IBM STB04 evaluation board. - -#config REDWOOD_6 -# bool "Redwood-6" -# depends on 40x -# default n -# select STB03xxx -# help -# This option enables support for the IBM STBx25xx evaluation board. - #config SYCAMORE # bool "Sycamore" # depends on 40x diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig index f22bc9f..b5ebb72 100644 --- a/drivers/mtd/maps/Kconfig +++ b/drivers/mtd/maps/Kconfig @@ -321,7 +321,7 @@ config MTD_CFI_FLAGADM config MTD_REDWOOD tristate "CFI Flash devices mapped on IBM Redwood" - depends on MTD_CFI && ( REDWOOD_4 || REDWOOD_5 || REDWOOD_6 ) + depends on MTD_CFI && REDWOOD_4 help This enables access routines for the flash chips on the IBM 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 933c0b6..d2c9db0 100644 --- a/drivers/mtd/maps/redwood.c +++ b/drivers/mtd/maps/redwood.c @@ -22,8 +22,6 @@ #include <asm/io.h> -#if !defined (CONFIG_REDWOOD_6) - #define WINDOW_ADDR 0xffc00000 #define WINDOW_SIZE 0x00400000 @@ -69,47 +67,6 @@ static struct mtd_partition redwood_flash_partitions[] = { } }; -#else /* CONFIG_REDWOOD_6 */ -/* FIXME: the window is bigger - armin */ -#define WINDOW_ADDR 0xff800000 -#define WINDOW_SIZE 0x00800000 - -#define RW_PART0_OF 0 -#define RW_PART0_SZ 0x400000 /* 4 MiB data */ -#define RW_PART1_OF RW_PART0_OF + RW_PART0_SZ -#define RW_PART1_SZ 0x10000 /* 64K VPD */ -#define RW_PART2_OF RW_PART1_OF + RW_PART1_SZ -#define RW_PART2_SZ 0x400000 - (0x10000 + 0x20000) -#define RW_PART3_OF RW_PART2_OF + RW_PART2_SZ -#define RW_PART3_SZ 0x20000 - -static struct mtd_partition redwood_flash_partitions[] = { - { - .name = "Redwood filesystem", - .offset = RW_PART0_OF, - .size = RW_PART0_SZ - }, - { - .name = "Redwood OpenBIOS Vital Product Data", - .offset = RW_PART1_OF, - .size = RW_PART1_SZ, - .mask_flags = MTD_WRITEABLE /* force read-only */ - }, - { - .name = "Redwood kernel", - .offset = RW_PART2_OF, - .size = RW_PART2_SZ - }, - { - .name = "Redwood OpenBIOS", - .offset = RW_PART3_OF, - .size = RW_PART3_SZ, - .mask_flags = MTD_WRITEABLE /* force read-only */ - } -}; - -#endif /* CONFIG_REDWOOD_6 */ - struct map_info redwood_flash_map = { .name = "IBM Redwood", .size = WINDOW_SIZE, diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index ce2fcdd..313d306 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -913,7 +913,7 @@ config SMC91X tristate "SMC 91C9x/91C1xxx support" select CRC32 select MII - depends on ARM || REDWOOD_5 || REDWOOD_6 || M32R || SUPERH || \ + depends on ARM || M32R || SUPERH || \ MIPS || BLACKFIN || MN10300 || COLDFIRE help This is a driver for SMC's 91x series of Ethernet chipsets, -- 1.7.0.4 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [5/5] Remove REDWOOD_5 and REDWOOD_6 config options and conditional code 2010-07-14 14:05 ` [PATCH 5/5] Remove REDWOOD_5 and REDWOOD_6 config options and conditional code Christian Dietrich @ 2010-07-15 7:42 ` Milton Miller 2010-07-16 12:28 ` [PATCH 0/2] Removing dead code Christian Dietrich 0 siblings, 1 reply; 9+ messages in thread From: Milton Miller @ 2010-07-15 7:42 UTC (permalink / raw) To: Christian Dietrich Cc: Randy Dunlap, Artem Bityutskiy, Mike Frysinger, David S. Miller, netdev, linux-kernel, Florian Fainelli, Solomon Peachy, vamos-dev, linuxppc-dev, Alexander Kurz, linux-mtd, Jiri Kosina, Paul Mackerras, David Woodhouse, John Linn On Wed, 14 Jul 2010 about 04:05:05 -0000, Christian Dietrich wrote: > > The config options for REDWOOD_[56] 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> > > --- > arch/powerpc/platforms/40x/Kconfig | 16 ------------- > drivers/mtd/maps/Kconfig | 2 +- > drivers/mtd/maps/redwood.c | 43 ------------------------------------ > drivers/net/Kconfig | 2 +- > 4 files changed, 2 insertions(+), 61 deletions(-) > diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig > index f22bc9f..b5ebb72 100644 > --- a/drivers/mtd/maps/Kconfig > +++ b/drivers/mtd/maps/Kconfig > @@ -321,7 +321,7 @@ config MTD_CFI_FLAGADM > > config MTD_REDWOOD > tristate "CFI Flash devices mapped on IBM Redwood" > - depends on MTD_CFI && ( REDWOOD_4 || REDWOOD_5 || REDWOOD_6 ) > + depends on MTD_CFI && REDWOOD_4 > help > This enables access routines for the flash chips on the IBM > Redwood board. If you have one of these boards and would like to REDWOOD_4 does not appear to be in the tree either so this mapping driver should be deleted if the patch is otherwise acceptable. Besides we would express the info contained in this simple map driver the device tree using physmap_of. milton ^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 0/2] Removing dead code 2010-07-15 7:42 ` [5/5] " Milton Miller @ 2010-07-16 12:28 ` Christian Dietrich 2010-07-16 12:29 ` [PATCH 1/2] Remove REDWOOD_[456] config options and conditional code Christian Dietrich 0 siblings, 1 reply; 9+ messages in thread From: Christian Dietrich @ 2010-07-16 12:28 UTC (permalink / raw) To: Milton Miller, Josh Boyer, Matt Porter, Benjamin Herrenschmidt, Paul Mackerras, Solomon Peachy, David Woodhouse, Mike Frysinger, Jiri Kosina, Artem Bityutskiy, Alexander Kurz, Russell King, Ralf Baechle, Manuel Lauss, David S. Miller, Randy Dunlap, John Linn, Florian Fainelli, Nicolas Pitre, Joe Perches, Ladislav Michl, David Brown, linuxppc-dev, linux-kernel, linux-mtd, netdev Cc: vamos-dev Hi all! I merged the two patches from Christoph Egger[1] to remove the REDWOOD_[456] config depends. And wrote a second patch, which removes the redwood/mtd mapping module. I hope this is now acceptable to bring it into the kernel, if this options are really dead. Regards Christian Dietrich [0] http://vamos1.informatik.uni-erlangen.de/ [1] Message-Id: <adba61f63f4439ac17f2e428429f01ae5e65ab15.1279110895.git.siccegge@cs.fau.de> Christian Dietrich (2): Remove REDWOOD_[456] config options and conditional code Removed redwood/mtd mapping arch/powerpc/platforms/40x/Kconfig | 16 ---- drivers/mtd/maps/Kconfig | 8 -- drivers/mtd/maps/Makefile | 1 - drivers/mtd/maps/redwood.c | 174 ------------------------------------ drivers/net/Kconfig | 2 +- drivers/net/smc91x.h | 37 -------- 6 files changed, 1 insertions(+), 237 deletions(-) delete mode 100644 drivers/mtd/maps/redwood.c ^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 1/2] Remove REDWOOD_[456] config options and conditional code 2010-07-16 12:28 ` [PATCH 0/2] Removing dead code Christian Dietrich @ 2010-07-16 12:29 ` Christian Dietrich 2010-07-16 14:20 ` Josh Boyer 2010-07-19 0:00 ` Benjamin Herrenschmidt 0 siblings, 2 replies; 9+ messages in thread From: Christian Dietrich @ 2010-07-16 12:29 UTC (permalink / raw) To: Milton Miller, Josh Boyer, Matt Porter, Benjamin Herrenschmidt, Paul Mackerras, Solomon Peachy, David Woodhouse, Mike Frysinger, Jiri Kosina, Artem Bityutskiy, Alexander Kurz, David S. Miller, Randy Dunlap, John Linn, Florian Fainelli, Nicolas Pitre, Joe Perches, Ladislav Michl, David Brown, linuxppc-dev, linux-kernel, linux-mtd, netdev Cc: vamos-dev 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> --- arch/powerpc/platforms/40x/Kconfig | 16 ------------- drivers/mtd/maps/Kconfig | 2 +- drivers/mtd/maps/redwood.c | 43 ------------------------------------ drivers/net/Kconfig | 2 +- drivers/net/smc91x.h | 37 ------------------------------- 5 files changed, 2 insertions(+), 98 deletions(-) diff --git a/arch/powerpc/platforms/40x/Kconfig b/arch/powerpc/platforms/40x/Kconfig index ec64264..b721764 100644 --- a/arch/powerpc/platforms/40x/Kconfig +++ b/arch/powerpc/platforms/40x/Kconfig @@ -71,22 +71,6 @@ config MAKALU help This option enables support for the AMCC PPC405EX board. -#config REDWOOD_5 -# bool "Redwood-5" -# depends on 40x -# default n -# select STB03xxx -# help -# This option enables support for the IBM STB04 evaluation board. - -#config REDWOOD_6 -# bool "Redwood-6" -# depends on 40x -# default n -# select STB03xxx -# help -# This option enables support for the IBM STBx25xx evaluation board. - #config SYCAMORE # bool "Sycamore" # depends on 40x diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig index f22bc9f..6629d09 100644 --- a/drivers/mtd/maps/Kconfig +++ b/drivers/mtd/maps/Kconfig @@ -321,7 +321,7 @@ config MTD_CFI_FLAGADM config MTD_REDWOOD tristate "CFI Flash devices mapped on IBM Redwood" - depends on MTD_CFI && ( REDWOOD_4 || REDWOOD_5 || REDWOOD_6 ) + depends on MTD_CFI help This enables access routines for the flash chips on the IBM 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 933c0b6..d2c9db0 100644 --- a/drivers/mtd/maps/redwood.c +++ b/drivers/mtd/maps/redwood.c @@ -22,8 +22,6 @@ #include <asm/io.h> -#if !defined (CONFIG_REDWOOD_6) - #define WINDOW_ADDR 0xffc00000 #define WINDOW_SIZE 0x00400000 @@ -69,47 +67,6 @@ static struct mtd_partition redwood_flash_partitions[] = { } }; -#else /* CONFIG_REDWOOD_6 */ -/* FIXME: the window is bigger - armin */ -#define WINDOW_ADDR 0xff800000 -#define WINDOW_SIZE 0x00800000 - -#define RW_PART0_OF 0 -#define RW_PART0_SZ 0x400000 /* 4 MiB data */ -#define RW_PART1_OF RW_PART0_OF + RW_PART0_SZ -#define RW_PART1_SZ 0x10000 /* 64K VPD */ -#define RW_PART2_OF RW_PART1_OF + RW_PART1_SZ -#define RW_PART2_SZ 0x400000 - (0x10000 + 0x20000) -#define RW_PART3_OF RW_PART2_OF + RW_PART2_SZ -#define RW_PART3_SZ 0x20000 - -static struct mtd_partition redwood_flash_partitions[] = { - { - .name = "Redwood filesystem", - .offset = RW_PART0_OF, - .size = RW_PART0_SZ - }, - { - .name = "Redwood OpenBIOS Vital Product Data", - .offset = RW_PART1_OF, - .size = RW_PART1_SZ, - .mask_flags = MTD_WRITEABLE /* force read-only */ - }, - { - .name = "Redwood kernel", - .offset = RW_PART2_OF, - .size = RW_PART2_SZ - }, - { - .name = "Redwood OpenBIOS", - .offset = RW_PART3_OF, - .size = RW_PART3_SZ, - .mask_flags = MTD_WRITEABLE /* force read-only */ - } -}; - -#endif /* CONFIG_REDWOOD_6 */ - struct map_info redwood_flash_map = { .name = "IBM Redwood", .size = WINDOW_SIZE, diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index ce2fcdd..313d306 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -913,7 +913,7 @@ config SMC91X tristate "SMC 91C9x/91C1xxx support" select CRC32 select MII - depends on ARM || REDWOOD_5 || REDWOOD_6 || M32R || SUPERH || \ + depends on ARM || M32R || SUPERH || \ MIPS || BLACKFIN || MN10300 || COLDFIRE help 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 8d2772c..ee74791 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) } } -#elif defined(CONFIG_REDWOOD_5) || defined(CONFIG_REDWOOD_6) - -/* We can only do 16-bit reads and writes in the static memory space. */ -#define SMC_CAN_USE_8BIT 0 -#define SMC_CAN_USE_16BIT 1 -#define SMC_CAN_USE_32BIT 0 -#define SMC_NOWAIT 1 - -#define SMC_IO_SHIFT 0 - -#define SMC_inw(a, r) in_be16((volatile u16 *)((a) + (r))) -#define SMC_outw(v, a, r) out_be16((volatile u16 *)((a) + (r)), v) -#define SMC_insw(a, r, p, l) \ - do { \ - unsigned long __port = (a) + (r); \ - u16 *__p = (u16 *)(p); \ - int __l = (l); \ - insw(__port, __p, __l); \ - while (__l > 0) { \ - *__p = swab16(*__p); \ - __p++; \ - __l--; \ - } \ - } while (0) -#define SMC_outsw(a, r, p, l) \ - do { \ - unsigned long __port = (a) + (r); \ - u16 *__p = (u16 *)(p); \ - int __l = (l); \ - while (__l > 0) { \ - /* Believe it or not, the swab isn't needed. */ \ - outw( /* swab16 */ (*__p++), __port); \ - __l--; \ - } \ - } while (0) -#define SMC_IRQ_FLAGS (0) - #elif defined(CONFIG_SA1100_PLEB) /* We can only do 16-bit reads and writes in the static memory space. */ #define SMC_CAN_USE_8BIT 1 -- 1.7.0.4 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH 1/2] Remove REDWOOD_[456] config options and conditional code 2010-07-16 12:29 ` [PATCH 1/2] Remove REDWOOD_[456] config options and conditional code Christian Dietrich @ 2010-07-16 14:20 ` Josh Boyer 2010-07-16 15:45 ` Milton Miller ` (2 more replies) 2010-07-19 0:00 ` Benjamin Herrenschmidt 1 sibling, 3 replies; 9+ messages in thread From: Josh Boyer @ 2010-07-16 14:20 UTC (permalink / raw) To: Christian Dietrich Cc: Randy Dunlap, linuxppc-dev, Alexander Kurz, Paul Mackerras, John Linn, David Brown, Ladislav Michl, Solomon Peachy, vamos-dev, Mike Frysinger, Florian Fainelli, Artem Bityutskiy, Nicolas Pitre, netdev, linux-kernel, Milton Miller, Jiri Kosina, Joe Perches, linux-mtd, David Woodhouse, David S. Miller On Fri, Jul 16, 2010 at 02:29:02PM +0200, Christian Dietrich wrote: >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> This seems fine with me. The only question is which tree it coms through. I'm happy to take it in via mine if the netdev and MTD people are fine with that. Otherwise, my ack is below. Acked-by: Josh Boyer <jwboyer@linux.vnet.ibm.com> josh >--- > arch/powerpc/platforms/40x/Kconfig | 16 ------------- > drivers/mtd/maps/Kconfig | 2 +- > drivers/mtd/maps/redwood.c | 43 ------------------------------------ > drivers/net/Kconfig | 2 +- > drivers/net/smc91x.h | 37 ------------------------------- > 5 files changed, 2 insertions(+), 98 deletions(-) > >diff --git a/arch/powerpc/platforms/40x/Kconfig b/arch/powerpc/platforms/40x/Kconfig >index ec64264..b721764 100644 >--- a/arch/powerpc/platforms/40x/Kconfig >+++ b/arch/powerpc/platforms/40x/Kconfig >@@ -71,22 +71,6 @@ config MAKALU > help > This option enables support for the AMCC PPC405EX board. > >-#config REDWOOD_5 >-# bool "Redwood-5" >-# depends on 40x >-# default n >-# select STB03xxx >-# help >-# This option enables support for the IBM STB04 evaluation board. >- >-#config REDWOOD_6 >-# bool "Redwood-6" >-# depends on 40x >-# default n >-# select STB03xxx >-# help >-# This option enables support for the IBM STBx25xx evaluation board. >- > #config SYCAMORE > # bool "Sycamore" > # depends on 40x >diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig >index f22bc9f..6629d09 100644 >--- a/drivers/mtd/maps/Kconfig >+++ b/drivers/mtd/maps/Kconfig >@@ -321,7 +321,7 @@ config MTD_CFI_FLAGADM > > config MTD_REDWOOD > tristate "CFI Flash devices mapped on IBM Redwood" >- depends on MTD_CFI && ( REDWOOD_4 || REDWOOD_5 || REDWOOD_6 ) >+ depends on MTD_CFI > help > This enables access routines for the flash chips on the IBM > 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 933c0b6..d2c9db0 100644 >--- a/drivers/mtd/maps/redwood.c >+++ b/drivers/mtd/maps/redwood.c >@@ -22,8 +22,6 @@ > > #include <asm/io.h> > >-#if !defined (CONFIG_REDWOOD_6) >- > #define WINDOW_ADDR 0xffc00000 > #define WINDOW_SIZE 0x00400000 > >@@ -69,47 +67,6 @@ static struct mtd_partition redwood_flash_partitions[] = { > } > }; > >-#else /* CONFIG_REDWOOD_6 */ >-/* FIXME: the window is bigger - armin */ >-#define WINDOW_ADDR 0xff800000 >-#define WINDOW_SIZE 0x00800000 >- >-#define RW_PART0_OF 0 >-#define RW_PART0_SZ 0x400000 /* 4 MiB data */ >-#define RW_PART1_OF RW_PART0_OF + RW_PART0_SZ >-#define RW_PART1_SZ 0x10000 /* 64K VPD */ >-#define RW_PART2_OF RW_PART1_OF + RW_PART1_SZ >-#define RW_PART2_SZ 0x400000 - (0x10000 + 0x20000) >-#define RW_PART3_OF RW_PART2_OF + RW_PART2_SZ >-#define RW_PART3_SZ 0x20000 >- >-static struct mtd_partition redwood_flash_partitions[] = { >- { >- .name = "Redwood filesystem", >- .offset = RW_PART0_OF, >- .size = RW_PART0_SZ >- }, >- { >- .name = "Redwood OpenBIOS Vital Product Data", >- .offset = RW_PART1_OF, >- .size = RW_PART1_SZ, >- .mask_flags = MTD_WRITEABLE /* force read-only */ >- }, >- { >- .name = "Redwood kernel", >- .offset = RW_PART2_OF, >- .size = RW_PART2_SZ >- }, >- { >- .name = "Redwood OpenBIOS", >- .offset = RW_PART3_OF, >- .size = RW_PART3_SZ, >- .mask_flags = MTD_WRITEABLE /* force read-only */ >- } >-}; >- >-#endif /* CONFIG_REDWOOD_6 */ >- > struct map_info redwood_flash_map = { > .name = "IBM Redwood", > .size = WINDOW_SIZE, >diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig >index ce2fcdd..313d306 100644 >--- a/drivers/net/Kconfig >+++ b/drivers/net/Kconfig >@@ -913,7 +913,7 @@ config SMC91X > tristate "SMC 91C9x/91C1xxx support" > select CRC32 > select MII >- depends on ARM || REDWOOD_5 || REDWOOD_6 || M32R || SUPERH || \ >+ depends on ARM || M32R || SUPERH || \ > MIPS || BLACKFIN || MN10300 || COLDFIRE > help > 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 8d2772c..ee74791 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) > } > } > >-#elif defined(CONFIG_REDWOOD_5) || defined(CONFIG_REDWOOD_6) >- >-/* We can only do 16-bit reads and writes in the static memory space. */ >-#define SMC_CAN_USE_8BIT 0 >-#define SMC_CAN_USE_16BIT 1 >-#define SMC_CAN_USE_32BIT 0 >-#define SMC_NOWAIT 1 >- >-#define SMC_IO_SHIFT 0 >- >-#define SMC_inw(a, r) in_be16((volatile u16 *)((a) + (r))) >-#define SMC_outw(v, a, r) out_be16((volatile u16 *)((a) + (r)), v) >-#define SMC_insw(a, r, p, l) \ >- do { \ >- unsigned long __port = (a) + (r); \ >- u16 *__p = (u16 *)(p); \ >- int __l = (l); \ >- insw(__port, __p, __l); \ >- while (__l > 0) { \ >- *__p = swab16(*__p); \ >- __p++; \ >- __l--; \ >- } \ >- } while (0) >-#define SMC_outsw(a, r, p, l) \ >- do { \ >- unsigned long __port = (a) + (r); \ >- u16 *__p = (u16 *)(p); \ >- int __l = (l); \ >- while (__l > 0) { \ >- /* Believe it or not, the swab isn't needed. */ \ >- outw( /* swab16 */ (*__p++), __port); \ >- __l--; \ >- } \ >- } while (0) >-#define SMC_IRQ_FLAGS (0) >- > #elif defined(CONFIG_SA1100_PLEB) > /* We can only do 16-bit reads and writes in the static memory space. */ > #define SMC_CAN_USE_8BIT 1 >-- >1.7.0.4 > ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 1/2] Remove REDWOOD_[456] config options and conditional code 2010-07-16 14:20 ` Josh Boyer @ 2010-07-16 15:45 ` Milton Miller 2010-07-16 20:45 ` David Miller 2010-07-18 16:52 ` Artem Bityutskiy 2 siblings, 0 replies; 9+ messages in thread From: Milton Miller @ 2010-07-16 15:45 UTC (permalink / raw) To: Christian Dietrich Cc: Randy Dunlap, linuxppc-dev, Alexander Kurz, Paul Mackerras, John Linn, David Brown, Ladislav Michl, Solomon Peachy, vamos-dev, Mike Frysinger, Florian Fainelli, Artem Bityutskiy, Nicolas Pitre, Jiri Kosina, linux-kernel, Milton Miller, netdev, Joe Perches, linux-mtd, David Woodhouse, David S. Miller On Fri, 16 Jul 2010 at about 08:20:55 -0600 Josh Boyer wrote: > On Fri, Jul 16, 2010 at 02:29:02PM +0200, Christian Dietrich wrote: > > 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). > This seems fine with me. > > The only question is which tree it coms through. I'm happy to take it > in via mine if the netdev and MTD people are fine with that. Otherwise, > my ack is below. > On Fri, 16 Jul 2010 around 14:29:08 +0200 Christian Dietrich wrote: > > diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig > > index f22bc9f..6629d09 100644 > > --- a/drivers/mtd/maps/Kconfig > > +++ b/drivers/mtd/maps/Kconfig > > @@ -321,7 +321,7 @@ config MTD_CFI_FLAGADM > > > > config MTD_REDWOOD > > tristate "CFI Flash devices mapped on IBM Redwood" > > - depends on MTD_CFI && ( REDWOOD_4 || REDWOOD_5 || REDWOOD_6 ) > > + depends on MTD_CFI > > help > > This enables access routines for the flash chips on the IBM > > 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 933c0b6..d2c9db0 100644 > > --- a/drivers/mtd/maps/redwood.c > > +++ b/drivers/mtd/maps/redwood.c > > @@ -22,8 +22,6 @@ The patches are unnecssarly coupled by removing the REDWOOD_* symbols in the MTD area before removing the files and Kconfig completely in the second patch. This could easily be eliminated by pushing the two fragments into the second patch. milton ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 1/2] Remove REDWOOD_[456] config options and conditional code 2010-07-16 14:20 ` Josh Boyer 2010-07-16 15:45 ` Milton Miller @ 2010-07-16 20:45 ` David Miller 2010-07-18 16:52 ` Artem Bityutskiy 2 siblings, 0 replies; 9+ messages in thread From: David Miller @ 2010-07-16 20:45 UTC (permalink / raw) To: jwboyer Cc: randy.dunlap, linuxppc-dev, linux, paulus, john.linn, davidb, ladis, solomon, vamos-dev, vapier, florian, Artem.Bityutskiy, qy03fugy, nico, netdev, linux-kernel, miltonm, jkosina, joe, linux-mtd, dwmw2 From: Josh Boyer <jwboyer@linux.vnet.ibm.com> Date: Fri, 16 Jul 2010 10:20:55 -0400 > On Fri, Jul 16, 2010 at 02:29:02PM +0200, Christian Dietrich wrote: >>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> > > This seems fine with me. > > The only question is which tree it coms through. I'm happy to take it > in via mine if the netdev and MTD people are fine with that. Otherwise, > my ack is below. > > Acked-by: Josh Boyer <jwboyer@linux.vnet.ibm.com> Please take it: Acked-by: David S. Miller <davem@davemloft.net> ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 1/2] Remove REDWOOD_[456] config options and conditional code 2010-07-16 14:20 ` Josh Boyer 2010-07-16 15:45 ` Milton Miller 2010-07-16 20:45 ` David Miller @ 2010-07-18 16:52 ` Artem Bityutskiy 2 siblings, 0 replies; 9+ messages in thread From: Artem Bityutskiy @ 2010-07-18 16:52 UTC (permalink / raw) To: Josh Boyer Cc: Randy Dunlap, linuxppc-dev, Alexander Kurz, Paul Mackerras, John Linn, David Brown, Ladislav Michl, Solomon Peachy, vamos-dev, Mike Frysinger, Florian Fainelli, Artem Bityutskiy, Christian Dietrich, Nicolas Pitre, Jiri Kosina, linux-kernel, Milton Miller, netdev, Joe Perches, linux-mtd, David Woodhouse, David S. Miller On Fri, 2010-07-16 at 10:20 -0400, Josh Boyer wrote: > On Fri, Jul 16, 2010 at 02:29:02PM +0200, Christian Dietrich wrote: > >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> > > This seems fine with me. > > The only question is which tree it coms through. I'm happy to take it > in via mine if the netdev and MTD people are fine with that. Otherwise, > my ack is below. > > Acked-by: Josh Boyer <jwboyer@linux.vnet.ibm.com> You know how slow MTD people may be sometimes, so I'd suggest you to merge this via whatever tree. David is in CC, he'll complain if he is unhappy, I think. -- Best Regards, Artem Bityutskiy (Артём Битюцкий) ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 1/2] Remove REDWOOD_[456] config options and conditional code 2010-07-16 12:29 ` [PATCH 1/2] Remove REDWOOD_[456] config options and conditional code Christian Dietrich 2010-07-16 14:20 ` Josh Boyer @ 2010-07-19 0:00 ` Benjamin Herrenschmidt 1 sibling, 0 replies; 9+ messages in thread From: Benjamin Herrenschmidt @ 2010-07-19 0:00 UTC (permalink / raw) To: Christian Dietrich Cc: Randy Dunlap, linuxppc-dev, Alexander Kurz, Paul Mackerras, John Linn, David Brown, Ladislav Michl, Solomon Peachy, vamos-dev, Mike Frysinger, Florian Fainelli, Artem Bityutskiy, Nicolas Pitre, Jiri Kosina, linux-kernel, Milton Miller, netdev, Joe Perches, linux-mtd, David Woodhouse, David S. Miller On Fri, 2010-07-16 at 14:29 +0200, Christian Dietrich wrote: > 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: Benjamin Herrenschmidt <benh@kernel.crashing.org> > --- > arch/powerpc/platforms/40x/Kconfig | 16 ------------- > drivers/mtd/maps/Kconfig | 2 +- > drivers/mtd/maps/redwood.c | 43 ------------------------------------ > drivers/net/Kconfig | 2 +- > drivers/net/smc91x.h | 37 ------------------------------- > 5 files changed, 2 insertions(+), 98 deletions(-) > > diff --git a/arch/powerpc/platforms/40x/Kconfig b/arch/powerpc/platforms/40x/Kconfig > index ec64264..b721764 100644 > --- a/arch/powerpc/platforms/40x/Kconfig > +++ b/arch/powerpc/platforms/40x/Kconfig > @@ -71,22 +71,6 @@ config MAKALU > help > This option enables support for the AMCC PPC405EX board. > > -#config REDWOOD_5 > -# bool "Redwood-5" > -# depends on 40x > -# default n > -# select STB03xxx > -# help > -# This option enables support for the IBM STB04 evaluation board. > - > -#config REDWOOD_6 > -# bool "Redwood-6" > -# depends on 40x > -# default n > -# select STB03xxx > -# help > -# This option enables support for the IBM STBx25xx evaluation board. > - > #config SYCAMORE > # bool "Sycamore" > # depends on 40x > diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig > index f22bc9f..6629d09 100644 > --- a/drivers/mtd/maps/Kconfig > +++ b/drivers/mtd/maps/Kconfig > @@ -321,7 +321,7 @@ config MTD_CFI_FLAGADM > > config MTD_REDWOOD > tristate "CFI Flash devices mapped on IBM Redwood" > - depends on MTD_CFI && ( REDWOOD_4 || REDWOOD_5 || REDWOOD_6 ) > + depends on MTD_CFI > help > This enables access routines for the flash chips on the IBM > 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 933c0b6..d2c9db0 100644 > --- a/drivers/mtd/maps/redwood.c > +++ b/drivers/mtd/maps/redwood.c > @@ -22,8 +22,6 @@ > > #include <asm/io.h> > > -#if !defined (CONFIG_REDWOOD_6) > - > #define WINDOW_ADDR 0xffc00000 > #define WINDOW_SIZE 0x00400000 > > @@ -69,47 +67,6 @@ static struct mtd_partition redwood_flash_partitions[] = { > } > }; > > -#else /* CONFIG_REDWOOD_6 */ > -/* FIXME: the window is bigger - armin */ > -#define WINDOW_ADDR 0xff800000 > -#define WINDOW_SIZE 0x00800000 > - > -#define RW_PART0_OF 0 > -#define RW_PART0_SZ 0x400000 /* 4 MiB data */ > -#define RW_PART1_OF RW_PART0_OF + RW_PART0_SZ > -#define RW_PART1_SZ 0x10000 /* 64K VPD */ > -#define RW_PART2_OF RW_PART1_OF + RW_PART1_SZ > -#define RW_PART2_SZ 0x400000 - (0x10000 + 0x20000) > -#define RW_PART3_OF RW_PART2_OF + RW_PART2_SZ > -#define RW_PART3_SZ 0x20000 > - > -static struct mtd_partition redwood_flash_partitions[] = { > - { > - .name = "Redwood filesystem", > - .offset = RW_PART0_OF, > - .size = RW_PART0_SZ > - }, > - { > - .name = "Redwood OpenBIOS Vital Product Data", > - .offset = RW_PART1_OF, > - .size = RW_PART1_SZ, > - .mask_flags = MTD_WRITEABLE /* force read-only */ > - }, > - { > - .name = "Redwood kernel", > - .offset = RW_PART2_OF, > - .size = RW_PART2_SZ > - }, > - { > - .name = "Redwood OpenBIOS", > - .offset = RW_PART3_OF, > - .size = RW_PART3_SZ, > - .mask_flags = MTD_WRITEABLE /* force read-only */ > - } > -}; > - > -#endif /* CONFIG_REDWOOD_6 */ > - > struct map_info redwood_flash_map = { > .name = "IBM Redwood", > .size = WINDOW_SIZE, > diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig > index ce2fcdd..313d306 100644 > --- a/drivers/net/Kconfig > +++ b/drivers/net/Kconfig > @@ -913,7 +913,7 @@ config SMC91X > tristate "SMC 91C9x/91C1xxx support" > select CRC32 > select MII > - depends on ARM || REDWOOD_5 || REDWOOD_6 || M32R || SUPERH || \ > + depends on ARM || M32R || SUPERH || \ > MIPS || BLACKFIN || MN10300 || COLDFIRE > help > 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 8d2772c..ee74791 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) > } > } > > -#elif defined(CONFIG_REDWOOD_5) || defined(CONFIG_REDWOOD_6) > - > -/* We can only do 16-bit reads and writes in the static memory space. */ > -#define SMC_CAN_USE_8BIT 0 > -#define SMC_CAN_USE_16BIT 1 > -#define SMC_CAN_USE_32BIT 0 > -#define SMC_NOWAIT 1 > - > -#define SMC_IO_SHIFT 0 > - > -#define SMC_inw(a, r) in_be16((volatile u16 *)((a) + (r))) > -#define SMC_outw(v, a, r) out_be16((volatile u16 *)((a) + (r)), v) > -#define SMC_insw(a, r, p, l) \ > - do { \ > - unsigned long __port = (a) + (r); \ > - u16 *__p = (u16 *)(p); \ > - int __l = (l); \ > - insw(__port, __p, __l); \ > - while (__l > 0) { \ > - *__p = swab16(*__p); \ > - __p++; \ > - __l--; \ > - } \ > - } while (0) > -#define SMC_outsw(a, r, p, l) \ > - do { \ > - unsigned long __port = (a) + (r); \ > - u16 *__p = (u16 *)(p); \ > - int __l = (l); \ > - while (__l > 0) { \ > - /* Believe it or not, the swab isn't needed. */ \ > - outw( /* swab16 */ (*__p++), __port); \ > - __l--; \ > - } \ > - } while (0) > -#define SMC_IRQ_FLAGS (0) > - > #elif defined(CONFIG_SA1100_PLEB) > /* We can only do 16-bit reads and writes in the static memory space. */ > #define SMC_CAN_USE_8BIT 1 ^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2010-07-19 0:01 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <c3c850bed3f5714f1efcfad24ad4f8bfcb6b5b54.1279116162.git.qy03fugy@stud.informatik.uni-erlangen.de>
2010-07-14 14:05 ` [PATCH 5/5] Remove REDWOOD_5 and REDWOOD_6 config options and conditional code Christian Dietrich
2010-07-15 7:42 ` [5/5] " Milton Miller
2010-07-16 12:28 ` [PATCH 0/2] Removing dead code Christian Dietrich
2010-07-16 12:29 ` [PATCH 1/2] Remove REDWOOD_[456] config options and conditional code Christian Dietrich
2010-07-16 14:20 ` Josh Boyer
2010-07-16 15:45 ` Milton Miller
2010-07-16 20:45 ` David Miller
2010-07-18 16:52 ` Artem Bityutskiy
2010-07-19 0:00 ` Benjamin Herrenschmidt
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).