target/linux/bcm27xx/patches-5.10/950-0182-ARM-bcm-Backport-BCM2711-support-from-upstream.patch

   1 From 20534fd2fedd5c3febd239475e64d3dfc7d8400b Mon Sep 17 00:00:00 2001
   2 From: Stefan Wahren <wahrenst@gmx.net>
   3 Date: Fri, 27 Dec 2019 11:40:56 +0100
   4 Subject: [PATCH] ARM: bcm: Backport BCM2711 support from upstream
   5
   6 Make the BCM2711 a different machine, but keep it in board_bcm2835.
   7
   8 Signed-off-by: Stefan Wahren <wahrenst@gmx.net>
   9 ---
  10  arch/arm/mach-bcm/board_bcm2835.c | 17 +++++++++++++++--
  11  1 file changed, 15 insertions(+), 2 deletions(-)
  12
  13 --- a/arch/arm/mach-bcm/board_bcm2835.c
  14 +++ b/arch/arm/mach-bcm/board_bcm2835.c
  15 @@ -109,17 +109,30 @@ static const char * const bcm2835_compat
  16  #ifdef CONFIG_ARCH_MULTI_V7
  17         "brcm,bcm2836",
  18         "brcm,bcm2837",
  19 -       "brcm,bcm2711",
  20  #endif
  21         NULL
  22  };
  23
  24  DT_MACHINE_START(BCM2835, "BCM2835")
  25 +       .map_io = bcm2835_map_io,
  26 +       .init_machine = bcm2835_init,
  27 +       .dt_compat = bcm2835_compat,
  28 +       .smp = smp_ops(bcm2836_smp_ops),
  29 +MACHINE_END
  30 +
  31 +static const char * const bcm2711_compat[] = {
  32 +#ifdef CONFIG_ARCH_MULTI_V7
  33 +       "brcm,bcm2711",
  34 +#endif
  35 +       NULL
  36 +};
  37 +
  38 +DT_MACHINE_START(BCM2711, "BCM2711")
  39  #if defined(CONFIG_ZONE_DMA) && defined(CONFIG_ARM_LPAE)
  40         .dma_zone_size  = SZ_1G,
  41  #endif
  42         .map_io = bcm2835_map_io,
  43         .init_machine = bcm2835_init,
  44 -       .dt_compat = bcm2835_compat,
  45 +       .dt_compat = bcm2711_compat,
  46         .smp = smp_ops(bcm2836_smp_ops),
  47  MACHINE_END