You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
162 lines
3.7 KiB
Diff
162 lines
3.7 KiB
Diff
From 5be82d0475941dc96eeeee3c754baf48365f7bf5 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
|
|
Date: Wed, 15 Mar 2017 18:03:27 +0100
|
|
Subject: [PATCH] ARM: dts: BCM5301X: Specify serial console params in dtsi
|
|
files
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
So far every Northstar device we have seen was using the same serial
|
|
console params (115200n8). It probably make the most sense to put it in
|
|
some proper dtsi files instead of repeating over and over for every
|
|
single device. As different boards may use different bootloaders it
|
|
seems the safest idea is to use board specific dtsi files.
|
|
|
|
Just in case some vendor decides to use different UART (parameters) this
|
|
can be always easily overwritten.
|
|
|
|
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
|
|
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
|
|
---
|
|
arch/arm/boot/dts/bcm4708.dtsi | 8 ++++++++
|
|
arch/arm/boot/dts/bcm47081.dtsi | 8 ++++++++
|
|
arch/arm/boot/dts/bcm5301x.dtsi | 4 ----
|
|
arch/arm/boot/dts/bcm94708.dts | 8 --------
|
|
arch/arm/boot/dts/bcm94709.dts | 8 --------
|
|
arch/arm/boot/dts/bcm953012er.dts | 8 --------
|
|
arch/arm/boot/dts/bcm953012hr.dts | 5 -----
|
|
arch/arm/boot/dts/bcm953012k.dts | 4 ----
|
|
8 files changed, 16 insertions(+), 37 deletions(-)
|
|
|
|
--- a/arch/arm/boot/dts/bcm4708.dtsi
|
|
+++ b/arch/arm/boot/dts/bcm4708.dtsi
|
|
@@ -12,6 +12,14 @@
|
|
/ {
|
|
compatible = "brcm,bcm4708";
|
|
|
|
+ aliases {
|
|
+ serial0 = &uart0;
|
|
+ };
|
|
+
|
|
+ chosen {
|
|
+ stdout-path = "serial0:115200n8";
|
|
+ };
|
|
+
|
|
cpus {
|
|
#address-cells = <1>;
|
|
#size-cells = <0>;
|
|
--- a/arch/arm/boot/dts/bcm47081.dtsi
|
|
+++ b/arch/arm/boot/dts/bcm47081.dtsi
|
|
@@ -22,6 +22,14 @@
|
|
/ {
|
|
compatible = "brcm,bcm47081";
|
|
|
|
+ aliases {
|
|
+ serial0 = &uart0;
|
|
+ };
|
|
+
|
|
+ chosen {
|
|
+ stdout-path = "serial0:115200n8";
|
|
+ };
|
|
+
|
|
cpus {
|
|
#address-cells = <1>;
|
|
#size-cells = <0>;
|
|
--- a/arch/arm/boot/dts/bcm5301x.dtsi
|
|
+++ b/arch/arm/boot/dts/bcm5301x.dtsi
|
|
@@ -18,10 +18,6 @@
|
|
/ {
|
|
interrupt-parent = <&gic>;
|
|
|
|
- chosen {
|
|
- stdout-path = &uart0;
|
|
- };
|
|
-
|
|
chipcommonA {
|
|
compatible = "simple-bus";
|
|
ranges = <0x00000000 0x18000000 0x00001000>;
|
|
--- a/arch/arm/boot/dts/bcm94708.dts
|
|
+++ b/arch/arm/boot/dts/bcm94708.dts
|
|
@@ -38,14 +38,6 @@
|
|
model = "NorthStar SVK (BCM94708)";
|
|
compatible = "brcm,bcm94708", "brcm,bcm4708";
|
|
|
|
- aliases {
|
|
- serial0 = &uart0;
|
|
- };
|
|
-
|
|
- chosen {
|
|
- stdout-path = "serial0:115200n8";
|
|
- };
|
|
-
|
|
memory {
|
|
reg = <0x00000000 0x08000000>;
|
|
};
|
|
--- a/arch/arm/boot/dts/bcm94709.dts
|
|
+++ b/arch/arm/boot/dts/bcm94709.dts
|
|
@@ -38,14 +38,6 @@
|
|
model = "NorthStar SVK (BCM94709)";
|
|
compatible = "brcm,bcm94709", "brcm,bcm4709", "brcm,bcm4708";
|
|
|
|
- aliases {
|
|
- serial0 = &uart0;
|
|
- };
|
|
-
|
|
- chosen {
|
|
- stdout-path = "serial0:115200n8";
|
|
- };
|
|
-
|
|
memory {
|
|
reg = <0x00000000 0x08000000>;
|
|
};
|
|
--- a/arch/arm/boot/dts/bcm953012er.dts
|
|
+++ b/arch/arm/boot/dts/bcm953012er.dts
|
|
@@ -39,14 +39,6 @@
|
|
model = "NorthStar Enterprise Router (BCM953012ER)";
|
|
compatible = "brcm,bcm953012er", "brcm,brcm53012", "brcm,bcm4708";
|
|
|
|
- aliases {
|
|
- serial0 = &uart0;
|
|
- };
|
|
-
|
|
- chosen {
|
|
- stdout-path = "serial0:115200n8";
|
|
- };
|
|
-
|
|
memory {
|
|
reg = <0x00000000 0x8000000>;
|
|
};
|
|
--- a/arch/arm/boot/dts/bcm953012hr.dts
|
|
+++ b/arch/arm/boot/dts/bcm953012hr.dts
|
|
@@ -40,16 +40,11 @@
|
|
compatible = "brcm,bcm953012hr", "brcm,brcm53012", "brcm,bcm4708";
|
|
|
|
aliases {
|
|
- serial0 = &uart0;
|
|
ethernet0 = &gmac0;
|
|
ethernet1 = &gmac1;
|
|
ethernet2 = &gmac2;
|
|
};
|
|
|
|
- chosen {
|
|
- stdout-path = "serial0:115200n8";
|
|
- };
|
|
-
|
|
memory@80000000 {
|
|
reg = <0x80000000 0x10000000>;
|
|
};
|
|
--- a/arch/arm/boot/dts/bcm953012k.dts
|
|
+++ b/arch/arm/boot/dts/bcm953012k.dts
|
|
@@ -43,10 +43,6 @@
|
|
serial1 = &uart1;
|
|
};
|
|
|
|
- chosen {
|
|
- stdout-path = "serial0:115200n8";
|
|
- };
|
|
-
|
|
memory {
|
|
reg = <0x80000000 0x10000000>;
|
|
};
|