| Message ID | 1345116320-19826-2-git-send-email-valentin.longchamp@keymile.com |
|---|---|
| State | Superseded |
| Delegated to: | Marek Vasut |
| Headers | show |
> -----Original Message----- > From: Valentin Longchamp [mailto:valentin.longchamp@keymile.com] > Sent: 16 August 2012 16:55 > To: u-boot@lists.denx.de > Cc: holger.brunck@keymile.com; Prafulla Wadaskar; > valentin.longchamp@keymile.com > Subject: [PATCH 1/2] arm/km: add mv88e6352 configuration for kmnusa > > The kmnusa board uses a mv88e6352 switch that is connected to the main > eth interface of the kirkwood. Therefore the switch must be configured > so that the kirkwood's egiga eth inferface can be used. > > Signed-off-by: Valentin Longchamp <valentin.longchamp@keymile.com> > Cc: Holger Brunck <holger.brunck@keymile.com> > Cc: Prafulla Wadaskar <prafulla@marvell.com> > --- > board/keymile/km_arm/km_arm.c | 63 > +++++++++++++++++++++++++++++++++++++++++ > 1 files changed, 63 insertions(+), 0 deletions(-) > > diff --git a/board/keymile/km_arm/km_arm.c > b/board/keymile/km_arm/km_arm.c > index 2b2ca39..c0069c1 100644 > --- a/board/keymile/km_arm/km_arm.c > +++ b/board/keymile/km_arm/km_arm.c > @@ -385,6 +385,69 @@ void reset_phy(void) > /* reset the phy */ > miiphy_reset(name, CONFIG_PHY_BASE_ADR); > } > +#elif defined(CONFIG_KM_PIGGY4_88E6352) > + > +#include <mv88e6352.h> > + > +#if defined(CONFIG_KM_NUSA) > +struct mv88e_sw_reg extsw_conf[] = { > + /* port 0, PIGY4, autoneg */ > + /* first the fix for the 1000Mbits Autoneg, this is from > + * a Marvell errata, the regs are undocumented */ May you please follow standard c-style commenting? Otherwise ack for this patch Regards.. Prafulla . .
On 08/17/2012 09:59 AM, Prafulla Wadaskar wrote: > > >> -----Original Message----- >> From: Valentin Longchamp [mailto:valentin.longchamp@keymile.com] >> Sent: 16 August 2012 16:55 >> To: u-boot@lists.denx.de >> Cc: holger.brunck@keymile.com; Prafulla Wadaskar; >> valentin.longchamp@keymile.com >> Subject: [PATCH 1/2] arm/km: add mv88e6352 configuration for kmnusa >> >> The kmnusa board uses a mv88e6352 switch that is connected to the main >> eth interface of the kirkwood. Therefore the switch must be configured >> so that the kirkwood's egiga eth inferface can be used. >> >> Signed-off-by: Valentin Longchamp <valentin.longchamp@keymile.com> >> Cc: Holger Brunck <holger.brunck@keymile.com> >> Cc: Prafulla Wadaskar <prafulla@marvell.com> >> --- >> board/keymile/km_arm/km_arm.c | 63 >> +++++++++++++++++++++++++++++++++++++++++ >> 1 files changed, 63 insertions(+), 0 deletions(-) >> >> diff --git a/board/keymile/km_arm/km_arm.c >> b/board/keymile/km_arm/km_arm.c >> index 2b2ca39..c0069c1 100644 >> --- a/board/keymile/km_arm/km_arm.c >> +++ b/board/keymile/km_arm/km_arm.c >> @@ -385,6 +385,69 @@ void reset_phy(void) >> /* reset the phy */ >> miiphy_reset(name, CONFIG_PHY_BASE_ADR); >> } >> +#elif defined(CONFIG_KM_PIGGY4_88E6352) >> + >> +#include <mv88e6352.h> >> + >> +#if defined(CONFIG_KM_NUSA) >> +struct mv88e_sw_reg extsw_conf[] = { >> + /* port 0, PIGY4, autoneg */ >> + /* first the fix for the 1000Mbits Autoneg, this is from >> + * a Marvell errata, the regs are undocumented */ > > May you please follow standard c-style commenting? > OK, I will change this comment. Is it OK if I just repost this updated patch as a reply to this message since it's a very minor change or do you need the whole series ? Thanks Valentin
> -----Original Message----- > From: Valentin Longchamp [mailto:valentin.longchamp@keymile.com] > Sent: 17 August 2012 14:13 > To: Prafulla Wadaskar > Cc: u-boot@lists.denx.de; holger.brunck@keymile.com > Subject: Re: [PATCH 1/2] arm/km: add mv88e6352 configuration for > kmnusa > > On 08/17/2012 09:59 AM, Prafulla Wadaskar wrote: > > > > > >> -----Original Message----- > >> From: Valentin Longchamp [mailto:valentin.longchamp@keymile.com] > >> Sent: 16 August 2012 16:55 > >> To: u-boot@lists.denx.de > >> Cc: holger.brunck@keymile.com; Prafulla Wadaskar; > >> valentin.longchamp@keymile.com > >> Subject: [PATCH 1/2] arm/km: add mv88e6352 configuration for kmnusa > >> > >> The kmnusa board uses a mv88e6352 switch that is connected to the > main > >> eth interface of the kirkwood. Therefore the switch must be > configured > >> so that the kirkwood's egiga eth inferface can be used. > >> > >> Signed-off-by: Valentin Longchamp <valentin.longchamp@keymile.com> > >> Cc: Holger Brunck <holger.brunck@keymile.com> > >> Cc: Prafulla Wadaskar <prafulla@marvell.com> > >> --- > >> board/keymile/km_arm/km_arm.c | 63 > >> +++++++++++++++++++++++++++++++++++++++++ > >> 1 files changed, 63 insertions(+), 0 deletions(-) > >> > >> diff --git a/board/keymile/km_arm/km_arm.c > >> b/board/keymile/km_arm/km_arm.c > >> index 2b2ca39..c0069c1 100644 > >> --- a/board/keymile/km_arm/km_arm.c > >> +++ b/board/keymile/km_arm/km_arm.c > >> @@ -385,6 +385,69 @@ void reset_phy(void) > >> /* reset the phy */ > >> miiphy_reset(name, CONFIG_PHY_BASE_ADR); > >> } > >> +#elif defined(CONFIG_KM_PIGGY4_88E6352) > >> + > >> +#include <mv88e6352.h> > >> + > >> +#if defined(CONFIG_KM_NUSA) > >> +struct mv88e_sw_reg extsw_conf[] = { > >> + /* port 0, PIGY4, autoneg */ > >> + /* first the fix for the 1000Mbits Autoneg, this is from > >> + * a Marvell errata, the regs are undocumented */ > > > > May you please follow standard c-style commenting? > > > > OK, I will change this comment. Is it OK if I just repost this updated > patch as > a reply to this message since it's a very minor change or do you need > the whole > series ? I think v2 for this patch only should work. Regards... Prafulla . . .
diff --git a/board/keymile/km_arm/km_arm.c b/board/keymile/km_arm/km_arm.c index 2b2ca39..c0069c1 100644 --- a/board/keymile/km_arm/km_arm.c +++ b/board/keymile/km_arm/km_arm.c @@ -385,6 +385,69 @@ void reset_phy(void) /* reset the phy */ miiphy_reset(name, CONFIG_PHY_BASE_ADR); } +#elif defined(CONFIG_KM_PIGGY4_88E6352) + +#include <mv88e6352.h> + +#if defined(CONFIG_KM_NUSA) +struct mv88e_sw_reg extsw_conf[] = { + /* port 0, PIGY4, autoneg */ + /* first the fix for the 1000Mbits Autoneg, this is from + * a Marvell errata, the regs are undocumented */ + { PHY(0), PHY_PAGE, AN1000FIX_PAGE }, + { PHY(0), PHY_STATUS, AN1000FIX }, + { PHY(0), PHY_PAGE, 0 }, + /* now the real port and phy configuration */ + { PORT(0), PORT_PHY, NO_SPEED_FOR }, + { PORT(0), PORT_CTRL, FORWARDING | EGRS_FLD_ALL }, + { PHY(0), PHY_1000_CTRL, NO_ADV }, + { PHY(0), PHY_SPEC_CTRL, AUTO_MDIX_EN }, + { PHY(0), PHY_CTRL, PHY_100_MBPS | AUTONEG_EN | AUTONEG_RST | + FULL_DUPLEX }, + /* port 1, unused */ + { PORT(1), PORT_CTRL, PORT_DIS }, + { PHY(1), PHY_CTRL, PHY_PWR_DOWN }, + { PHY(1), PHY_SPEC_CTRL, SPEC_PWR_DOWN }, + /* port 2, unused */ + { PORT(2), PORT_CTRL, PORT_DIS }, + { PHY(2), PHY_CTRL, PHY_PWR_DOWN }, + { PHY(2), PHY_SPEC_CTRL, SPEC_PWR_DOWN }, + /* port 3, unused */ + { PORT(3), PORT_CTRL, PORT_DIS }, + { PHY(3), PHY_CTRL, PHY_PWR_DOWN }, + { PHY(3), PHY_SPEC_CTRL, SPEC_PWR_DOWN }, + /* port 4, ICNEV, SerDes, SGMII */ + { PORT(4), PORT_STATUS, NO_PHY_DETECT }, + { PORT(4), PORT_PHY, SPEED_1000_FOR }, + { PORT(4), PORT_CTRL, FORWARDING | EGRS_FLD_ALL }, + { PHY(4), PHY_CTRL, PHY_PWR_DOWN }, + { PHY(4), PHY_SPEC_CTRL, SPEC_PWR_DOWN }, + /* port 5, CPU_RGMII */ + { PORT(5), PORT_PHY, RX_RGMII_TIM | TX_RGMII_TIM | FLOW_CTRL_EN | + FLOW_CTRL_FOR | LINK_VAL | LINK_FOR | FULL_DPX | + FULL_DPX_FOR | SPEED_1000_FOR }, + { PORT(5), PORT_CTRL, FORWARDING | EGRS_FLD_ALL }, + /* port 6, unused, this port has no phy */ + { PORT(6), PORT_CTRL, PORT_DIS }, +}; +#else +struct mv88e_sw_reg extsw_conf[] = {}; +#endif + +void reset_phy(void) +{ +#if defined(CONFIG_KM_MVEXTSW_ADDR) + char *name = "egiga0"; + + if (miiphy_set_current_dev(name)) + return; + + mv88e_sw_program(name, CONFIG_KM_MVEXTSW_ADDR, extsw_conf, + ARRAY_SIZE(extsw_conf)); + mv88e_sw_reset(name, CONFIG_KM_MVEXTSW_ADDR); +#endif +} + #else /* Configure and enable MV88E1118 PHY on the piggy*/ void reset_phy(void)
The kmnusa board uses a mv88e6352 switch that is connected to the main eth interface of the kirkwood. Therefore the switch must be configured so that the kirkwood's egiga eth inferface can be used. Signed-off-by: Valentin Longchamp <valentin.longchamp@keymile.com> Cc: Holger Brunck <holger.brunck@keymile.com> Cc: Prafulla Wadaskar <prafulla@marvell.com> --- board/keymile/km_arm/km_arm.c | 63 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 63 insertions(+), 0 deletions(-)