package/boot/uboot-mvebu/patches/131-arm64-dts-armada-3720-espressobin-use-Linux-model-co.patch

   1 From cdcfd9211c805624a702b6ff81b9bd9515344749 Mon Sep 17 00:00:00 2001
   2 From: Andre Heider <a.heider@gmail.com>
   3 Date: Fri, 4 Sep 2020 16:34:22 +0200
   4 Subject: [PATCH] arm64: dts: armada-3720-espressobin: use Linux
   5  model/compatible strings
   6
   7 Fix the actual board vendor and ease synching dts files from Linux.
   8
   9 Signed-off-by: Andre Heider <a.heider@gmail.com>
  10 ---
  11  arch/arm/dts/armada-3720-espressobin.dts | 4 ++--
  12  board/Marvell/mvebu_armada-37xx/board.c  | 8 ++++----
  13  2 files changed, 6 insertions(+), 6 deletions(-)
  14
  15 --- a/arch/arm/dts/armada-3720-espressobin.dts
  16 +++ b/arch/arm/dts/armada-3720-espressobin.dts
  17 @@ -50,8 +50,8 @@
  18  #include "armada-372x.dtsi"
  19
  20  / {
  21 -       model = "Marvell Armada 3720 Community Board ESPRESSOBin";
  22 -       compatible = "marvell,armada-3720-espressobin", "marvell,armada3720", "marvell,armada3710";
  23 +       model = "Globalscale Marvell ESPRESSOBin Board";
  24 +       compatible = "globalscale,espressobin", "marvell,armada3720", "marvell,armada3710";
  25
  26         chosen {
  27                 stdout-path = "serial0:115200n8";
  28 --- a/board/Marvell/mvebu_armada-37xx/board.c
  29 +++ b/board/Marvell/mvebu_armada-37xx/board.c
  30 @@ -88,14 +88,14 @@ int board_late_init(void)
  31         if (env_get("fdtfile"))
  32                 return 0;
  33
  34 -       if (!of_machine_is_compatible("marvell,armada-3720-espressobin"))
  35 +       if (!of_machine_is_compatible("globalscale,espressobin"))
  36                 return 0;
  37
  38         /* If the memory controller has been configured for DDR4, we're running on v7 */
  39         ddr4 = ((readl(A3700_CH0_MC_CTRL2_REG) >> A3700_MC_CTRL2_SDRAM_TYPE_OFFS)
  40                 & A3700_MC_CTRL2_SDRAM_TYPE_MASK) == A3700_MC_CTRL2_SDRAM_TYPE_DDR4;
  41
  42 -       emmc = of_machine_is_compatible("marvell,armada-3720-espressobin-emmc");
  43 +       emmc = of_machine_is_compatible("globalscale,espressobin-emmc");
  44
  45         if (ddr4 && emmc)
  46                 env_set("fdtfile", "marvell/armada-3720-espressobin-v7-emmc.dtb");
  47 @@ -248,7 +248,7 @@ static int mii_multi_chip_mode_write(str
  48  /* Bring-up board-specific network stuff */
  49  int board_network_enable(struct mii_dev *bus)
  50  {
  51 -       if (!of_machine_is_compatible("marvell,armada-3720-espressobin"))
  52 +       if (!of_machine_is_compatible("globalscale,espressobin"))
  53                 return 0;
  54
  55         /*
  56 @@ -300,7 +300,7 @@ int ft_board_setup(void *blob, struct bd
  57         int part_off;
  58
  59         /* Fill SPI MTD partitions for Linux kernel on Espressobin */
  60 -       if (!of_machine_is_compatible("marvell,armada-3720-espressobin"))
  61 +       if (!of_machine_is_compatible("globalscale,espressobin"))
  62                 return 0;
  63
  64         spi_off = fdt_node_offset_by_compatible(blob, -1, "jedec,spi-nor");