git.openwrt.org Git - openwrt/staging/nbd.git/blob

   1 From 30972497979c65781bb8170743447b45b6dfd3cd Mon Sep 17 00:00:00 2001
   2 From: Stefan Wahren <wahrenst@gmx.net>
   3 Date: Thu, 19 Sep 2019 20:45:30 +0200
   4 Subject: [PATCH] ARM: bcm: Switch board, clk and pinctrl to bcm2711
   5  compatible
   6
   7 After the decision to use bcm2711 compatible for upstream, we should
   8 switch all accepted compatibles to bcm2711. So we can boot with
   9 one DTB the down- and the upstream kernel.
  10
  11 Signed-off-by: Stefan Wahren <wahrenst@gmx.net>
  12 ---
  13  arch/arm/boot/dts/bcm2711-rpi-4-b.dts | 2 +-
  14  arch/arm/boot/dts/bcm2838-rpi-4-b.dts | 2 +-
  15  arch/arm/boot/dts/bcm2838.dtsi        | 4 ++--
  16  arch/arm/mach-bcm/board_bcm2835.c     | 2 +-
  17  4 files changed, 5 insertions(+), 5 deletions(-)
  18
  19 --- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
  20 +++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
  21 @@ -5,7 +5,7 @@
  22  #include "bcm283x-rpi-csi1-2lane.dtsi"
  23
  24  / {
  25 -       compatible = "raspberrypi,4-model-b", "brcm,bcm2838";
  26 +       compatible = "raspberrypi,4-model-b", "brcm,bcm2711";
  27         model = "Raspberry Pi 4 Model B";
  28
  29         memory@0 {
  30 --- a/arch/arm/boot/dts/bcm2838-rpi-4-b.dts
  31 +++ b/arch/arm/boot/dts/bcm2838-rpi-4-b.dts
  32 @@ -5,7 +5,7 @@
  33  #include "bcm2838-rpi.dtsi"
  34
  35  / {
  36 -       compatible = "raspberrypi,4-model-b", "brcm,bcm2838";
  37 +       compatible = "raspberrypi,4-model-b", "brcm,bcm2711";
  38         model = "Raspberry Pi 4 Model B";
  39
  40         chosen {
  41 --- a/arch/arm/boot/dts/bcm2838.dtsi
  42 +++ b/arch/arm/boot/dts/bcm2838.dtsi
  43 @@ -440,7 +440,7 @@
  44  };
  45
  46  &clocks {
  47 -       compatible = "brcm,bcm2838-cprman";
  48 +       compatible = "brcm,bcm2711-cprman";
  49  };
  50
  51  &cpu_thermal {
  52 @@ -456,7 +456,7 @@
  53  };
  54
  55  &gpio {
  56 -       compatible = "brcm,bcm2838-gpio", "brcm,bcm2835-gpio";
  57 +       compatible = "brcm,bcm2711-gpio", "brcm,bcm2835-gpio";
  58
  59         gpclk0_gpio49: gpclk0_gpio49 {
  60                 brcm,pins = <49>;
  61 --- a/arch/arm/mach-bcm/board_bcm2835.c
  62 +++ b/arch/arm/mach-bcm/board_bcm2835.c
  63 @@ -118,7 +118,7 @@ static const char * const bcm2835_compat
  64  #ifdef CONFIG_ARCH_MULTI_V7
  65         "brcm,bcm2836",
  66         "brcm,bcm2837",
  67 -       "brcm,bcm2838",
  68 +       "brcm,bcm2711",
  69  #endif
  70         NULL
  71  };