[uClinux-dev] [PATCH 4/5] powerpc: remove references to dead platforms (fwd)

[Greg Ungerer]

Hi Arnd,

Arnd Bergmann wrote:
> On Wednesday 11 June 2008, Greg Ungerer wrote:
>> Hi Arnd,
>>
>> I have no problem with the m68knommu bits. You can add my:
>>
>> Acked-by: Greg Ungerer <gerg at uclinux.org>
> 
> ok, thanks.
> 
>> By coincidence I have a patch queued up for 2.6.27 that
>> removes the RPX bits from drivers/net/fec.c from Sebastian
>> Siewior. I am happy to drop that if you plan on promoting
>> this "as is".
>  
> If Sebastians patch is doing the same thing, I'd rather drop
> the change from my patch, because I trust his code more than
> mine (having done no testing on it myself).

Ok, I'll keep it, and push it up for 2.6.27.

Regards
Greg



>> Geert Uytterhoeven wrote:
>>> m68knommu is handled by uclinux-dev
>>>
>>> ---------- Forwarded message ----------
>>> Date: Tue, 10 Jun 2008 16:27:06 +0200
>>> From: arnd at arndb.de
>>> To: paulus at samba.org
>>> Cc: linuxppc-dev at vger.kernel.org, Kumar Gala <galak at kernel.crashing.org>,
>>>     linux-input at vger.kernel.org, linux-m68k at vger.kernel.org,
>>>     linux-pcmcia at lists.infradead.org, Vitaly Bordug <vitb at kernel.crashing.org>
>>> Subject: [PATCH 4/5] powerpc: remove references to dead platforms
>>>
>>> The SPRUCE, LOPEC, SANDPOINT, PPC_GEN550 and PPLUS Kconfig
>>> symbols were only defined for platforms in arch/ppc that are
>>> no longer there with arch/powerpc. All compile time
>>> switches based on these symbols can now be removed.
>>>
>>> Cc: linux-input at vger.kernel.org
>>> Cc: linux-m68k at lists.linux-m68k.org
>>> Cc: linux-pcmcia at lists.infradead.org
>>> Cc: Vitaly Bordug <vitb at kernel.crashing.org>
>>> Signed-off-by: Arnd Bergmann <arnd at arndb.de>
>>> ---
>>>  arch/powerpc/Kconfig              |    4 -
>>>  arch/powerpc/Kconfig.debug        |    2 +-
>>>  drivers/ide/pci/sl82c105.c        |    4 -
>>>  drivers/input/serio/i8042-ppcio.h |   75 --------------------
>>>  drivers/net/Kconfig               |    3 +-
>>>  drivers/net/fec.c                 |   35 +---------
>>>  drivers/net/smc91x.h              |   37 +----------
>>>  drivers/pcmcia/m8xx_pcmcia.c      |  136 -------------------------------------
>>>  include/asm-m68knommu/commproc.h  |   58 ----------------
>>>  include/asm-powerpc/ide.h         |   12 ---
>>>  10 files changed, 4 insertions(+), 362 deletions(-)
>>>
>>> diff --git a/drivers/net/fec.c b/drivers/net/fec.c
>>> index 32a4f17..fe28d52 100644
>>> --- a/drivers/net/fec.c
>>> +++ b/drivers/net/fec.c
>>> @@ -67,7 +67,7 @@
>>>  #define	FEC_MAX_PORTS	1
>>>  #endif
>>>  
>>> -#if defined(CONFIG_FADS) || defined(CONFIG_RPXCLASSIC) || defined(CONFIG_M5272)
>>> +#if defined(CONFIG_FADS) || defined(CONFIG_M5272)
>>>  #define HAVE_mii_link_interrupt
>>>  #endif
>>>  
>>> @@ -1235,14 +1235,9 @@ static phy_info_t const * const phy_info[] = {
>>>  
>>>  /* ------------------------------------------------------------------------- */
>>>  #ifdef HAVE_mii_link_interrupt
>>> -#ifdef CONFIG_RPXCLASSIC
>>> -static void
>>> -mii_link_interrupt(void *dev_id);
>>> -#else
>>>  static irqreturn_t
>>>  mii_link_interrupt(int irq, void * dev_id);
>>>  #endif
>>> -#endif
>>>  
>>>  #if defined(CONFIG_M5272)
>>>  /*
>>> @@ -1796,19 +1791,6 @@ static void __inline__ fec_request_intrs(struct net_device *dev)
>>>  	if (request_8xxirq(FEC_INTERRUPT, fec_enet_interrupt, 0, "fec", dev) != 0)
>>>  		panic("Could not allocate FEC IRQ!");
>>>  
>>> -#ifdef CONFIG_RPXCLASSIC
>>> -	/* Make Port C, bit 15 an input that causes interrupts.
>>> -	*/
>>> -	immap->im_ioport.iop_pcpar &= ~0x0001;
>>> -	immap->im_ioport.iop_pcdir &= ~0x0001;
>>> -	immap->im_ioport.iop_pcso &= ~0x0001;
>>> -	immap->im_ioport.iop_pcint |= 0x0001;
>>> -	cpm_install_handler(CPMVEC_PIO_PC15, mii_link_interrupt, dev);
>>> -
>>> -	/* Make LEDS reflect Link status.
>>> -	*/
>>> -	*((uint *) RPX_CSR_ADDR) &= ~BCSR2_FETHLEDMODE;
>>> -#endif
>>>  #ifdef CONFIG_FADS
>>>  	if (request_8xxirq(SIU_IRQ2, mii_link_interrupt, 0, "mii", dev) != 0)
>>>  		panic("Could not allocate MII IRQ!");
>>> @@ -1821,16 +1803,6 @@ static void __inline__ fec_get_mac(struct net_device *dev)
>>>  
>>>  	bd = (bd_t *)__res;
>>>  	memcpy(dev->dev_addr, bd->bi_enetaddr, ETH_ALEN);
>>> -
>>> -#ifdef CONFIG_RPXCLASSIC
>>> -	/* The Embedded Planet boards have only one MAC address in
>>> -	 * the EEPROM, but can have two Ethernet ports.  For the
>>> -	 * FEC port, we create another address by setting one of
>>> -	 * the address bits above something that would have (up to
>>> -	 * now) been allocated.
>>> -	 */
>>> -	dev->dev_adrd[3] |= 0x80;
>>> -#endif
>>>  }
>>>  
>>>  static void __inline__ fec_set_mii(struct net_device *dev, struct fec_enet_private *fep)
>>> @@ -2109,13 +2081,8 @@ mii_discover_phy(uint mii_reg, struct net_device *dev)
>>>  /* This interrupt occurs when the PHY detects a link change.
>>>  */
>>>  #ifdef HAVE_mii_link_interrupt
>>> -#ifdef CONFIG_RPXCLASSIC
>>> -static void
>>> -mii_link_interrupt(void *dev_id)
>>> -#else
>>>  static irqreturn_t
>>>  mii_link_interrupt(int irq, void * dev_id)
>>> -#endif
>>>  {
>>>  	struct	net_device *dev = dev_id;
>>>  	struct fec_enet_private *fep = netdev_priv(dev);
> 

-- 
------------------------------------------------------------------------
Greg Ungerer  --  Chief Software Dude       EMAIL:     gerg at snapgear.com
Secure Computing Corporation                PHONE:       +61 7 3435 2888
825 Stanley St,                             FAX:         +61 7 3891 3630
Woolloongabba, QLD, 4102, Australia         WEB: http://www.SnapGear.com