lkml.org 
[lkml]   [2014]   [Apr]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.12 37/40] net: mvneta: rename MVNETA_GMAC2_PSC_ENABLE to MVNETA_GMAC2_PCS_ENABLE
    Date
    From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

    3.12-stable review patch. If anyone has any objections, please let me know.

    ===============

    commit a79121d3b57e7ad61f0b5d23eae05214054f3ccd upstream.

    Bit 3 of the MVNETA_GMAC_CTRL_2 is actually used to enable the PCS,
    not the PSC: there was a typo in the name of the define, which this
    commit fixes.

    Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Jiri Slaby <jslaby@suse.cz>
    ---
    drivers/net/ethernet/marvell/mvneta.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c
    index e35bac7cfdf1..5cdd2b2f18c5 100644
    --- a/drivers/net/ethernet/marvell/mvneta.c
    +++ b/drivers/net/ethernet/marvell/mvneta.c
    @@ -121,7 +121,7 @@
    #define MVNETA_GMAC_MAX_RX_SIZE_MASK 0x7ffc
    #define MVNETA_GMAC0_PORT_ENABLE BIT(0)
    #define MVNETA_GMAC_CTRL_2 0x2c08
    -#define MVNETA_GMAC2_PSC_ENABLE BIT(3)
    +#define MVNETA_GMAC2_PCS_ENABLE BIT(3)
    #define MVNETA_GMAC2_PORT_RGMII BIT(4)
    #define MVNETA_GMAC2_PORT_RESET BIT(6)
    #define MVNETA_GMAC_STATUS 0x2c10
    @@ -688,7 +688,7 @@ static void mvneta_port_sgmii_config(struct mvneta_port *pp)
    u32 val;

    val = mvreg_read(pp, MVNETA_GMAC_CTRL_2);
    - val |= MVNETA_GMAC2_PSC_ENABLE;
    + val |= MVNETA_GMAC2_PCS_ENABLE;
    mvreg_write(pp, MVNETA_GMAC_CTRL_2, val);

    mvreg_write(pp, MVNETA_SGMII_SERDES_CFG, MVNETA_SGMII_SERDES_PROTO);
    --
    1.9.1


    \
     
     \ /
      Last update: 2014-04-02 23:01    [W:4.354 / U:0.240 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site