Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1455964 > unrolled thread
| Started by | Jon Mason <jon.mason@broadcom.com> |
|---|---|
| First post | 2016-08-03 20:50 +0200 |
| Last post | 2016-08-09 03:50 +0200 |
| Articles | 6 — 2 participants |
Back to article view | Back to linux.kernel
[PATCH 00/11] ARM: dts: NSP: define SATA, Reboot, RAM and new device tree files Jon Mason <jon.mason@broadcom.com> - 2016-08-03 20:50 +0200
[PATCH 09/11] ARM: dts: NSP: Add new DT file for bcm988312hr Jon Mason <jon.mason@broadcom.com> - 2016-08-03 20:50 +0200
[PATCH 03/11] ARM: dts: NSP: Specify RAM amount for BCM958625K board Jon Mason <jon.mason@broadcom.com> - 2016-08-03 20:50 +0200
[PATCH 05/11] ARM: dts: NSP: Add GPIO reboot method to bcm958625hr DTS file Jon Mason <jon.mason@broadcom.com> - 2016-08-03 21:10 +0200
[PATCH 07/11] ARM: dts: NSP: Add new DT file for bcm958525er Jon Mason <jon.mason@broadcom.com> - 2016-08-03 21:50 +0200
Re: [PATCH 00/11] ARM: dts: NSP: define SATA, Reboot, RAM and new device tree files Florian Fainelli <f.fainelli@gmail.com> - 2016-08-09 03:50 +0200
| From | Jon Mason <jon.mason@broadcom.com> |
|---|---|
| Date | 2016-08-03 20:50 +0200 |
| Subject | [PATCH 00/11] ARM: dts: NSP: define SATA, Reboot, RAM and new device tree files |
| Message-ID | <s29oR-6hy-3@gated-at.bofh.it> |
This patch series adds SATA and RAM for the existing HR and XMC device tree files (as they were missed when those peices were originally added). It also adds GPIO rebooting to the platforms that support that feature. Finally, add device tree files for all known NSP based reference boards. The only outstanding HW that isn't fully supported on all NSP boards is USB and sound. So, we're getting close :) NOTE: SATA is not in the NSP DTSI in Florian's git tree, but it is currently in Linus' (due to it going through another maintainer). So, it won't build until the merge with Linus' tree is done. I thought it better to do it this way instead of splitting it off and sending it as a follow-on in a couple of weeks. Let me know if it is preferred I do it that way. Thanks, Jon Jon Mason (11): ARM: dts: NSP: Enable SATA on bcm958625hr ARM: dts: NSP: Enable SATA and add i2c devices on XMC ARM: dts: NSP: Specify RAM amount for BCM958625K board ARM: dts: NSP: Specify RAM amount for BCM958525XMC board ARM: dts: NSP: Add GPIO reboot method to bcm958625hr DTS file ARM: dts: NSP: Add GPIO reboot method to bcm958625xmc DTS file ARM: dts: NSP: Add new DT file for bcm958525er ARM: dts: NSP: Add new DT file for bcm958522er ARM: dts: NSP: Add new DT file for bcm988312hr ARM: dts: NSP: Add new DT file for bcm958623hr ARM: dts: NSP: Add new DT file for bcm958622hr arch/arm/boot/dts/Makefile | 5 + arch/arm/boot/dts/bcm958522er.dts | 130 ++++++++++++++++++++++++++ arch/arm/boot/dts/bcm958525er.dts | 142 +++++++++++++++++++++++++++++ arch/arm/boot/dts/bcm958525xmc.dts | 44 ++++++++- arch/arm/boot/dts/bcm958622hr.dts | 170 ++++++++++++++++++++++++++++++++++ arch/arm/boot/dts/bcm958623hr.dts | 178 ++++++++++++++++++++++++++++++++++++ arch/arm/boot/dts/bcm958625hr.dts | 19 ++++ arch/arm/boot/dts/bcm958625k.dts | 5 + arch/arm/boot/dts/bcm988312hr.dts | 182 +++++++++++++++++++++++++++++++++++++ 9 files changed, 874 insertions(+), 1 deletion(-) create mode 100644 arch/arm/boot/dts/bcm958522er.dts create mode 100644 arch/arm/boot/dts/bcm958525er.dts create mode 100644 arch/arm/boot/dts/bcm958622hr.dts create mode 100644 arch/arm/boot/dts/bcm958623hr.dts create mode 100644 arch/arm/boot/dts/bcm988312hr.dts -- 2.7.4
[toc] | [next] | [standalone]
| From | Jon Mason <jon.mason@broadcom.com> |
|---|---|
| Date | 2016-08-03 20:50 +0200 |
| Subject | [PATCH 09/11] ARM: dts: NSP: Add new DT file for bcm988312hr |
| Message-ID | <s29oS-6hy-25@gated-at.bofh.it> |
| In reply to | #1455964 |
Create a new device tree file for the Broadcom Northstar Plus
bcm988312hr SVK. This SVK has 2GB RAM, 5 ports Ethernet, 2 eSATA, 2 PCI
slots, and 1 UART. Also, it has the ability to reboot via GPIO. To be
added in the future is support for the USB.
Signed-off-by: Jon Mason <jon.mason@broadcom.com>
---
arch/arm/boot/dts/Makefile | 1 +
arch/arm/boot/dts/bcm988312hr.dts | 182 ++++++++++++++++++++++++++++++++++++++
2 files changed, 183 insertions(+)
create mode 100644 arch/arm/boot/dts/bcm988312hr.dts
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 7c04e31..190528d 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -103,6 +103,7 @@ dtb-$(CONFIG_ARCH_BCM_NSP) += \
bcm958525er.dtb \
bcm958525xmc.dtb \
bcm958625hr.dtb \
+ bcm988312hr.dtb \
bcm958625k.dtb
dtb-$(CONFIG_ARCH_BERLIN) += \
berlin2-sony-nsz-gs7.dtb \
diff --git a/arch/arm/boot/dts/bcm988312hr.dts b/arch/arm/boot/dts/bcm988312hr.dts
new file mode 100644
index 0000000..104afe9
--- /dev/null
+++ b/arch/arm/boot/dts/bcm988312hr.dts
@@ -0,0 +1,182 @@
+/*
+ * BSD LICENSE
+ *
+ * Copyright(c) 2016 Broadcom. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ * * Neither the name of Broadcom Corporation nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/dts-v1/;
+
+#include "bcm-nsp.dtsi"
+#include <dt-bindings/gpio/gpio.h>
+
+/ {
+ model = "NorthStar Plus SVK (BCM988312HR)";
+ compatible = "brcm,bcm88312", "brcm,nsp";
+
+ aliases {
+ serial0 = &uart0;
+ };
+
+ chosen {
+ stdout-path = "serial0:115200n8";
+ };
+
+ memory {
+ device_type = "memory";
+ reg = <0x60000000 0x80000000>;
+ };
+
+ gpio-restart {
+ compatible = "gpio-restart";
+ gpios = <&gpioa 15 GPIO_ACTIVE_LOW>;
+ priority = <200>;
+ };
+};
+
+/* USB 2/3 support needed to be complete */
+
+&amac0 {
+ status = "okay";
+};
+
+&nand {
+ nandcs@0 {
+ compatible = "brcm,nandcs";
+ reg = <0>;
+ nand-on-flash-bbt;
+
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ nand-ecc-strength = <24>;
+ nand-ecc-step-size = <1024>;
+
+ brcm,nand-oob-sector-size = <27>;
+
+ partition@0 {
+ label = "nboot";
+ reg = <0x00000000 0x00200000>;
+ read-only;
+ };
+ partition@200000 {
+ label = "nenv";
+ reg = <0x00200000 0x00400000>;
+ };
+ partition@600000 {
+ label = "nsystem";
+ reg = <0x00600000 0x00a00000>;
+ };
+ partition@1000000 {
+ label = "nrootfs";
+ reg = <0x01000000 0x03000000>;
+ };
+ partition@4000000 {
+ label = "ncustfs";
+ reg = <0x04000000 0x3c000000>;
+ };
+ };
+};
+
+&pcie0 {
+ status = "okay";
+};
+
+&pcie1 {
+ status = "okay";
+};
+
+&pinctrl {
+ pinctrl-names = "default";
+ pinctrl-0 = <&nand_sel>;
+ nand_sel: nand_sel {
+ function = "nand";
+ groups = "nand_grp";
+ };
+};
+
+&sata_phy0 {
+ status = "okay";
+};
+
+&sata_phy1 {
+ status = "okay";
+};
+
+&sata {
+ status = "okay";
+};
+
+&srab {
+ compatible = "brcm,bcm88312-srab", "brcm,nsp-srab";
+ status = "okay";
+
+ ports {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ port@0 {
+ label = "port0";
+ reg = <0>;
+ };
+
+ port@1 {
+ label = "port1";
+ reg = <1>;
+ };
+
+ port@2 {
+ label = "port2";
+ reg = <2>;
+ };
+
+ port@3 {
+ label = "port3";
+ reg = <3>;
+ };
+
+ port@4 {
+ label = "port4";
+ reg = <4>;
+ };
+
+ port@5 {
+ ethernet = <&amac0>;
+ label = "cpu";
+ reg = <5>;
+ fixed-link {
+ speed = <1000>;
+ full-duplex;
+ };
+ };
+ };
+};
+
+&uart0 {
+ status = "okay";
+};
--
2.7.4
[toc] | [prev] | [next] | [standalone]
| From | Jon Mason <jon.mason@broadcom.com> |
|---|---|
| Date | 2016-08-03 20:50 +0200 |
| Subject | [PATCH 03/11] ARM: dts: NSP: Specify RAM amount for BCM958625K board |
| Message-ID | <s29oT-6hy-39@gated-at.bofh.it> |
| In reply to | #1455964 |
Add 2GB of memory starting at physical offset 0x6000_0000.
Signed-off-by: Jon Mason <jon.mason@broadcom.com>
---
arch/arm/boot/dts/bcm958625k.dts | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/arch/arm/boot/dts/bcm958625k.dts b/arch/arm/boot/dts/bcm958625k.dts
index f41a13b..feed1b7 100644
--- a/arch/arm/boot/dts/bcm958625k.dts
+++ b/arch/arm/boot/dts/bcm958625k.dts
@@ -46,6 +46,11 @@
chosen {
stdout-path = "serial0:115200n8";
};
+
+ memory {
+ device_type = "memory";
+ reg = <0x60000000 0x80000000>;
+ };
};
&uart0 {
--
2.7.4
[toc] | [prev] | [next] | [standalone]
| From | Jon Mason <jon.mason@broadcom.com> |
|---|---|
| Date | 2016-08-03 21:10 +0200 |
| Subject | [PATCH 05/11] ARM: dts: NSP: Add GPIO reboot method to bcm958625hr DTS file |
| Message-ID | <s29Id-6D8-3@gated-at.bofh.it> |
| In reply to | #1455964 |
Add the ability to reboot the bcm958625hr board via GPIO.
Unfortunately, not all of the NSP based boards use the same GPIO pin and
one doesn't have the ability to reboot via GPIO at all. So, this will
need to be specified per DTS file.
Signed-off-by: Jon Mason <jon.mason@broadcom.com>
---
arch/arm/boot/dts/bcm958625hr.dts | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/arch/arm/boot/dts/bcm958625hr.dts b/arch/arm/boot/dts/bcm958625hr.dts
index 78970b9..d72baf7 100644
--- a/arch/arm/boot/dts/bcm958625hr.dts
+++ b/arch/arm/boot/dts/bcm958625hr.dts
@@ -33,6 +33,7 @@
/dts-v1/;
#include "bcm-nsp.dtsi"
+#include <dt-bindings/gpio/gpio.h>
/ {
model = "NorthStar Plus SVK (BCM958625HR)";
@@ -49,6 +50,12 @@
memory {
reg = <0x60000000 0x20000000>;
};
+
+ gpio-restart {
+ compatible = "gpio-restart";
+ gpios = <&gpioa 15 GPIO_ACTIVE_LOW>;
+ priority = <200>;
+ };
};
&nand {
--
2.7.4
[toc] | [prev] | [next] | [standalone]
| From | Jon Mason <jon.mason@broadcom.com> |
|---|---|
| Date | 2016-08-03 21:50 +0200 |
| Subject | [PATCH 07/11] ARM: dts: NSP: Add new DT file for bcm958525er |
| Message-ID | <s2akW-6WY-19@gated-at.bofh.it> |
| In reply to | #1455964 |
Create a new device tree file for the Broadcom Northstar Plus
bcm958525er SVK. This SVK has 2GB RAM, 2 ports Ethernet, 2 eSATA, 2 PCI
slots, and 1 UART. Also, it has the ability to reboot via GPIO. To be
added in the future is support for the USB.
Signed-off-by: Jon Mason <jon.mason@broadcom.com>
---
arch/arm/boot/dts/Makefile | 1 +
arch/arm/boot/dts/bcm958525er.dts | 142 ++++++++++++++++++++++++++++++++++++++
2 files changed, 143 insertions(+)
create mode 100644 arch/arm/boot/dts/bcm958525er.dts
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 973b0da..8a05bf6 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -99,6 +99,7 @@ dtb-$(CONFIG_ARCH_BCM_MOBILE) += \
bcm21664-garnet.dtb \
bcm23550-sparrow.dtb
dtb-$(CONFIG_ARCH_BCM_NSP) += \
+ bcm958525er.dtb \
bcm958525xmc.dtb \
bcm958625hr.dtb \
bcm958625k.dtb
diff --git a/arch/arm/boot/dts/bcm958525er.dts b/arch/arm/boot/dts/bcm958525er.dts
new file mode 100644
index 0000000..be7f2f8
--- /dev/null
+++ b/arch/arm/boot/dts/bcm958525er.dts
@@ -0,0 +1,142 @@
+/*
+ * BSD LICENSE
+ *
+ * Copyright(c) 2016 Broadcom. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ * * Neither the name of Broadcom Corporation nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/dts-v1/;
+
+#include "bcm-nsp.dtsi"
+#include <dt-bindings/gpio/gpio.h>
+
+/ {
+ model = "NorthStar Plus SVK (BCM958525ER)";
+ compatible = "brcm,bcm58525", "brcm,nsp";
+
+ aliases {
+ serial0 = &uart0;
+ };
+
+ chosen {
+ stdout-path = "serial0:115200n8";
+ };
+
+ memory {
+ device_type = "memory";
+ reg = <0x60000000 0x80000000>;
+ };
+
+ gpio-restart {
+ compatible = "gpio-restart";
+ gpios = <&gpioa 15 GPIO_ACTIVE_LOW>;
+ priority = <200>;
+ };
+};
+
+/* USB 2/3 support needed to be complete */
+
+&amac0 {
+ status = "okay";
+};
+
+
+&amac1 {
+ status = "okay";
+};
+
+&nand {
+ nandcs@0 {
+ compatible = "brcm,nandcs";
+ reg = <0>;
+ nand-on-flash-bbt;
+
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ nand-ecc-strength = <24>;
+ nand-ecc-step-size = <1024>;
+
+ brcm,nand-oob-sector-size = <27>;
+
+ partition@0 {
+ label = "nboot";
+ reg = <0x00000000 0x00200000>;
+ read-only;
+ };
+ partition@200000 {
+ label = "nenv";
+ reg = <0x00200000 0x00400000>;
+ };
+ partition@600000 {
+ label = "nsystem";
+ reg = <0x00600000 0x00a00000>;
+ };
+ partition@1000000 {
+ label = "nrootfs";
+ reg = <0x01000000 0x03000000>;
+ };
+ partition@4000000 {
+ label = "ncustfs";
+ reg = <0x04000000 0x3c000000>;
+ };
+ };
+};
+
+&pcie0 {
+ status = "okay";
+};
+
+&pcie1 {
+ status = "okay";
+};
+
+&pinctrl {
+ pinctrl-names = "default";
+ pinctrl-0 = <&nand_sel>;
+ nand_sel: nand_sel {
+ function = "nand";
+ groups = "nand_grp";
+ };
+};
+
+&sata_phy0 {
+ status = "okay";
+};
+
+&sata_phy1 {
+ status = "okay";
+};
+
+&sata {
+ status = "okay";
+};
+
+&uart0 {
+ status = "okay";
+};
--
2.7.4
[toc] | [prev] | [next] | [standalone]
| From | Florian Fainelli <f.fainelli@gmail.com> |
|---|---|
| Date | 2016-08-09 03:50 +0200 |
| Subject | Re: [PATCH 00/11] ARM: dts: NSP: define SATA, Reboot, RAM and new device tree files |
| Message-ID | <s44l3-Wf-5@gated-at.bofh.it> |
| In reply to | #1455964 |
On 08/03/2016 11:38 AM, Jon Mason wrote: > This patch series adds SATA and RAM for the existing HR and XMC device > tree files (as they were missed when those peices were originally > added). It also adds GPIO rebooting to the platforms that support that > feature. Finally, add device tree files for all known NSP based > reference boards. > > The only outstanding HW that isn't fully supported on all NSP boards is > USB and sound. So, we're getting close :) > > NOTE: SATA is not in the NSP DTSI in Florian's git tree, but it is > currently in Linus' (due to it going through another maintainer). So, > it won't build until the merge with Linus' tree is done. I thought it > better to do it this way instead of splitting it off and sending it as > a follow-on in a couple of weeks. Let me know if it is preferred I do > it that way. Series applied, thanks Jon! -- Florian
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web