From bcbc73b584e62903dca60763feafb72002fec869 Mon Sep 17 00:00:00 2001 From: lean Date: Thu, 31 Mar 2022 14:39:11 +0800 Subject: [PATCH] ipq806x: backport support for nvmem --- package/qca/nss/qca-nss-gmac/Makefile | 2 +- .../qca-nss-gmac/patches/102-nss-gmac-nvmem.patch | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 package/qca/nss/qca-nss-gmac/patches/102-nss-gmac-nvmem.patch diff --git a/package/qca/nss/qca-nss-gmac/Makefile b/package/qca/nss/qca-nss-gmac/Makefile index 6e00c7a1a..6b9df2218 100644 --- a/package/qca/nss/qca-nss-gmac/Makefile +++ b/package/qca/nss/qca-nss-gmac/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=qca-nss-gmac -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_URL:=https://source.codeaurora.org/quic/qsdk/oss/lklm/nss-gmac PKG_SOURCE_PROTO:=git diff --git a/package/qca/nss/qca-nss-gmac/patches/102-nss-gmac-nvmem.patch b/package/qca/nss/qca-nss-gmac/patches/102-nss-gmac-nvmem.patch new file mode 100644 index 000000000..090baf8e7 --- /dev/null +++ b/package/qca/nss/qca-nss-gmac/patches/102-nss-gmac-nvmem.patch @@ -0,0 +1,13 @@ +--- a/ipq806x/nss_gmac_ctrl.c ++++ b/ipq806x/nss_gmac_ctrl.c +@@ -991,8 +991,8 @@ + pr_err("%s: Can't map interrupt\n", np->name); + return -EFAULT; + } +- maddr = (uint8_t *)of_get_mac_address(np); +- if (!IS_ERR_OR_NULL(maddr)) ++ of_get_mac_address(np, netdev->dev_addr); ++ if (!is_valid_ether_addr(netdev->dev_addr)) + memcpy(gmaccfg->mac_addr, maddr, ETH_ALEN); + + if (of_address_to_resource(np, 0, &memres_devtree) != 0)