bce00f47e5
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>
114 lines
2.6 KiB
Diff
114 lines
2.6 KiB
Diff
From 091a12b1814142eac16a115dab206f735b5476a9 Mon Sep 17 00:00:00 2001
|
|
From: Matthew Hagan <mnhagan88@gmail.com>
|
|
Date: Sun, 13 Jun 2021 10:46:34 +0100
|
|
Subject: [PATCH] ARM: dts: NSP: disable qspi node by default
|
|
|
|
The QSPI bus is enabled by default, however this may not used on all
|
|
devices. This patch disables by default, requiring it to be explicitly
|
|
enabled where required.
|
|
|
|
Signed-off-by: Matthew Hagan <mnhagan88@gmail.com>
|
|
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
|
|
---
|
|
arch/arm/boot/dts/bcm-nsp.dtsi | 1 +
|
|
arch/arm/boot/dts/bcm958522er.dts | 1 +
|
|
arch/arm/boot/dts/bcm958525er.dts | 1 +
|
|
arch/arm/boot/dts/bcm958525xmc.dts | 1 +
|
|
arch/arm/boot/dts/bcm958622hr.dts | 1 +
|
|
arch/arm/boot/dts/bcm958623hr.dts | 1 +
|
|
arch/arm/boot/dts/bcm958625hr.dts | 1 +
|
|
arch/arm/boot/dts/bcm958625k.dts | 1 +
|
|
arch/arm/boot/dts/bcm988312hr.dts | 1 +
|
|
9 files changed, 9 insertions(+)
|
|
|
|
--- a/arch/arm/boot/dts/bcm-nsp.dtsi
|
|
+++ b/arch/arm/boot/dts/bcm-nsp.dtsi
|
|
@@ -310,6 +310,7 @@
|
|
num-cs = <2>;
|
|
#address-cells = <1>;
|
|
#size-cells = <0>;
|
|
+ status = "disabled";
|
|
};
|
|
|
|
xhci: usb@29000 {
|
|
--- a/arch/arm/boot/dts/bcm958522er.dts
|
|
+++ b/arch/arm/boot/dts/bcm958522er.dts
|
|
@@ -134,6 +134,7 @@
|
|
};
|
|
|
|
&qspi {
|
|
+ status = "okay";
|
|
bspi-sel = <0>;
|
|
flash: m25p80@0 {
|
|
#address-cells = <1>;
|
|
--- a/arch/arm/boot/dts/bcm958525er.dts
|
|
+++ b/arch/arm/boot/dts/bcm958525er.dts
|
|
@@ -134,6 +134,7 @@
|
|
};
|
|
|
|
&qspi {
|
|
+ status = "okay";
|
|
bspi-sel = <0>;
|
|
flash: m25p80@0 {
|
|
#address-cells = <1>;
|
|
--- a/arch/arm/boot/dts/bcm958525xmc.dts
|
|
+++ b/arch/arm/boot/dts/bcm958525xmc.dts
|
|
@@ -150,6 +150,7 @@
|
|
};
|
|
|
|
&qspi {
|
|
+ status = "okay";
|
|
bspi-sel = <0>;
|
|
flash: m25p80@0 {
|
|
#address-cells = <1>;
|
|
--- a/arch/arm/boot/dts/bcm958622hr.dts
|
|
+++ b/arch/arm/boot/dts/bcm958622hr.dts
|
|
@@ -138,6 +138,7 @@
|
|
};
|
|
|
|
&qspi {
|
|
+ status = "okay";
|
|
bspi-sel = <0>;
|
|
flash: m25p80@0 {
|
|
#address-cells = <1>;
|
|
--- a/arch/arm/boot/dts/bcm958623hr.dts
|
|
+++ b/arch/arm/boot/dts/bcm958623hr.dts
|
|
@@ -142,6 +142,7 @@
|
|
};
|
|
|
|
&qspi {
|
|
+ status = "okay";
|
|
bspi-sel = <0>;
|
|
flash: m25p80@0 {
|
|
#address-cells = <1>;
|
|
--- a/arch/arm/boot/dts/bcm958625hr.dts
|
|
+++ b/arch/arm/boot/dts/bcm958625hr.dts
|
|
@@ -149,6 +149,7 @@
|
|
};
|
|
|
|
&qspi {
|
|
+ status = "okay";
|
|
bspi-sel = <0>;
|
|
flash: m25p80@0 {
|
|
#address-cells = <1>;
|
|
--- a/arch/arm/boot/dts/bcm958625k.dts
|
|
+++ b/arch/arm/boot/dts/bcm958625k.dts
|
|
@@ -153,6 +153,7 @@
|
|
};
|
|
|
|
&qspi {
|
|
+ status = "okay";
|
|
bspi-sel = <0>;
|
|
flash: m25p80@0 {
|
|
#address-cells = <1>;
|
|
--- a/arch/arm/boot/dts/bcm988312hr.dts
|
|
+++ b/arch/arm/boot/dts/bcm988312hr.dts
|
|
@@ -138,6 +138,7 @@
|
|
};
|
|
|
|
&qspi {
|
|
+ status = "okay";
|
|
bspi-sel = <0>;
|
|
flash: m25p80@0 {
|
|
#address-cells = <1>;
|