ARM: dts: Add model-specific compatible strings

The upstream Pi DTs are model-specific, with both the model and compatible strings identifying the model. Downstream groups the closely-related models, with only the chip name in the compatible strings and a model string patched by the firmware. Bring the downstream model-specific DTs closer to upstream by adding model-specific compatible strings. See: raspberrypi/firmware#943 Signed-off-by: Phil Elwell <phil@raspberrypi.org> (cherry picked from commit d90929181836e8a049275d8407cff70fb93b7f17 https://github.com/raspberrypi/linux raspi/rpi-4.15.y) Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com> Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
sasikrishna2014 · Jul 18, 2018 · 58cc40c · 58cc40c
1 parent 24b296c
commit 58cc40c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 0 deletions.
diff --git a/arch/arm/boot/dts/bcm2708-rpi-0-w.dts b/arch/arm/boot/dts/bcm2708-rpi-0-w.dts
@@ -3,6 +3,7 @@
 #include "bcm2708.dtsi"
 
 / {
+	compatible = "raspberrypi,model-zero-w", "brcm,bcm2835";
 	model = "Raspberry Pi Zero W";
 
 	chosen {

diff --git a/arch/arm/boot/dts/bcm2709-rpi-2-b.dts b/arch/arm/boot/dts/bcm2709-rpi-2-b.dts
@@ -4,6 +4,7 @@
 #include "bcm283x-rpi-smsc9514.dtsi"
 
 / {
+	compatible = "raspberrypi,2-model-b", "brcm,bcm2836";
 	model = "Raspberry Pi 2 Model B";
 };
 

diff --git a/arch/arm/boot/dts/bcm2710-rpi-3-b.dts b/arch/arm/boot/dts/bcm2710-rpi-3-b.dts
@@ -8,6 +8,7 @@
 #include "bcm283x-rpi-smsc9514.dtsi"
 
 / {
+	compatible = "raspberrypi,3-model-b", "brcm,bcm2837";
 	model = "Raspberry Pi 3 Model B";
 
 	chosen {
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,6 +4,7 @@ @@
     #include "bcm283x-rpi-smsc9514.dtsi"
     / {
+    	compatible = "raspberrypi,2-model-b", "brcm,bcm2836";
     	model = "Raspberry Pi 2 Model B";
     };
@@ Expand Down @@