All patches automatically rebased.
Build system: x86_64
Build-tested: ramips/mt7621*
*FS#4149 affects me so I had to revert 7f1edbd412
in order to downgrade to 2.35.1
Signed-off-by: John Audia <graysky@archlinux.us>
		
	
		
			
				
	
	
		
			83 lines
		
	
	
		
			2.8 KiB
		
	
	
	
		
			Diff
		
	
	
	
	
	
			
		
		
	
	
			83 lines
		
	
	
		
			2.8 KiB
		
	
	
	
		
			Diff
		
	
	
	
	
	
From 953efcb0c0234f8c488ebd4090378e949d6ba78b Mon Sep 17 00:00:00 2001
 | 
						|
From: Florian Fainelli <f.fainelli@gmail.com>
 | 
						|
Date: Mon, 9 Nov 2020 16:42:09 -0800
 | 
						|
Subject: [PATCH] ARM: dts: BCM5301X: Add a default compatible for switch node
 | 
						|
MIME-Version: 1.0
 | 
						|
Content-Type: text/plain; charset=UTF-8
 | 
						|
Content-Transfer-Encoding: 8bit
 | 
						|
 | 
						|
Provide a default compatible string which is based on the 53011 SRAB
 | 
						|
compatible by default. The 4709 and 47094 default to the 53012 SRAB
 | 
						|
compatible.
 | 
						|
 | 
						|
This allows us to have sane defaults and silences the following
 | 
						|
warnings:
 | 
						|
 | 
						|
arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dt.yaml:
 | 
						|
ethernet-switch@18007000: compatible: 'oneOf' conditional failed, one
 | 
						|
must be fixed:
 | 
						|
        ['brcm,bcm5301x-srab'] is too short
 | 
						|
        'brcm,bcm5325' was expected
 | 
						|
        'brcm,bcm53115' was expected
 | 
						|
        'brcm,bcm53125' was expected
 | 
						|
        'brcm,bcm53128' was expected
 | 
						|
        'brcm,bcm5365' was expected
 | 
						|
        'brcm,bcm5395' was expected
 | 
						|
        'brcm,bcm5389' was expected
 | 
						|
        'brcm,bcm5397' was expected
 | 
						|
        'brcm,bcm5398' was expected
 | 
						|
        'brcm,bcm11360-srab' was expected
 | 
						|
        'brcm,bcm5301x-srab' is not one of ['brcm,bcm53010-srab',
 | 
						|
'brcm,bcm53011-srab', 'brcm,bcm53012-srab', 'brcm,bcm53018-srab',
 | 
						|
'brcm,bcm53019-srab']
 | 
						|
        'brcm,bcm5301x-srab' is not one of ['brcm,bcm11404-srab',
 | 
						|
'brcm,bcm11407-srab', 'brcm,bcm11409-srab', 'brcm,bcm58310-srab',
 | 
						|
'brcm,bcm58311-srab', 'brcm,bcm58313-srab']
 | 
						|
        'brcm,bcm5301x-srab' is not one of ['brcm,bcm58522-srab',
 | 
						|
'brcm,bcm58523-srab', 'brcm,bcm58525-srab', 'brcm,bcm58622-srab',
 | 
						|
'brcm,bcm58623-srab', 'brcm,bcm58625-srab', 'brcm,bcm88312-srab']
 | 
						|
        'brcm,bcm5301x-srab' is not one of ['brcm,bcm3384-switch',
 | 
						|
'brcm,bcm6328-switch', 'brcm,bcm6368-switch']
 | 
						|
        From schema:
 | 
						|
Documentation/devicetree/bindings/net/dsa/b53.yaml
 | 
						|
 | 
						|
Acked-by: Rafał Miłecki <rafal@milecki.pl>
 | 
						|
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
 | 
						|
---
 | 
						|
 arch/arm/boot/dts/bcm4709.dtsi  | 4 ++++
 | 
						|
 arch/arm/boot/dts/bcm47094.dtsi | 4 ++++
 | 
						|
 arch/arm/boot/dts/bcm5301x.dtsi | 2 +-
 | 
						|
 3 files changed, 9 insertions(+), 1 deletion(-)
 | 
						|
 | 
						|
--- a/arch/arm/boot/dts/bcm4709.dtsi
 | 
						|
+++ b/arch/arm/boot/dts/bcm4709.dtsi
 | 
						|
@@ -9,3 +9,7 @@
 | 
						|
 	clock-frequency = <125000000>;
 | 
						|
 	status = "okay";
 | 
						|
 };
 | 
						|
+
 | 
						|
+&srab {
 | 
						|
+	compatible = "brcm,bcm53012-srab", "brcm,bcm5301x-srab";
 | 
						|
+};
 | 
						|
--- a/arch/arm/boot/dts/bcm47094.dtsi
 | 
						|
+++ b/arch/arm/boot/dts/bcm47094.dtsi
 | 
						|
@@ -25,3 +25,7 @@
 | 
						|
 	clock-frequency = <125000000>;
 | 
						|
 	status = "okay";
 | 
						|
 };
 | 
						|
+
 | 
						|
+&srab {
 | 
						|
+	compatible = "brcm,bcm53012-srab", "brcm,bcm5301x-srab";
 | 
						|
+};
 | 
						|
--- a/arch/arm/boot/dts/bcm5301x.dtsi
 | 
						|
+++ b/arch/arm/boot/dts/bcm5301x.dtsi
 | 
						|
@@ -486,7 +486,7 @@
 | 
						|
 	};
 | 
						|
 
 | 
						|
 	srab: ethernet-switch@18007000 {
 | 
						|
-		compatible = "brcm,bcm5301x-srab";
 | 
						|
+		compatible = "brcm,bcm53011-srab", "brcm,bcm5301x-srab";
 | 
						|
 		reg = <0x18007000 0x1000>;
 | 
						|
 
 | 
						|
 		status = "disabled";
 |