kernel: bump 5.4 to 5.4.111
[openwrt/openwrt.git] / target / linux / layerscape / patches-5.4 / 701-net-0312-staging-fsl_ppfe-eth-misc-clean-up.patch
1 From 508121cfde12d0e35716bb7e524dc1f80c82262c Mon Sep 17 00:00:00 2001
2 From: Calvin Johnson <calvin.johnson@nxp.com>
3 Date: Tue, 20 Nov 2018 21:50:40 +0530
4 Subject: [PATCH] staging: fsl_ppfe/eth: misc clean up
5
6 - remove redundant hwfeature init
7 - remove unused vars from ls1012a_eth_platform_data
8 - To handle ls1012a errata_a010897, PPFE driver requires GUTS driver
9 to be compiled in. Select FSL_GUTS when PPFE driver is compiled.
10
11 Signed-off-by: Calvin Johnson <calvin.johnson@nxp.com>
12 ---
13 drivers/staging/fsl_ppfe/Kconfig | 1 +
14 drivers/staging/fsl_ppfe/pfe_eth.c | 3 ---
15 drivers/staging/fsl_ppfe/pfe_eth.h | 4 ----
16 3 files changed, 1 insertion(+), 7 deletions(-)
17
18 --- a/drivers/staging/fsl_ppfe/Kconfig
19 +++ b/drivers/staging/fsl_ppfe/Kconfig
20 @@ -3,6 +3,7 @@
21 #
22 config FSL_PPFE
23 bool "Freescale PPFE Driver"
24 + select FSL_GUTS
25 default n
26 ---help---
27 Freescale LS1012A SoC has a Programmable Packet Forwarding Engine.
28 --- a/drivers/staging/fsl_ppfe/pfe_eth.c
29 +++ b/drivers/staging/fsl_ppfe/pfe_eth.c
30 @@ -2437,9 +2437,6 @@ static int pfe_eth_init_one(struct pfe *
31 else
32 ndev->max_mtu = JUMBO_FRAME_SIZE_V2 - ETH_HLEN - ETH_FCS_LEN;
33
34 - /* supported features */
35 - ndev->hw_features = NETIF_F_SG;
36 -
37 /*Enable after checksum offload is validated */
38 ndev->hw_features = NETIF_F_RXCSUM | NETIF_F_IP_CSUM |
39 NETIF_F_IPV6_CSUM | NETIF_F_SG;
40 --- a/drivers/staging/fsl_ppfe/pfe_eth.h
41 +++ b/drivers/staging/fsl_ppfe/pfe_eth.h
42 @@ -37,10 +37,6 @@
43 #define GEMAC_NO_PHY BIT(0)
44
45 struct ls1012a_eth_platform_data {
46 - /* device specific information */
47 - u32 device_flags;
48 - char name[16];
49 -
50 /* board specific information */
51 u32 mii_config;
52 u32 phy_flags;