| Message ID | 1478019496-14511-1-git-send-email-fabio.estevam@nxp.com |
|---|---|
| State | Accepted |
| Commit | dac09fc10b71045ac261a9b8a05d34029ebec2ae |
| Delegated to: | Tom Rini |
| Headers | show |
On Tue, Nov 1, 2016 at 11:58 AM, Fabio Estevam <fabio.estevam@nxp.com> wrote: > Since commit ce412b79e7255770 ("drivers: net: phy: atheros: add separate > config for AR8031") ethernet does not work on mx6sabresd. > > This commit correctly assigns ar8031_config() as the configuration > function for AR8031 in the same way as done in the Linux kernel. > > However, on wandboard design we need some additional configuration, > such as enabling the 125 MHz AR8031 output that needs to be done > in the board file. > > This also aligns with the same method that the kernel performs > the AR8031 fixup in arch/arm/mach-imx/mach-imx6q.c. > > Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com> Acked-by: Joe Hershberger <joe.hershberger@ni.com>
Hi Tom, On Tue, Nov 1, 2016 at 2:58 PM, Fabio Estevam <fabio.estevam@nxp.com> wrote: > Since commit ce412b79e7255770 ("drivers: net: phy: atheros: add separate > config for AR8031") ethernet does not work on mx6sabresd. > > This commit correctly assigns ar8031_config() as the configuration > function for AR8031 in the same way as done in the Linux kernel. > > However, on wandboard design we need some additional configuration, > such as enabling the 125 MHz AR8031 output that needs to be done > in the board file. > > This also aligns with the same method that the kernel performs > the AR8031 fixup in arch/arm/mach-imx/mach-imx6q.c. > > Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com> As you picked the similiar patch for sabresd, could you please take this one too?
On Tue, Nov 01, 2016 at 02:58:16PM -0200, Fabio Estevam wrote: > Since commit ce412b79e7255770 ("drivers: net: phy: atheros: add separate > config for AR8031") ethernet does not work on mx6sabresd. > > This commit correctly assigns ar8031_config() as the configuration > function for AR8031 in the same way as done in the Linux kernel. > > However, on wandboard design we need some additional configuration, > such as enabling the 125 MHz AR8031 output that needs to be done > in the board file. > > This also aligns with the same method that the kernel performs > the AR8031 fixup in arch/arm/mach-imx/mach-imx6q.c. > > Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com> > Acked-by: Joe Hershberger <joe.hershberger@ni.com> Applied to u-boot/master, thanks!
diff --git a/board/wandboard/wandboard.c b/board/wandboard/wandboard.c index 1de1e0b..b3f3b34 100644 --- a/board/wandboard/wandboard.c +++ b/board/wandboard/wandboard.c @@ -189,6 +189,39 @@ int board_mmc_init(bd_t *bis) return 0; } +static int ar8031_phy_fixup(struct phy_device *phydev) +{ + unsigned short val; + + /* To enable AR8031 ouput a 125MHz clk from CLK_25M */ + phy_write(phydev, MDIO_DEVAD_NONE, 0xd, 0x7); + phy_write(phydev, MDIO_DEVAD_NONE, 0xe, 0x8016); + phy_write(phydev, MDIO_DEVAD_NONE, 0xd, 0x4007); + + val = phy_read(phydev, MDIO_DEVAD_NONE, 0xe); + val &= 0xffe3; + val |= 0x18; + phy_write(phydev, MDIO_DEVAD_NONE, 0xe, val); + + /* introduce tx clock delay */ + phy_write(phydev, MDIO_DEVAD_NONE, 0x1d, 0x5); + val = phy_read(phydev, MDIO_DEVAD_NONE, 0x1e); + val |= 0x0100; + phy_write(phydev, MDIO_DEVAD_NONE, 0x1e, val); + + return 0; +} + +int board_phy_config(struct phy_device *phydev) +{ + ar8031_phy_fixup(phydev); + + if (phydev->drv->config) + phydev->drv->config(phydev); + + return 0; +} + #if defined(CONFIG_VIDEO_IPUV3) struct i2c_pads_info mx6q_i2c2_pad_info = { .scl = {
Since commit ce412b79e7255770 ("drivers: net: phy: atheros: add separate config for AR8031") ethernet does not work on mx6sabresd. This commit correctly assigns ar8031_config() as the configuration function for AR8031 in the same way as done in the Linux kernel. However, on wandboard design we need some additional configuration, such as enabling the 125 MHz AR8031 output that needs to be done in the board file. This also aligns with the same method that the kernel performs the AR8031 fixup in arch/arm/mach-imx/mach-imx6q.c. Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com> --- board/wandboard/wandboard.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+)