File ARM-dts-bcm27xx-Use-better-name-for-spidev.patch of Package raspberrypi-firmware-dt.29881
From e3c103f96d56193c0a20af0a7844b6c3d8ca2070 Mon Sep 17 00:00:00 2001
From: "Ivan T. Ivanov" <iivanov@suse.de>
Date: Mon, 17 Jul 2023 17:38:31 +0300
Subject: [PATCH] ARM: dts: bcm27xx: Use better name for spidev
Since this patch [1] 'spidev' compatible strings can not be used to auto bind
to spidev module. Aparently upstream don not want these to used anymore.
Vendor linux tree, from where we are geting thse Device Tree files, still
support this becase it have this [2] patch.
Lets follow upstream descision even if we slighly diverge from the Vendor
Device Tree sources.
[1] fffc84fd87d9 ("spi: spidev: Make probe to fail early if a spidev compatible is used")
[2] 0dd30794bd79 ("spi: spidev: Restore loading from Device Tree")
This fixes bsc#1212791
Signed-off-by: Ivan T. Ivanov <iivanov@suse.de>
---
arch/arm/boot/dts/bcm2708-rpi-b-plus.dts | 4 ++--
arch/arm/boot/dts/bcm2708-rpi-b-rev1.dts | 4 ++--
arch/arm/boot/dts/bcm2708-rpi-b.dts | 4 ++--
arch/arm/boot/dts/bcm2708-rpi-cm.dts | 4 ++--
arch/arm/boot/dts/bcm2708-rpi-zero-w.dts | 4 ++--
arch/arm/boot/dts/bcm2708-rpi-zero.dts | 4 ++--
arch/arm/boot/dts/bcm2709-rpi-2-b.dts | 4 ++--
arch/arm/boot/dts/bcm2710-rpi-2-b.dts | 4 ++--
arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts | 4 ++--
arch/arm/boot/dts/bcm2710-rpi-3-b.dts | 4 ++--
arch/arm/boot/dts/bcm2710-rpi-cm3.dts | 4 ++--
arch/arm/boot/dts/bcm2710-rpi-zero-2-w.dts | 4 ++--
arch/arm/boot/dts/bcm2711-rpi-4-b.dts | 4 ++--
arch/arm/boot/dts/bcm2711-rpi-400.dts | 4 ++--
arch/arm/boot/dts/bcm2711-rpi-cm4.dts | 4 ++--
15 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts b/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts
index 2320c4a..3a596f6 100644
--- a/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts
+++ b/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts
@@ -120,7 +120,7 @@
cs-gpios = <&gpio 8 1>, <&gpio 7 1>;
spidev0: spidev@0{
- compatible = "spidev";
+ compatible = "rohm,dh2228fv";
reg = <0>; /* CE0 */
#address-cells = <1>;
#size-cells = <0>;
@@ -128,7 +128,7 @@
};
spidev1: spidev@1{
- compatible = "spidev";
+ compatible = "rohm,dh2228fv";
reg = <1>; /* CE1 */
#address-cells = <1>;
#size-cells = <0>;
diff --git a/arch/arm/boot/dts/bcm2708-rpi-b-rev1.dts b/arch/arm/boot/dts/bcm2708-rpi-b-rev1.dts
index 2081cc3..7a398fe 100644
--- a/arch/arm/boot/dts/bcm2708-rpi-b-rev1.dts
+++ b/arch/arm/boot/dts/bcm2708-rpi-b-rev1.dts
@@ -120,7 +120,7 @@
cs-gpios = <&gpio 8 1>, <&gpio 7 1>;
spidev0: spidev@0{
- compatible = "spidev";
+ compatible = "rohm,dh2228fv";
reg = <0>; /* CE0 */
#address-cells = <1>;
#size-cells = <0>;
@@ -128,7 +128,7 @@
};
spidev1: spidev@1{
- compatible = "spidev";
+ compatible = "rohm,dh2228fv";
reg = <1>; /* CE1 */
#address-cells = <1>;
#size-cells = <0>;
diff --git a/arch/arm/boot/dts/bcm2708-rpi-b.dts b/arch/arm/boot/dts/bcm2708-rpi-b.dts
index fde6c8a..9ee2550 100644
--- a/arch/arm/boot/dts/bcm2708-rpi-b.dts
+++ b/arch/arm/boot/dts/bcm2708-rpi-b.dts
@@ -120,7 +120,7 @@
cs-gpios = <&gpio 8 1>, <&gpio 7 1>;
spidev0: spidev@0{
- compatible = "spidev";
+ compatible = "rohm,dh2228fv";
reg = <0>; /* CE0 */
#address-cells = <1>;
#size-cells = <0>;
@@ -128,7 +128,7 @@
};
spidev1: spidev@1{
- compatible = "spidev";
+ compatible = "rohm,dh2228fv";
reg = <1>; /* CE1 */
#address-cells = <1>;
#size-cells = <0>;
diff --git a/arch/arm/boot/dts/bcm2708-rpi-cm.dts b/arch/arm/boot/dts/bcm2708-rpi-cm.dts
index 19ed764..ae74fd5 100644
--- a/arch/arm/boot/dts/bcm2708-rpi-cm.dts
+++ b/arch/arm/boot/dts/bcm2708-rpi-cm.dts
@@ -132,7 +132,7 @@
cs-gpios = <&gpio 8 1>, <&gpio 7 1>;
spidev0: spidev@0{
- compatible = "spidev";
+ compatible = "rohm,dh2228fv";
reg = <0>; /* CE0 */
#address-cells = <1>;
#size-cells = <0>;
@@ -140,7 +140,7 @@
};
spidev1: spidev@1{
- compatible = "spidev";
+ compatible = "rohm,dh2228fv";
reg = <1>; /* CE1 */
#address-cells = <1>;
#size-cells = <0>;
diff --git a/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts b/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts
index 8a4ff20..081b0e2 100644
--- a/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts
+++ b/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts
@@ -177,7 +177,7 @@
cs-gpios = <&gpio 8 1>, <&gpio 7 1>;
spidev0: spidev@0{
- compatible = "spidev";
+ compatible = "rohm,dh2228fv";
reg = <0>; /* CE0 */
#address-cells = <1>;
#size-cells = <0>;
@@ -185,7 +185,7 @@
};
spidev1: spidev@1{
- compatible = "spidev";
+ compatible = "rohm,dh2228fv";
reg = <1>; /* CE1 */
#address-cells = <1>;
#size-cells = <0>;
diff --git a/arch/arm/boot/dts/bcm2708-rpi-zero.dts b/arch/arm/boot/dts/bcm2708-rpi-zero.dts
index dcce16d..7b057b2 100644
--- a/arch/arm/boot/dts/bcm2708-rpi-zero.dts
+++ b/arch/arm/boot/dts/bcm2708-rpi-zero.dts
@@ -122,7 +122,7 @@
cs-gpios = <&gpio 8 1>, <&gpio 7 1>;
spidev0: spidev@0{
- compatible = "spidev";
+ compatible = "rohm,dh2228fv";
reg = <0>; /* CE0 */
#address-cells = <1>;
#size-cells = <0>;
@@ -130,7 +130,7 @@
};
spidev1: spidev@1{
- compatible = "spidev";
+ compatible = "rohm,dh2228fv";
reg = <1>; /* CE1 */
#address-cells = <1>;
#size-cells = <0>;
diff --git a/arch/arm/boot/dts/bcm2709-rpi-2-b.dts b/arch/arm/boot/dts/bcm2709-rpi-2-b.dts
index 1231314..17015fb 100644
--- a/arch/arm/boot/dts/bcm2709-rpi-2-b.dts
+++ b/arch/arm/boot/dts/bcm2709-rpi-2-b.dts
@@ -120,7 +120,7 @@
cs-gpios = <&gpio 8 1>, <&gpio 7 1>;
spidev0: spidev@0{
- compatible = "spidev";
+ compatible = "rohm,dh2228fv";
reg = <0>; /* CE0 */
#address-cells = <1>;
#size-cells = <0>;
@@ -128,7 +128,7 @@
};
spidev1: spidev@1{
- compatible = "spidev";
+ compatible = "rohm,dh2228fv";
reg = <1>; /* CE1 */
#address-cells = <1>;
#size-cells = <0>;
diff --git a/arch/arm/boot/dts/bcm2710-rpi-2-b.dts b/arch/arm/boot/dts/bcm2710-rpi-2-b.dts
index d4c9a42..0b068fd 100644
--- a/arch/arm/boot/dts/bcm2710-rpi-2-b.dts
+++ b/arch/arm/boot/dts/bcm2710-rpi-2-b.dts
@@ -120,7 +120,7 @@
cs-gpios = <&gpio 8 1>, <&gpio 7 1>;
spidev0: spidev@0{
- compatible = "spidev";
+ compatible = "rohm,dh2228fv";
reg = <0>; /* CE0 */
#address-cells = <1>;
#size-cells = <0>;
@@ -128,7 +128,7 @@
};
spidev1: spidev@1{
- compatible = "spidev";
+ compatible = "rohm,dh2228fv";
reg = <1>; /* CE1 */
#address-cells = <1>;
#size-cells = <0>;
diff --git a/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts b/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts
index 443307d..3029864 100644
--- a/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts
+++ b/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts
@@ -196,7 +196,7 @@
cs-gpios = <&gpio 8 1>, <&gpio 7 1>;
spidev0: spidev@0{
- compatible = "spidev";
+ compatible = "rohm,dh2228fv";
reg = <0>; /* CE0 */
#address-cells = <1>;
#size-cells = <0>;
@@ -204,7 +204,7 @@
};
spidev1: spidev@1{
- compatible = "spidev";
+ compatible = "rohm,dh2228fv";
reg = <1>; /* CE1 */
#address-cells = <1>;
#size-cells = <0>;
diff --git a/arch/arm/boot/dts/bcm2710-rpi-3-b.dts b/arch/arm/boot/dts/bcm2710-rpi-3-b.dts
index f53b181..e54e0eb 100644
--- a/arch/arm/boot/dts/bcm2710-rpi-3-b.dts
+++ b/arch/arm/boot/dts/bcm2710-rpi-3-b.dts
@@ -211,7 +211,7 @@
cs-gpios = <&gpio 8 1>, <&gpio 7 1>;
spidev0: spidev@0{
- compatible = "spidev";
+ compatible = "rohm,dh2228fv";
reg = <0>; /* CE0 */
#address-cells = <1>;
#size-cells = <0>;
@@ -219,7 +219,7 @@
};
spidev1: spidev@1{
- compatible = "spidev";
+ compatible = "rohm,dh2228fv";
reg = <1>; /* CE1 */
#address-cells = <1>;
#size-cells = <0>;
diff --git a/arch/arm/boot/dts/bcm2710-rpi-cm3.dts b/arch/arm/boot/dts/bcm2710-rpi-cm3.dts
index 4f582ea..dc7c366 100644
--- a/arch/arm/boot/dts/bcm2710-rpi-cm3.dts
+++ b/arch/arm/boot/dts/bcm2710-rpi-cm3.dts
@@ -159,7 +159,7 @@
cs-gpios = <&gpio 8 1>, <&gpio 7 1>;
spidev0: spidev@0{
- compatible = "spidev";
+ compatible = "rohm,dh2228fv";
reg = <0>; /* CE0 */
#address-cells = <1>;
#size-cells = <0>;
@@ -167,7 +167,7 @@
};
spidev1: spidev@1{
- compatible = "spidev";
+ compatible = "rohm,dh2228fv";
reg = <1>; /* CE1 */
#address-cells = <1>;
#size-cells = <0>;
diff --git a/arch/arm/boot/dts/bcm2710-rpi-zero-2-w.dts b/arch/arm/boot/dts/bcm2710-rpi-zero-2-w.dts
index f35a1b1..3d88f48 100644
--- a/arch/arm/boot/dts/bcm2710-rpi-zero-2-w.dts
+++ b/arch/arm/boot/dts/bcm2710-rpi-zero-2-w.dts
@@ -190,7 +190,7 @@
cs-gpios = <&gpio 8 1>, <&gpio 7 1>;
spidev0: spidev@0{
- compatible = "spidev";
+ compatible = "rohm,dh2228fv";
reg = <0>; /* CE0 */
#address-cells = <1>;
#size-cells = <0>;
@@ -198,7 +198,7 @@
};
spidev1: spidev@1{
- compatible = "spidev";
+ compatible = "rohm,dh2228fv";
reg = <1>; /* CE1 */
#address-cells = <1>;
#size-cells = <0>;
diff --git a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
index f6e0247..0c87487 100644
--- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
+++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
@@ -330,7 +330,7 @@
cs-gpios = <&gpio 8 1>, <&gpio 7 1>;
spidev0: spidev@0{
- compatible = "spidev";
+ compatible = "rohm,dh2228fv";
reg = <0>; /* CE0 */
#address-cells = <1>;
#size-cells = <0>;
@@ -338,7 +338,7 @@
};
spidev1: spidev@1{
- compatible = "spidev";
+ compatible = "rohm,dh2228fv";
reg = <1>; /* CE1 */
#address-cells = <1>;
#size-cells = <0>;
diff --git a/arch/arm/boot/dts/bcm2711-rpi-400.dts b/arch/arm/boot/dts/bcm2711-rpi-400.dts
index ba9c13a..d8c8b02 100644
--- a/arch/arm/boot/dts/bcm2711-rpi-400.dts
+++ b/arch/arm/boot/dts/bcm2711-rpi-400.dts
@@ -388,7 +388,7 @@
cs-gpios = <&gpio 8 1>, <&gpio 7 1>;
spidev0: spidev@0{
- compatible = "spidev";
+ compatible = "rohm,dh2228fv";
reg = <0>; /* CE0 */
#address-cells = <1>;
#size-cells = <0>;
@@ -396,7 +396,7 @@
};
spidev1: spidev@1{
- compatible = "spidev";
+ compatible = "rohm,dh2228fv";
reg = <1>; /* CE1 */
#address-cells = <1>;
#size-cells = <0>;
diff --git a/arch/arm/boot/dts/bcm2711-rpi-cm4.dts b/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
index ad73521..08a088e 100644
--- a/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
+++ b/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
@@ -403,7 +403,7 @@
cs-gpios = <&gpio 8 1>, <&gpio 7 1>;
spidev0: spidev@0{
- compatible = "spidev";
+ compatible = "rohm,dh2228fv";
reg = <0>; /* CE0 */
#address-cells = <1>;
#size-cells = <0>;
@@ -411,7 +411,7 @@
};
spidev1: spidev@1{
- compatible = "spidev";
+ compatible = "rohm,dh2228fv";
reg = <1>; /* CE1 */
#address-cells = <1>;
#size-cells = <0>;
--
2.35.3
