bcm53xx: backport DT changes from v6.5

Signed-off-by: Rafał Miłecki <rafal@milecki.pl> (cherry picked from commit 8674b41)
openwrtdiy · Jul 11, 2023 · e3d0c70 · e3d0c70
1 parent 04b4d79
commit e3d0c70
Show file tree

Hide file tree

Showing 25 changed files with 4,636 additions and 11 deletions.
diff --git a/target/linux/bcm53xx/base-files/etc/board.d/02_network b/target/linux/bcm53xx/base-files/etc/board.d/02_network
@@ -53,7 +53,7 @@ bcm53xx_setup_macs()
 		etXmacaddr=$(nvram get et2macaddr)
 		offset=1
 		;;
-	luxul,xwr-3100v1 | \
+	luxul,xwr-3100-v1 | \
 	luxul,xwr-3150-v1)
 		etXmacaddr=$(nvram get et0macaddr)
 		offset=5

diff --git a/target/linux/bcm53xx/base-files/lib/upgrade/platform.sh b/target/linux/bcm53xx/base-files/lib/upgrade/platform.sh
@@ -39,18 +39,18 @@ platform_expected_image() {
 		"dlink,dir-885l")	echo "seamaseal wrgac42_dlink.2015_dir885l"; return;;
 		"luxul,abr-4500-v1")	echo "lxl ABR-4500"; return;;
 		"luxul,xap-810-v1")	echo "lxl XAP-810"; return;;
-		"luxul,xap-1410v1")	echo "lxl XAP-1410"; return;;
+		"luxul,xap-1410-v1")	echo "lxl XAP-1410"; return;;
 		"luxul,xap-1440-v1")	echo "lxl XAP-1440"; return;;
-		"luxul,xap-1510v1")	echo "lxl XAP-1510"; return;;
+		"luxul,xap-1510-v1")	echo "lxl XAP-1510"; return;;
 		"luxul,xap-1610-v1")	echo "lxl XAP-1610"; return;;
 		"luxul,xbr-4500-v1")	echo "lxl XBR-4500"; return;;
 		"luxul,xwc-1000")	echo "lxl XWC-1000"; return;;
 		"luxul,xwc-2000-v1")	echo "lxl XWC-2000"; return;;
-		"luxul,xwr-1200v1")	echo "lxl XWR-1200"; return;;
-		"luxul,xwr-3100v1")	echo "lxl XWR-3100"; return;;
+		"luxul,xwr-1200-v1")	echo "lxl XWR-1200"; return;;
+		"luxul,xwr-3100-v1")	echo "lxl XWR-3100"; return;;
 		"luxul,xwr-3150-v1")	echo "lxl XWR-3150"; return;;
-		"netgear,r6250v1")	echo "chk U12H245T00_NETGEAR"; return;;
-		"netgear,r6300v2")	echo "chk U12H240T00_NETGEAR"; return;;
+		"netgear,r6250-v1")	echo "chk U12H245T00_NETGEAR"; return;;
+		"netgear,r6300-v2")	echo "chk U12H240T00_NETGEAR"; return;;
 		"netgear,r7000")	echo "chk U12H270T00_NETGEAR"; return;;
 		"netgear,r7900")	echo "chk U12H315T30_NETGEAR"; return;;
 		"netgear,r8000")	echo "chk U12H315T00_NETGEAR"; return;;

diff --git a/...Add-devicetree-for-D-Link-DWL-8610A.patch → ...Add-devicetree-for-D-Link-DWL-8610A.patch b/...Add-devicetree-for-D-Link-DWL-8610A.patch → ...Add-devicetree-for-D-Link-DWL-8610A.patch
@@ -21,7 +21,7 @@ Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
 
 --- a/arch/arm/boot/dts/Makefile
 +++ b/arch/arm/boot/dts/Makefile
-@@ -133,6 +133,7 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \
+@@ -132,6 +132,7 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \
  	bcm47094-netgear-r8500.dtb \
  	bcm47094-phicomm-k3.dtb \
  	bcm53015-meraki-mr26.dtb \

diff --git a/...-Add-devicetree-for-D-Link-DIR-890L.patch → ...-Add-devicetree-for-D-Link-DIR-890L.patch b/...-Add-devicetree-for-D-Link-DIR-890L.patch → ...-Add-devicetree-for-D-Link-DIR-890L.patch
diff --git a/...Correct-description-of-TP-Link-part.patch → ...Correct-description-of-TP-Link-part.patch b/...Correct-description-of-TP-Link-part.patch → ...Correct-description-of-TP-Link-part.patch