[Xen-changelog] [xen staging] xen/arm: platform: fix Raspberry Pi compatible string

[patchbot@xxxxxxx]

commit 1666939ec4780050c284cf7cdaff953c9dd7e807
Author:     Stewart Hildebrand <stewart.hildebrand@xxxxxxxxxxxxxxx>
AuthorDate: Sun Oct 20 21:27:55 2019 -0400
Commit:     Julien Grall <julien.grall@xxxxxxx>
CommitDate: Mon Oct 28 15:09:08 2019 +0000

    xen/arm: platform: fix Raspberry Pi compatible string
    
    Both upstream [1] and downstream [2] Linux kernels use "brcm,bcm2711"
    as the compatible string for Raspberry Pi 4. Add this string to our
    platform compatible list.
    
    The brcm,bcm2838 convention is abandoned. Remove it.
    
    Rename the variables within the file to a rpi4_* prefix since the file
    is meant to cover the Raspberry Pi 4 platform.
    
    If you are using a device tree with the old compatible string
    brcm,bcm2838, you will need to upgrade your device tree to one that has
    the new brcm,bcm2711 compatible string.
    
    [1] https://patchwork.kernel.org/patch/11165407/
    [2] 
https://github.com/raspberrypi/linux/commit/53fdd7b8c8cb9c87190caab4fd459f89e1b4a7f8
    
    Signed-off-by: Stewart Hildebrand <stewart.hildebrand@xxxxxxxxxxxxxxx>
    Acked-by: Julien Grall <julien.grall@xxxxxxx>
    Release-acked-by: Juergen Gross <jgross@xxxxxxxx>
---
 xen/arch/arm/platforms/brcm-raspberry-pi.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/xen/arch/arm/platforms/brcm-raspberry-pi.c 
b/xen/arch/arm/platforms/brcm-raspberry-pi.c
index e22d2b3184..b697fa2c6c 100644
--- a/xen/arch/arm/platforms/brcm-raspberry-pi.c
+++ b/xen/arch/arm/platforms/brcm-raspberry-pi.c
@@ -19,13 +19,13 @@
 
 #include <asm/platform.h>
 
-static const char *const brcm_bcm2838_dt_compat[] __initconst =
+static const char *const rpi4_dt_compat[] __initconst =
 {
-    "brcm,bcm2838",
+    "brcm,bcm2711",
     NULL
 };
 
-static const struct dt_device_match brcm_bcm2838_blacklist_dev[] __initconst =
+static const struct dt_device_match rpi4_blacklist_dev[] __initconst =
 {
     /*
      * The aux SPIs share an IRQ and a page with the aux UART.
@@ -40,9 +40,9 @@ static const struct dt_device_match 
brcm_bcm2838_blacklist_dev[] __initconst =
     { /* sentinel */ },
 };
 
-PLATFORM_START(brcm_bcm2838, "Raspberry Pi 4")
-    .compatible     = brcm_bcm2838_dt_compat,
-    .blacklist_dev  = brcm_bcm2838_blacklist_dev,
+PLATFORM_START(rpi4, "Raspberry Pi 4")
+    .compatible     = rpi4_dt_compat,
+    .blacklist_dev  = rpi4_blacklist_dev,
 PLATFORM_END
 
 /*
--
generated by git-patchbot for /home/xen/git/xen.git#staging

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/xen-changelog