[for next PATCH 1/1] macb: fix typos in the phy_interface
Sascha Hauer
s.hauer at pengutronix.de
Tue Sep 25 02:31:35 EDT 2012
On Mon, Sep 24, 2012 at 10:08:41PM +0200, Jean-Christophe PLAGNIOL-VILLARD wrote:
> the RMII is set a RGMII and the flags are only check if MII
>
> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj at jcrosoft.com>
Applied, thanks
Sascha
> ---
> drivers/net/macb.c | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/net/macb.c b/drivers/net/macb.c
> index 15548cf..64970ba 100644
> --- a/drivers/net/macb.c
> +++ b/drivers/net/macb.c
> @@ -439,13 +439,13 @@ static int macb_probe(struct device_d *dev)
> macb->miibus.priv = macb;
> macb->miibus.parent = dev;
>
> - if (pdata->flags & AT91SAM_ETHER_RMII) {
> - macb->interface = PHY_INTERFACE_MODE_RGMII;
> - } else {
> + if (pdata->flags & AT91SAM_ETHER_RMII)
> + macb->interface = PHY_INTERFACE_MODE_RMII;
> + else
> macb->interface = PHY_INTERFACE_MODE_MII;
> - macb->phy_flags = pdata->flags & AT91SAM_ETHER_FORCE_LINK ?
> +
> + macb->phy_flags = pdata->flags & AT91SAM_ETHER_FORCE_LINK ?
> PHYLIB_FORCE_LINK : 0;
> - }
>
> macb->rx_buffer = dma_alloc_coherent(CFG_MACB_RX_BUFFER_SIZE);
> macb->rx_ring = dma_alloc_coherent(CFG_MACB_RX_RING_SIZE * sizeof(struct macb_dma_desc));
> --
> 1.7.10.4
>
>
> _______________________________________________
> barebox mailing list
> barebox at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
>
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
More information about the barebox
mailing list