8035ac0195
This includes: 1. BCM5301X changes from 5.14 and queued 5.15 stuff 2. NSP changes from 5.11 - 5.15 for kernel 5.10 Signed-off-by: Rafał Miłecki <rafal@milecki.pl> (cherry picked from commit bce00f47e5d67e5a33e9d7fa137cbe0a5d3d334b)
27 lines
1004 B
Diff
27 lines
1004 B
Diff
From 8b0235d1deace8f1bd8cdd149d698fee3974fdf4 Mon Sep 17 00:00:00 2001
|
|
From: Florian Fainelli <f.fainelli@gmail.com>
|
|
Date: Mon, 9 Nov 2020 12:06:15 -0800
|
|
Subject: [PATCH 14/16] ARM: dts: NSP: Fix Ethernet switch SGMII register name
|
|
|
|
The register name should be "sgmii_config", not "sgmii", this is not a
|
|
functional change since no code is currently looking for that register
|
|
by name (or at all).
|
|
|
|
Reviewed-by: Vladimir Oltean <olteanv@gmail.com>
|
|
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
|
|
---
|
|
arch/arm/boot/dts/bcm-nsp.dtsi | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
--- a/arch/arm/boot/dts/bcm-nsp.dtsi
|
|
+++ b/arch/arm/boot/dts/bcm-nsp.dtsi
|
|
@@ -388,7 +388,7 @@
|
|
reg = <0x36000 0x1000>,
|
|
<0x3f308 0x8>,
|
|
<0x3f410 0xc>;
|
|
- reg-names = "srab", "mux_config", "sgmii";
|
|
+ reg-names = "srab", "mux_config", "sgmii_config";
|
|
interrupts = <GIC_SPI 95 IRQ_TYPE_LEVEL_HIGH>,
|
|
<GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>,
|
|
<GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>,
|