Evolution-X-Devices/kernel_xiaomi_raphael
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "arch: arm64 : boot: dts : Removing mac addr entry"

Browse Source
This commit is contained in:
qctecmdr
2020-08-20 19:36:54 -07:00
committed by Gerrit - the friendly Code Review server
parent 35c46414b2 c000ced869
commit fad95d2d5b
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm64/boot/dts/qcom/qcs405.dtsi
View File

@@ -1642,7 +1642,6 @@
qcom,bus-vector-names = "0", "10", "100", "1000";
snps,tso;
snps,pbl = <32>;
mac-address = [00 55 7B B5 7D f7];
clocks = <&clock_gcc GCC_ETH_AXI_CLK>,
<&clock_gcc GCC_ETH_SLAVE_AHB_CLK>,
<&clock_gcc GCC_ETH_PTP_CLK>,

19
drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
View File

@@ -68,7 +68,7 @@ int stmmac_enable_ipc_low;
char tmp_buff[MAX_PROC_SIZE];
static struct qmp_pkt pkt;
static char qmp_buf[MAX_QMP_MSG_SIZE + 1] = {0};
static struct ip_params pparams = {"", "", "", ""};
static struct ip_params pparams;
static void qcom_ethqos_read_iomacro_por_values(struct qcom_ethqos *ethqos)
{
@@ -2301,8 +2301,9 @@ static void ethqos_is_ipv6_NW_stack_ready(struct work_struct *work)
flush_delayed_work(&ethqos->ipv6_addr_assign_wq);
}
static int ethqos_set_early_eth_param(struct stmmac_priv *priv,
struct qcom_ethqos *ethqos)
static void ethqos_set_early_eth_param(
struct stmmac_priv *priv,
struct qcom_ethqos *ethqos)
{
int ret = 0;
@@ -2329,12 +2330,7 @@ static int ethqos_set_early_eth_param(struct stmmac_priv *priv,
schedule_delayed_work(&ethqos->ipv6_addr_assign_wq,
msecs_to_jiffies(1000));
}
if (pparams.is_valid_mac_addr) {
ether_addr_copy(dev_addr, pparams.mac_addr);
memcpy(priv->dev->dev_addr, dev_addr, ETH_ALEN);
}
return ret;
return;
}
bool qcom_ethqos_ipa_enabled(void)
@@ -2556,6 +2552,11 @@ static int qcom_ethqos_probe(struct platform_device *pdev)
ndev = dev_get_drvdata(&ethqos->pdev->dev);
priv = netdev_priv(ndev);
if (pparams.is_valid_mac_addr) {
ether_addr_copy(dev_addr, pparams.mac_addr);
memcpy(priv->dev->dev_addr, dev_addr, ETH_ALEN);
}
if (ethqos->early_eth_enabled) {
/* Initialize work*/
INIT_WORK(&ethqos->early_eth,