summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRafał Miłecki <rafal@milecki.pl>2017-04-20 22:15:09 +0200
committerRafał Miłecki <rafal@milecki.pl>2017-05-09 11:18:39 +0200
commitd1e0cc8cd5b460df47a2316653c273e27ebf93b1 (patch)
treee9f59fc1b070afa71c1b358518a1c773cd98be78
parent86196830371c07c2b5721002f2ad500ca893076e (diff)
downloadmtk-20170518-d1e0cc8cd5b460df47a2316653c273e27ebf93b1.zip
mtk-20170518-d1e0cc8cd5b460df47a2316653c273e27ebf93b1.tar.gz
mtk-20170518-d1e0cc8cd5b460df47a2316653c273e27ebf93b1.tar.bz2
bcm53xx: backport DT patches for serial, thermal and MDIO
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
-rw-r--r--target/linux/bcm53xx/patches-4.4/047-0018-ARM-dts-BCM5301X-Specify-serial-console-params-in-dt.patch161
-rw-r--r--target/linux/bcm53xx/patches-4.4/047-0019-ARM-dts-BCM53573-Specify-serial-console-parameters.patch33
-rw-r--r--target/linux/bcm53xx/patches-4.4/047-0020-ARM-dts-BCM5301X-Add-CPU-thermal-sensor-and-zone.patch59
-rw-r--r--target/linux/bcm53xx/patches-4.4/047-0021-ARM-dts-BCM5301X-Specify-MDIO-bus-in-the-DT.patch34
-rw-r--r--target/linux/bcm53xx/patches-4.4/905-BCM53573-minor-hacks.patch2
5 files changed, 288 insertions, 1 deletions
diff --git a/target/linux/bcm53xx/patches-4.4/047-0018-ARM-dts-BCM5301X-Specify-serial-console-params-in-dt.patch b/target/linux/bcm53xx/patches-4.4/047-0018-ARM-dts-BCM5301X-Specify-serial-console-params-in-dt.patch
new file mode 100644
index 0000000..d174adc
--- /dev/null
+++ b/target/linux/bcm53xx/patches-4.4/047-0018-ARM-dts-BCM5301X-Specify-serial-console-params-in-dt.patch
@@ -0,0 +1,161 @@
+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 = <0x00000000 0x10000000>;
+ };
diff --git a/target/linux/bcm53xx/patches-4.4/047-0019-ARM-dts-BCM53573-Specify-serial-console-parameters.patch b/target/linux/bcm53xx/patches-4.4/047-0019-ARM-dts-BCM53573-Specify-serial-console-parameters.patch
new file mode 100644
index 0000000..b2a9a1f
--- /dev/null
+++ b/target/linux/bcm53xx/patches-4.4/047-0019-ARM-dts-BCM53573-Specify-serial-console-parameters.patch
@@ -0,0 +1,33 @@
+From 3a599e0dbc03ffc51568cf3376633d127451632d 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:28 +0100
+Subject: [PATCH] ARM: dts: BCM53573: Specify serial console parameters
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This adds baud rate, parity & number of data bits. It's required to get
+serial working correctly.
+
+Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
+Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
+---
+ arch/arm/boot/dts/bcm53573.dtsi | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+--- a/arch/arm/boot/dts/bcm53573.dtsi
++++ b/arch/arm/boot/dts/bcm53573.dtsi
+@@ -13,8 +13,12 @@
+ / {
+ interrupt-parent = <&gic>;
+
++ aliases {
++ serial0 = &uart0;
++ };
++
+ chosen {
+- stdout-path = &uart0;
++ stdout-path = "serial0:115200n8";
+ };
+
+ cpus {
diff --git a/target/linux/bcm53xx/patches-4.4/047-0020-ARM-dts-BCM5301X-Add-CPU-thermal-sensor-and-zone.patch b/target/linux/bcm53xx/patches-4.4/047-0020-ARM-dts-BCM5301X-Add-CPU-thermal-sensor-and-zone.patch
new file mode 100644
index 0000000..461696e
--- /dev/null
+++ b/target/linux/bcm53xx/patches-4.4/047-0020-ARM-dts-BCM5301X-Add-CPU-thermal-sensor-and-zone.patch
@@ -0,0 +1,59 @@
+From e55d2c7272ff647efac4aecd895b20ee66e43519 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
+Date: Fri, 14 Apr 2017 23:42:28 +0200
+Subject: [PATCH] ARM: dts: BCM5301X: Add CPU thermal sensor and zone
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This uses CPU thermal sensor available on every Northstar chipset to
+monitor temperature. We don't have any cooling or throttling so only a
+critical trip was added.
+
+Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
+Acked-by: Jon Mason <jon.mason@broadcom.com>
+Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
+---
+ arch/arm/boot/dts/bcm5301x.dtsi | 26 ++++++++++++++++++++++++++
+ 1 file changed, 26 insertions(+)
+
+--- a/arch/arm/boot/dts/bcm5301x.dtsi
++++ b/arch/arm/boot/dts/bcm5301x.dtsi
+@@ -363,6 +363,12 @@
+ "sata2";
+ };
+
++ thermal: thermal@1800c2c0 {
++ compatible = "brcm,ns-thermal";
++ reg = <0x1800c2c0 0x10>;
++ #thermal-sensor-cells = <0>;
++ };
++
+ srab: srab@18007000 {
+ compatible = "brcm,bcm5301x-srab";
+ reg = <0x18007000 0x1000>;
+@@ -390,4 +396,24 @@
+
+ brcm,nand-has-wp;
+ };
++
++ thermal-zones {
++ cpu_thermal: cpu-thermal {
++ polling-delay-passive = <0>;
++ polling-delay = <1000>;
++ coefficients = <(-556) 418000>;
++ thermal-sensors = <&thermal>;
++
++ trips {
++ cpu-crit {
++ temperature = <125000>;
++ hysteresis = <0>;
++ type = "critical";
++ };
++ };
++
++ cooling-maps {
++ };
++ };
++ };
+ };
diff --git a/target/linux/bcm53xx/patches-4.4/047-0021-ARM-dts-BCM5301X-Specify-MDIO-bus-in-the-DT.patch b/target/linux/bcm53xx/patches-4.4/047-0021-ARM-dts-BCM5301X-Specify-MDIO-bus-in-the-DT.patch
new file mode 100644
index 0000000..8449a34
--- /dev/null
+++ b/target/linux/bcm53xx/patches-4.4/047-0021-ARM-dts-BCM5301X-Specify-MDIO-bus-in-the-DT.patch
@@ -0,0 +1,34 @@
+From c4b88e77c28fad5151a1a4eac516b947e2d51be5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
+Date: Wed, 19 Apr 2017 23:54:25 +0200
+Subject: [PATCH] ARM: dts: BCM5301X: Specify MDIO bus in the DT
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Northstar devices have MDIO bus that may contain various PHYs attached.
+A common example is USB 3.0 PHY (that doesn't have an MDIO driver yet).
+
+Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
+Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
+---
+ arch/arm/boot/dts/bcm5301x.dtsi | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+--- a/arch/arm/boot/dts/bcm5301x.dtsi
++++ b/arch/arm/boot/dts/bcm5301x.dtsi
+@@ -334,6 +334,14 @@
+ };
+ };
+
++ mdio: mdio@18003000 {
++ compatible = "brcm,iproc-mdio";
++ reg = <0x18003000 0x8>;
++ #size-cells = <1>;
++ #address-cells = <0>;
++ status = "disabled";
++ };
++
+ i2c0: i2c@18009000 {
+ compatible = "brcm,iproc-i2c";
+ reg = <0x18009000 0x50>;
diff --git a/target/linux/bcm53xx/patches-4.4/905-BCM53573-minor-hacks.patch b/target/linux/bcm53xx/patches-4.4/905-BCM53573-minor-hacks.patch
index e48d3aa..44297c8 100644
--- a/target/linux/bcm53xx/patches-4.4/905-BCM53573-minor-hacks.patch
+++ b/target/linux/bcm53xx/patches-4.4/905-BCM53573-minor-hacks.patch
@@ -11,7 +11,7 @@ Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
--- a/arch/arm/boot/dts/bcm53573.dtsi
+++ b/arch/arm/boot/dts/bcm53573.dtsi
-@@ -44,6 +44,15 @@
+@@ -48,6 +48,15 @@
};
};