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: https://github.com/raspberrypi/firmware/issues/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>

diff --git a/arch/arm/boot/dts/bcm2708-rpi-0-w.dts b/arch/arm/boot/dts/bcm2708-rpi-0-w.dts
index 8299f8a4e2a436f443e9c95c468583d538787c0f..ef0b0f040ca5c12ebd3d3a01823b6be9aa41f14b 100644 (file)
--- 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
index b7d48347066597e5d1e183e7c58330daf12f4e9b..442d2ebbdd366d14907f604630b4fb1c17355b6b 100644 (file)
--- 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
index a72c2fed5c52444fbc80daf23e1bf8f7c6f70e7f..3d16b7040c3e11c86436b3ebc16a1686ee1d8956 100644 (file)
--- 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 {