[PATCH 6/6] PowerPC 440EPx: Sequoia new EMAC support

[PATCH 6/6] PowerPC 440EPx: Sequoia new EMAC support

[Valentine Barshak]

The patch adds PHY support for the Sequoia board to the new EMAC driver and
enables NEW_EMAC for 440EPx Kconfig.
The phy code has been written by Stefan Roese.
This has been tested with the following version of the EMAC dirver:

http://ozlabs.org/~dgibson/home/emac/powerpc-emac-new-20070516.patch

Signed-off-by: Stefan Roese <sr@denx.de>
Signed-off-by: Valentine Barshak <vbarshak@ru.mvista.com>
---
 arch/powerpc/platforms/44x/Kconfig |    5 +---
 drivers/net/ibm_newemac/phy.c      |   39 +++++++++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+), 3 deletions(-)

--- linux.orig/arch/powerpc/platforms/44x/Kconfig	2007-07-30 15:05:50.000000000 +0400
+++ linux/arch/powerpc/platforms/44x/Kconfig	2007-07-30 17:59:05.000000000 +0400
@@ -47,9 +47,8 @@
 config 440EPX
 	bool
 	select PPC_FPU
-# Disabled until the new EMAC Driver is merged.
-#	select IBM_NEW_EMAC_EMAC4
-#	select IBM_NEW_EMAC_ZMII
+	select IBM_NEW_EMAC_EMAC4
+	select IBM_NEW_EMAC_ZMII
 
 config 440GP
 	bool
--- linux.orig/drivers/net/ibm_newemac/phy.c	2007-06-15 21:45:18.000000000 +0400
+++ linux/drivers/net/ibm_newemac/phy.c	2007-06-15 20:45:15.000000000 +0400
@@ -306,8 +306,47 @@
 	.ops		= &cis8201_phy_ops
 };
 
+static struct mii_phy_def bcm5248_phy_def = {
+
+	.phy_id		= 0x0143bc00,
+	.phy_id_mask	= 0x0ffffff0,
+	.name		= "BCM5248 10/100 SMII Ethernet",
+	.ops		= &generic_phy_ops
+};
+
+static int m88e1111_init(struct mii_phy *phy)
+{
+	printk("%s: Marvell 88E1111 Ethernet\n", __FUNCTION__);
+	phy_write(phy, 0x14, 0x0ce3);
+	phy_write(phy, 0x18, 0x4101);
+	phy_write(phy, 0x09, 0x0e00);
+	phy_write(phy, 0x04, 0x01e1);
+	phy_write(phy, 0x00, 0x9140);
+	phy_write(phy, 0x00, 0x1140);
+
+	return  0;
+}
+
+static struct mii_phy_ops m88e1111_phy_ops = {
+	.init		= m88e1111_init,
+	.setup_aneg	= genmii_setup_aneg,
+	.setup_forced	= genmii_setup_forced,
+	.poll_link	= genmii_poll_link,
+	.read_link	= genmii_read_link
+};
+
+static struct mii_phy_def m88e1111_phy_def = {
+
+	.phy_id		= 0x01410CC0,
+	.phy_id_mask	= 0x0ffffff0,
+	.name		= "Marvell 88E1111 Ethernet",
+	.ops		= &m88e1111_phy_ops,
+};
+
 static struct mii_phy_def *mii_phy_table[] = {
 	&cis8201_phy_def,
+	&bcm5248_phy_def,
+	&m88e1111_phy_def,
 	&genmii_phy_def,
 	NULL
 };

Re: [PATCH 6/6] PowerPC 440EPx: Sequoia new EMAC support

[Josh Boyer]

On Mon, 30 Jul 2007 19:23:39 +0400
Valentine Barshak <vbarshak@ru.mvista.com> wrote:

> The patch adds PHY support for the Sequoia board to the new EMAC driver and
> enables NEW_EMAC for 440EPx Kconfig.
> The phy code has been written by Stefan Roese.
> This has been tested with the following version of the EMAC dirver:
> 
> http://ozlabs.org/~dgibson/home/emac/powerpc-emac-new-20070516.patch
> 
> Signed-off-by: Stefan Roese <sr@denx.de>
> Signed-off-by: Valentine Barshak <vbarshak@ru.mvista.com>
> ---
>  arch/powerpc/platforms/44x/Kconfig |    5 +---
>  drivers/net/ibm_newemac/phy.c      |   39 +++++++++++++++++++++++++++++++++++++
>  2 files changed, 41 insertions(+), 3 deletions(-)
> 
> --- linux.orig/arch/powerpc/platforms/44x/Kconfig	2007-07-30 15:05:50.000000000 +0400
> +++ linux/arch/powerpc/platforms/44x/Kconfig	2007-07-30 17:59:05.000000000 +0400
> @@ -47,9 +47,8 @@
>  config 440EPX
>  	bool
>  	select PPC_FPU
> -# Disabled until the new EMAC Driver is merged.
> -#	select IBM_NEW_EMAC_EMAC4
> -#	select IBM_NEW_EMAC_ZMII
> +	select IBM_NEW_EMAC_EMAC4
> +	select IBM_NEW_EMAC_ZMII

Probably don't want this bit yet.  The EMAC driver isn't really merged
yet.

josh

Re: [PATCH 6/6] PowerPC 440EPx: Sequoia new EMAC support

[Valentine Barshak]

Josh Boyer wrote:
> On Mon, 30 Jul 2007 19:23:39 +0400
> Valentine Barshak <vbarshak@ru.mvista.com> wrote:
> 
>> The patch adds PHY support for the Sequoia board to the new EMAC driver and
>> enables NEW_EMAC for 440EPx Kconfig.
>> The phy code has been written by Stefan Roese.
>> This has been tested with the following version of the EMAC dirver:
>>
>> http://ozlabs.org/~dgibson/home/emac/powerpc-emac-new-20070516.patch
>>
>> Signed-off-by: Stefan Roese <sr@denx.de>
>> Signed-off-by: Valentine Barshak <vbarshak@ru.mvista.com>
>> ---
>>  arch/powerpc/platforms/44x/Kconfig |    5 +---
>>  drivers/net/ibm_newemac/phy.c      |   39 +++++++++++++++++++++++++++++++++++++
>>  2 files changed, 41 insertions(+), 3 deletions(-)
>>
>> --- linux.orig/arch/powerpc/platforms/44x/Kconfig	2007-07-30 15:05:50.000000000 +0400
>> +++ linux/arch/powerpc/platforms/44x/Kconfig	2007-07-30 17:59:05.000000000 +0400
>> @@ -47,9 +47,8 @@
>>  config 440EPX
>>  	bool
>>  	select PPC_FPU
>> -# Disabled until the new EMAC Driver is merged.
>> -#	select IBM_NEW_EMAC_EMAC4
>> -#	select IBM_NEW_EMAC_ZMII
>> +	select IBM_NEW_EMAC_EMAC4
>> +	select IBM_NEW_EMAC_ZMII
> 
> Probably don't want this bit yet.  The EMAC driver isn't really merged
> yet.
> 
> josh

Actually, this one is intended for use as a separate Sequoia emac 
support patch until new emac is merged. May be I should submit it 
separately, not with the whole Sequoia bundle.