Patchwork Allow selecting mv643xx_eth on Pegasos again

login
register
mail settings
Submitter Gabriel Paubert
Date May 15, 2009, 6:18 p.m.
Message ID <20090515181813.GA28132@iram.es>
Download mbox | patch
Permalink /patch/27274/
State Changes Requested, archived
Headers show

Comments

Gabriel Paubert - May 15, 2009, 6:18 p.m.
Since PPC_MUTIPLATFORM was removed, it was impossible to select the
driver for mv643xx_eth on the Pegasos. Fix by allowing to select
the driver on CHRP platforms; Pegasos is a CHRP platform and the driver
will not work wihtout arch/powerpc/platforms/chrp/pegasos_eth.

The patch also removes all references to MV64360 config option which 
no more exists.

Signed-off-by: Gabriel Paubert <paubert@iram.es>
Benjamin Herrenschmidt - May 18, 2009, 3:24 a.m.
On Fri, 2009-05-15 at 20:18 +0200, Gabriel Paubert wrote:
> Since PPC_MUTIPLATFORM was removed, it was impossible to select the
> driver for mv643xx_eth on the Pegasos. Fix by allowing to select
> the driver on CHRP platforms; Pegasos is a CHRP platform and the driver
> will not work wihtout arch/powerpc/platforms/chrp/pegasos_eth.
> 
> The patch also removes all references to MV64360 config option which 
> no more exists.
> 
> Signed-off-by: Gabriel Paubert <paubert@iram.es> 

Please break that up into 2 different patches. The arch/powerpc one that
removes the reference from IRQ_ALL_CPUs and the drivers/net/ one which
should be set to the netdev mailing list.

Thanks !

Cheers,
Ben.

> diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
> index a0d1146..1dfeb62 100644
> --- a/arch/powerpc/Kconfig
> +++ b/arch/powerpc/Kconfig
> @@ -360,7 +360,7 @@ config PPCBUG_NVRAM
>  
>  config IRQ_ALL_CPUS
>  	bool "Distribute interrupts on all CPUs by default"
> -	depends on SMP && !MV64360
> +	depends on SMP 
>  	help
>  	  This option gives the kernel permission to distribute IRQs across
>  	  multiple CPUs.  Saying N here will route all IRQs to the first
> diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
> index 214a92d..6fc0ff4 100644
> --- a/drivers/net/Kconfig
> +++ b/drivers/net/Kconfig
> @@ -2351,7 +2351,7 @@ config UGETH_TX_ON_DEMAND
>  
>  config MV643XX_ETH
>  	tristate "Marvell Discovery (643XX) and Orion ethernet support"
> -	depends on MV64360 || MV64X60 || (PPC_MULTIPLATFORM && PPC32) || PLAT_ORION
> +	depends on MV64X60 || PPC_CHRP || PLAT_ORION
>  	select INET_LRO
>  	select PHYLIB
>  	help
Gabriel Paubert - May 18, 2009, 5:33 p.m.
On Mon, May 18, 2009 at 01:24:49PM +1000, Benjamin Herrenschmidt wrote:
> On Fri, 2009-05-15 at 20:18 +0200, Gabriel Paubert wrote:
> > Since PPC_MUTIPLATFORM was removed, it was impossible to select the
> > driver for mv643xx_eth on the Pegasos. Fix by allowing to select
> > the driver on CHRP platforms; Pegasos is a CHRP platform and the driver
> > will not work wihtout arch/powerpc/platforms/chrp/pegasos_eth.
> > 
> > The patch also removes all references to MV64360 config option which 
> > no more exists.
> > 
> > Signed-off-by: Gabriel Paubert <paubert@iram.es> 
> 
> Please break that up into 2 different patches. The arch/powerpc one that
> removes the reference from IRQ_ALL_CPUs and the drivers/net/ one which
> should be set to the netdev mailing list.
> 

Ok, but I have a doubt about the PPC one, should MV64360 be removed or
changed to MV64X60?

In any case, I can't test it.

	Gabriel

Patch

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index a0d1146..1dfeb62 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -360,7 +360,7 @@  config PPCBUG_NVRAM
 
 config IRQ_ALL_CPUS
 	bool "Distribute interrupts on all CPUs by default"
-	depends on SMP && !MV64360
+	depends on SMP 
 	help
 	  This option gives the kernel permission to distribute IRQs across
 	  multiple CPUs.  Saying N here will route all IRQs to the first
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 214a92d..6fc0ff4 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -2351,7 +2351,7 @@  config UGETH_TX_ON_DEMAND
 
 config MV643XX_ETH
 	tristate "Marvell Discovery (643XX) and Orion ethernet support"
-	depends on MV64360 || MV64X60 || (PPC_MULTIPLATFORM && PPC32) || PLAT_ORION
+	depends on MV64X60 || PPC_CHRP || PLAT_ORION
 	select INET_LRO
 	select PHYLIB
 	help