target/linux/brcm2708/patches-4.19/950-0727-bcm2711-Retain-support-for-old-dtbs.patch

   1 From 7d7f6a80f12fb6e7ba903d070512970e304bcd02 Mon Sep 17 00:00:00 2001
   2 From: Phil Elwell <phil@raspberrypi.org>
   3 Date: Wed, 9 Oct 2019 17:22:07 +0100
   4 Subject: [PATCH] bcm2711: Retain support for old dtbs
   5
   6 The recent series switching to bcm2711 as the DT identifier broke Pis
   7 running with old DTBs. Add some bcm2838 compatible strings as a
   8 temporary measure, at least until the next full Raspbian image with
   9 bcm2711 DTBs.
  10
  11 See: https://github.com/raspberrypi/linux/pull/3244
  12
  13 Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  14 ---
  15  arch/arm/mach-bcm/board_bcm2835.c     | 2 ++
  16  drivers/clk/bcm/clk-bcm2835.c         | 2 ++
  17  drivers/pinctrl/bcm/pinctrl-bcm2835.c | 5 +++++
  18  3 files changed, 9 insertions(+)
  19
  20 --- a/arch/arm/mach-bcm/board_bcm2835.c
  21 +++ b/arch/arm/mach-bcm/board_bcm2835.c
  22 @@ -119,6 +119,8 @@ static const char * const bcm2835_compat
  23         "brcm,bcm2836",
  24         "brcm,bcm2837",
  25         "brcm,bcm2711",
  26 +       // Temporary, for backwards-compatibility with old DTBs
  27 +       "brcm,bcm2838",
  28  #endif
  29         NULL
  30  };
  31 --- a/drivers/clk/bcm/clk-bcm2835.c
  32 +++ b/drivers/clk/bcm/clk-bcm2835.c
  33 @@ -2396,6 +2396,8 @@ static const struct cprman_plat_data cpr
  34  static const struct of_device_id bcm2835_clk_of_match[] = {
  35         { .compatible = "brcm,bcm2835-cprman", .data = &cprman_bcm2835_plat_data },
  36         { .compatible = "brcm,bcm2711-cprman", .data = &cprman_bcm2711_plat_data },
  37 +       // Temporary, for backwards-compatibility with old DTBs
  38 +       { .compatible = "brcm,bcm2838-cprman", .data = &cprman_bcm2711_plat_data },
  39         {}
  40  };
  41  MODULE_DEVICE_TABLE(of, bcm2835_clk_of_match);
  42 --- a/drivers/pinctrl/bcm/pinctrl-bcm2835.c
  43 +++ b/drivers/pinctrl/bcm/pinctrl-bcm2835.c
  44 @@ -1079,6 +1079,11 @@ static const struct of_device_id bcm2835
  45                 .compatible = "brcm,bcm2711-gpio",
  46                 .data = &bcm2711_pinconf_ops,
  47         },
  48 +       // Temporary, for backwards-compatibility with old DTBs
  49 +       {
  50 +               .compatible = "brcm,bcm2838-gpio",
  51 +               .data = &bcm2711_pinconf_ops,
  52 +       },
  53         {}
  54  };
  55