target/linux/brcm2708/patches-4.19/950-0453-BCM270X_DT-Minor-tidy-up.patch

   1 From 021d54e3ae67e2b02310b9e3e871876a2c3b7eee Mon Sep 17 00:00:00 2001
   2 From: Phil Elwell <phil@raspberrypi.org>
   3 Date: Wed, 29 May 2019 15:19:21 +0100
   4 Subject: [PATCH] BCM270X_DT: Minor tidy up
   5
   6 Move arm_pmu out of soc on bcm2710, and labels aren't aliases.
   7
   8 Signed-off-by: Phil Elwell <phil@raspberrypi.org>
   9 ---
  10  arch/arm/boot/dts/bcm270x.dtsi | 14 +++++++-------
  11  arch/arm/boot/dts/bcm2710.dtsi | 13 +++++--------
  12  2 files changed, 12 insertions(+), 15 deletions(-)
  13
  14 --- a/arch/arm/boot/dts/bcm270x.dtsi
  15 +++ b/arch/arm/boot/dts/bcm270x.dtsi
  16 @@ -10,11 +10,11 @@
  17         soc: soc {
  18
  19                 watchdog: watchdog@7e100000 {
  20 -                       /* Add alias */
  21 +                       /* Add label */
  22                 };
  23
  24                 random: rng@7e104000 {
  25 -                       /* Add alias */
  26 +                       /* Add label */
  27                 };
  28
  29                 gpio@7e200000 { /* gpio */
  30 @@ -40,18 +40,18 @@
  31                 };
  32
  33                 spi0: spi@7e204000 {
  34 -                       /* Add alias */
  35 +                       /* Add label */
  36                         dmas = <&dma 6>, <&dma 7>;
  37                         dma-names = "tx", "rx";
  38                 };
  39
  40                 pixelvalve0: pixelvalve@7e206000 {
  41 -                       /* Add alias */
  42 +                       /* Add label */
  43                         status = "disabled";
  44                 };
  45
  46                 pixelvalve1: pixelvalve@7e207000 {
  47 -                       /* Add alias */
  48 +                       /* Add label */
  49                         status = "disabled";
  50                 };
  51
  52 @@ -93,7 +93,7 @@
  53                 };
  54
  55                 hvs: hvs@7e400000 {
  56 -                       /* Add alias */
  57 +                       /* Add label */
  58                         status = "disabled";
  59                 };
  60
  61 @@ -119,7 +119,7 @@
  62                 };
  63
  64                 pixelvalve2: pixelvalve@7e807000 {
  65 -                       /* Add alias */
  66 +                       /* Add label */
  67                         status = "disabled";
  68                 };
  69
  70 --- a/arch/arm/boot/dts/bcm2710.dtsi
  71 +++ b/arch/arm/boot/dts/bcm2710.dtsi
  72 @@ -5,18 +5,15 @@
  73  / {
  74         compatible = "brcm,bcm2837", "brcm,bcm2836";
  75
  76 -       soc {
  77 -
  78 -               arm-pmu {
  79 +       arm-pmu {
  80  #ifdef RPI364
  81 -                       compatible = "arm,armv8-pmuv3", "arm,cortex-a7-pmu";
  82 +               compatible = "arm,armv8-pmuv3", "arm,cortex-a7-pmu";
  83  #else
  84 -                       compatible = "arm,cortex-a7-pmu";
  85 +               compatible = "arm,cortex-a7-pmu";
  86  #endif
  87 -                       interrupt-parent = <&local_intc>;
  88 -                       interrupts = <9 IRQ_TYPE_LEVEL_HIGH>;
  89 -               };
  90 +       };
  91
  92 +       soc {
  93                 /delete-node/ timer@7e003000;
  94         };
  95