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

   1 From 5be82d0475941dc96eeeee3c754baf48365f7bf5 Mon Sep 17 00:00:00 2001
   2 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
   3 Date: Wed, 15 Mar 2017 18:03:27 +0100
   4 Subject: [PATCH] ARM: dts: BCM5301X: Specify serial console params in dtsi
   5  files
   6 MIME-Version: 1.0
   7 Content-Type: text/plain; charset=UTF-8
   8 Content-Transfer-Encoding: 8bit
   9
  10 So far every Northstar device we have seen was using the same serial
  11 console params (115200n8). It probably make the most sense to put it in
  12 some proper dtsi files instead of repeating over and over for every
  13 single device. As different boards may use different bootloaders it
  14 seems the safest idea is to use board specific dtsi files.
  15
  16 Just in case some vendor decides to use different UART (parameters) this
  17 can be always easily overwritten.
  18
  19 Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
  20 Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
  21 ---
  22  arch/arm/boot/dts/bcm4708.dtsi    | 8 ++++++++
  23  arch/arm/boot/dts/bcm47081.dtsi   | 8 ++++++++
  24  arch/arm/boot/dts/bcm5301x.dtsi   | 4 ----
  25  arch/arm/boot/dts/bcm94708.dts    | 8 --------
  26  arch/arm/boot/dts/bcm94709.dts    | 8 --------
  27  arch/arm/boot/dts/bcm953012er.dts | 8 --------
  28  arch/arm/boot/dts/bcm953012hr.dts | 5 -----
  29  arch/arm/boot/dts/bcm953012k.dts  | 4 ----
  30  8 files changed, 16 insertions(+), 37 deletions(-)
  31
  32 --- a/arch/arm/boot/dts/bcm4708.dtsi
  33 +++ b/arch/arm/boot/dts/bcm4708.dtsi
  34 @@ -12,6 +12,14 @@
  35  / {
  36         compatible = "brcm,bcm4708";
  37
  38 +       aliases {
  39 +               serial0 = &uart0;
  40 +       };
  41 +
  42 +       chosen {
  43 +               stdout-path = "serial0:115200n8";
  44 +       };
  45 +
  46         cpus {
  47                 #address-cells = <1>;
  48                 #size-cells = <0>;
  49 --- a/arch/arm/boot/dts/bcm47081.dtsi
  50 +++ b/arch/arm/boot/dts/bcm47081.dtsi
  51 @@ -22,6 +22,14 @@
  52  / {
  53         compatible = "brcm,bcm47081";
  54
  55 +       aliases {
  56 +               serial0 = &uart0;
  57 +       };
  58 +
  59 +       chosen {
  60 +               stdout-path = "serial0:115200n8";
  61 +       };
  62 +
  63         cpus {
  64                 #address-cells = <1>;
  65                 #size-cells = <0>;
  66 --- a/arch/arm/boot/dts/bcm5301x.dtsi
  67 +++ b/arch/arm/boot/dts/bcm5301x.dtsi
  68 @@ -18,10 +18,6 @@
  69  / {
  70         interrupt-parent = <&gic>;
  71
  72 -       chosen {
  73 -               stdout-path = &uart0;
  74 -       };
  75 -
  76         chipcommonA {
  77                 compatible = "simple-bus";
  78                 ranges = <0x00000000 0x18000000 0x00001000>;
  79 --- a/arch/arm/boot/dts/bcm94708.dts
  80 +++ b/arch/arm/boot/dts/bcm94708.dts
  81 @@ -38,14 +38,6 @@
  82         model = "NorthStar SVK (BCM94708)";
  83         compatible = "brcm,bcm94708", "brcm,bcm4708";
  84
  85 -       aliases {
  86 -               serial0 = &uart0;
  87 -       };
  88 -
  89 -       chosen {
  90 -               stdout-path = "serial0:115200n8";
  91 -       };
  92 -
  93         memory {
  94                 reg = <0x00000000 0x08000000>;
  95         };
  96 --- a/arch/arm/boot/dts/bcm94709.dts
  97 +++ b/arch/arm/boot/dts/bcm94709.dts
  98 @@ -38,14 +38,6 @@
  99         model = "NorthStar SVK (BCM94709)";
 100         compatible = "brcm,bcm94709", "brcm,bcm4709", "brcm,bcm4708";
 101
 102 -       aliases {
 103 -               serial0 = &uart0;
 104 -       };
 105 -
 106 -       chosen {
 107 -               stdout-path = "serial0:115200n8";
 108 -       };
 109 -
 110         memory {
 111                 reg = <0x00000000 0x08000000>;
 112         };
 113 --- a/arch/arm/boot/dts/bcm953012er.dts
 114 +++ b/arch/arm/boot/dts/bcm953012er.dts
 115 @@ -39,14 +39,6 @@
 116         model = "NorthStar Enterprise Router (BCM953012ER)";
 117         compatible = "brcm,bcm953012er", "brcm,brcm53012", "brcm,bcm4708";
 118
 119 -       aliases {
 120 -               serial0 = &uart0;
 121 -       };
 122 -
 123 -       chosen {
 124 -               stdout-path = "serial0:115200n8";
 125 -       };
 126 -
 127         memory {
 128                 reg = <0x00000000 0x8000000>;
 129         };
 130 --- a/arch/arm/boot/dts/bcm953012hr.dts
 131 +++ b/arch/arm/boot/dts/bcm953012hr.dts
 132 @@ -40,16 +40,11 @@
 133         compatible = "brcm,bcm953012hr", "brcm,brcm53012", "brcm,bcm4708";
 134
 135         aliases {
 136 -               serial0 = &uart0;
 137                 ethernet0 = &gmac0;
 138                 ethernet1 = &gmac1;
 139                 ethernet2 = &gmac2;
 140         };
 141
 142 -       chosen {
 143 -               stdout-path = "serial0:115200n8";
 144 -       };
 145 -
 146         memory@80000000 {
 147                 reg = <0x80000000 0x10000000>;
 148         };
 149 --- a/arch/arm/boot/dts/bcm953012k.dts
 150 +++ b/arch/arm/boot/dts/bcm953012k.dts
 151 @@ -43,10 +43,6 @@
 152                 serial1 = &uart1;
 153         };
 154
 155 -       chosen {
 156 -               stdout-path = "serial0:115200n8";
 157 -       };
 158 -
 159         memory {
 160                 reg = <0x80000000 0x10000000>;
 161         };