3.10-stable patches

added patches:
	net-mvneta-rename-mvneta_gmac2_psc_enable-to-mvneta_gmac2_pcs_enable.patch

diff --git a/queue-3.10/net-mvneta-rename-mvneta_gmac2_psc_enable-to-mvneta_gmac2_pcs_enable.patch b/queue-3.10/net-mvneta-rename-mvneta_gmac2_psc_enable-to-mvneta_gmac2_pcs_enable.patch
new file mode 100644 (file)
index 0000000..c323a57
--- /dev/null
+++ b/queue-3.10/net-mvneta-rename-mvneta_gmac2_psc_enable-to-mvneta_gmac2_pcs_enable.patch
@@ -0,0 +1,41 @@
+From a79121d3b57e7ad61f0b5d23eae05214054f3ccd Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Wed, 26 Mar 2014 00:25:41 +0100
+Subject: net: mvneta: rename MVNETA_GMAC2_PSC_ENABLE to MVNETA_GMAC2_PCS_ENABLE
+
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/net/ethernet/marvell/mvneta.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/drivers/net/ethernet/marvell/mvneta.c
++++ b/drivers/net/ethernet/marvell/mvneta.c
+@@ -119,7 +119,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
+@@ -655,7 +655,7 @@ static void mvneta_port_sgmii_config(str
+       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);
+ }
+ 

diff --git a/queue-3.10/series b/queue-3.10/series
index 65753eed22d2a327fdc74fe30e713799d803a757..b88d8fd32879cc3793345cb824d233d379efa7bc 100644 (file)
--- a/queue-3.10/series
+++ b/queue-3.10/series
@@ -4,3 +4,4 @@ input-synaptics-add-manual-min-max-quirk.patch
 input-synaptics-add-manual-min-max-quirk-for-thinkpad-x240.patch
 input-cypress_ps2-don-t-report-as-a-button-pads.patch
 x86-fix-boot-on-uniprocessor-systems.patch
+net-mvneta-rename-mvneta_gmac2_psc_enable-to-mvneta_gmac2_pcs_enable.patch