diff options
author | Scott Roberts <ttocsr@gmail.com> | 2019-09-27 14:19:01 -0600 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2019-10-12 23:43:08 +0200 |
commit | d2a1075973728b55231688809b68a0f0b93c9da4 (patch) | |
tree | aa026543b3be26f0e5b71c4596f9e7a4b440e486 /target/linux/mvebu/patches-4.19/532-net-mvneta-correct-typo.patch | |
parent | e11fc8439c9f7230441408c4d257efc46f372312 (diff) | |
download | upstream-d2a1075973728b55231688809b68a0f0b93c9da4.tar.gz upstream-d2a1075973728b55231688809b68a0f0b93c9da4.tar.bz2 upstream-d2a1075973728b55231688809b68a0f0b93c9da4.zip |
mvebu: backport mvneta and comphy from linux 5.x
These patches backport support for the ARMADA 3700 COMPHY driver.
Also backported is the mvneta driver. This will allow switching
the SGMII speed using SMC calls. To support this you must update
the firmware using Marvells 18.12 version (this has now been
upstreamed). The mvneta driver allows 2500basex and 2500baset.
Signed-off-by: Scott Roberts <ttocsr@gmail.com>
Diffstat (limited to 'target/linux/mvebu/patches-4.19/532-net-mvneta-correct-typo.patch')
-rw-r--r-- | target/linux/mvebu/patches-4.19/532-net-mvneta-correct-typo.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/target/linux/mvebu/patches-4.19/532-net-mvneta-correct-typo.patch b/target/linux/mvebu/patches-4.19/532-net-mvneta-correct-typo.patch new file mode 100644 index 0000000000..bff7621fa4 --- /dev/null +++ b/target/linux/mvebu/patches-4.19/532-net-mvneta-correct-typo.patch @@ -0,0 +1,33 @@ +From fbd1d5245372e48b494120a30fe0b34b304576c4 Mon Sep 17 00:00:00 2001 +From: Alexandre Belloni <alexandre.belloni@bootlin.com> +Date: Fri, 9 Nov 2018 17:37:20 +0100 +Subject: [PATCH] net: mvneta: correct typo + +The reserved variable should be named reserved1. + +Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> +Signed-off-by: David S. Miller <davem@davemloft.net> +--- + 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 +@@ -493,7 +493,7 @@ struct mvneta_port { + #if defined(__LITTLE_ENDIAN) + struct mvneta_tx_desc { + u32 command; /* Options used by HW for packet transmitting.*/ +- u16 reserverd1; /* csum_l4 (for future use) */ ++ u16 reserved1; /* csum_l4 (for future use) */ + u16 data_size; /* Data size of transmitted packet in bytes */ + u32 buf_phys_addr; /* Physical addr of transmitted buffer */ + u32 reserved2; /* hw_cmd - (for future use, PMT) */ +@@ -518,7 +518,7 @@ struct mvneta_rx_desc { + #else + struct mvneta_tx_desc { + u16 data_size; /* Data size of transmitted packet in bytes */ +- u16 reserverd1; /* csum_l4 (for future use) */ ++ u16 reserved1; /* csum_l4 (for future use) */ + u32 command; /* Options used by HW for packet transmitting.*/ + u32 reserved2; /* hw_cmd - (for future use, PMT) */ + u32 buf_phys_addr; /* Physical addr of transmitted buffer */ |