mirror of
https://git.openwrt.org/openwrt/openwrt.git
synced 2024-06-14 11:13:53 +02:00
e06544bdbe
The change which backported the of_get_mac_address() change broke some
patches in the layerscape target so the patches did not apply any more.
This commit makes them apply again and also fixes some other problems
related to this change.
Fixes commit 91a52f22a1 ("treewide: backport support for nvmem on non platform devices")
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
52 lines
1.9 KiB
Diff
52 lines
1.9 KiB
Diff
From 4fa4a610e4c37741aa1d7763762f2231e4ca1d1d Mon Sep 17 00:00:00 2001
|
|
From: Calvin Johnson <calvin.johnson@nxp.com>
|
|
Date: Fri, 7 Dec 2018 19:30:03 +0530
|
|
Subject: [PATCH] staging: fsl_ppfe/eth: remove unused code
|
|
|
|
- remove gemac-bus-id related code that is unused.
|
|
- remove unused prototype gemac_set_mdc_div.
|
|
|
|
Signed-off-by: Calvin Johnson <calvin.johnson@nxp.com>
|
|
---
|
|
drivers/staging/fsl_ppfe/include/pfe/pfe.h | 1 -
|
|
drivers/staging/fsl_ppfe/pfe_eth.h | 1 -
|
|
drivers/staging/fsl_ppfe/pfe_ls1012a_platform.c | 7 -------
|
|
3 files changed, 9 deletions(-)
|
|
|
|
--- a/drivers/staging/fsl_ppfe/include/pfe/pfe.h
|
|
+++ b/drivers/staging/fsl_ppfe/include/pfe/pfe.h
|
|
@@ -268,7 +268,6 @@ enum mac_loop {LB_NONE, LB_EXT, LB_LOCAL
|
|
void gemac_init(void *base, void *config);
|
|
void gemac_disable_rx_checksum_offload(void *base);
|
|
void gemac_enable_rx_checksum_offload(void *base);
|
|
-void gemac_set_mdc_div(void *base, int mdc_div);
|
|
void gemac_set_speed(void *base, enum mac_speed gem_speed);
|
|
void gemac_set_duplex(void *base, int duplex);
|
|
void gemac_set_mode(void *base, int mode);
|
|
--- a/drivers/staging/fsl_ppfe/pfe_eth.h
|
|
+++ b/drivers/staging/fsl_ppfe/pfe_eth.h
|
|
@@ -41,7 +41,6 @@ struct ls1012a_eth_platform_data {
|
|
u32 mii_config;
|
|
u32 phy_flags;
|
|
u32 gem_id;
|
|
- u32 bus_id;
|
|
u32 phy_id;
|
|
u32 mdio_muxval;
|
|
u8 mac_addr[ETH_ALEN];
|
|
--- a/drivers/staging/fsl_ppfe/pfe_ls1012a_platform.c
|
|
+++ b/drivers/staging/fsl_ppfe/pfe_ls1012a_platform.c
|
|
@@ -50,13 +50,6 @@ static int pfe_get_gemac_if_properties(s
|
|
|
|
of_get_mac_address(gem, pdata->ls1012a_eth_pdata[port].mac_addr);
|
|
|
|
- addr = of_get_property(gem, "fsl,gemac-bus-id", &size);
|
|
- if (!addr)
|
|
- pr_err("%s:%d Invalid gemac-bus-id....\n", __func__,
|
|
- __LINE__);
|
|
- else
|
|
- pdata->ls1012a_eth_pdata[port].bus_id = be32_to_cpup(addr);
|
|
-
|
|
phy_node = of_parse_phandle(gem, "phy-handle", 0);
|
|
pdata->ls1012a_eth_pdata[port].phy_node = phy_node;
|
|
if (phy_node) {
|