kernel: bump 5.4 to 5.4.66
[openwrt/openwrt.git] / target / linux / layerscape / patches-5.4 / 701-net-0316-staging-fsl_ppfe-eth-remove-unused-code.patch
1 From 4fa4a610e4c37741aa1d7763762f2231e4ca1d1d Mon Sep 17 00:00:00 2001
2 From: Calvin Johnson <calvin.johnson@nxp.com>
3 Date: Fri, 7 Dec 2018 19:30:03 +0530
4 Subject: [PATCH] staging: fsl_ppfe/eth: remove unused code
5
6 - remove gemac-bus-id related code that is unused.
7 - remove unused prototype gemac_set_mdc_div.
8
9 Signed-off-by: Calvin Johnson <calvin.johnson@nxp.com>
10 ---
11 drivers/staging/fsl_ppfe/include/pfe/pfe.h | 1 -
12 drivers/staging/fsl_ppfe/pfe_eth.h | 1 -
13 drivers/staging/fsl_ppfe/pfe_ls1012a_platform.c | 7 -------
14 3 files changed, 9 deletions(-)
15
16 --- a/drivers/staging/fsl_ppfe/include/pfe/pfe.h
17 +++ b/drivers/staging/fsl_ppfe/include/pfe/pfe.h
18 @@ -268,7 +268,6 @@ enum mac_loop {LB_NONE, LB_EXT, LB_LOCAL
19 void gemac_init(void *base, void *config);
20 void gemac_disable_rx_checksum_offload(void *base);
21 void gemac_enable_rx_checksum_offload(void *base);
22 -void gemac_set_mdc_div(void *base, int mdc_div);
23 void gemac_set_speed(void *base, enum mac_speed gem_speed);
24 void gemac_set_duplex(void *base, int duplex);
25 void gemac_set_mode(void *base, int mode);
26 --- a/drivers/staging/fsl_ppfe/pfe_eth.h
27 +++ b/drivers/staging/fsl_ppfe/pfe_eth.h
28 @@ -41,7 +41,6 @@ struct ls1012a_eth_platform_data {
29 u32 mii_config;
30 u32 phy_flags;
31 u32 gem_id;
32 - u32 bus_id;
33 u32 phy_id;
34 u32 mdio_muxval;
35 u8 mac_addr[ETH_ALEN];
36 --- a/drivers/staging/fsl_ppfe/pfe_ls1012a_platform.c
37 +++ b/drivers/staging/fsl_ppfe/pfe_ls1012a_platform.c
38 @@ -55,13 +55,6 @@ static int pfe_get_gemac_if_properties(s
39 ETH_ALEN);
40 }
41
42 - addr = of_get_property(gem, "fsl,gemac-bus-id", &size);
43 - if (!addr)
44 - pr_err("%s:%d Invalid gemac-bus-id....\n", __func__,
45 - __LINE__);
46 - else
47 - pdata->ls1012a_eth_pdata[port].bus_id = be32_to_cpup(addr);
48 -
49 phy_node = of_parse_phandle(gem, "phy-handle", 0);
50 pdata->ls1012a_eth_pdata[port].phy_node = phy_node;
51 if (phy_node) {