* [PATCH 2/6] MIPS: BMIPS: Add device tree example for BCM63268
2016-06-13 7:38 [PATCH 1/6] MIPS: BMIPS: add missing console to bcm96358nb4ser Álvaro Fernández Rojas
@ 2016-06-13 7:38 ` Álvaro Fernández Rojas
2016-06-13 7:38 ` [PATCH 3/6] MIPS: BMIPS: Add BCM3368 support Álvaro Fernández Rojas
` (4 subsequent siblings)
5 siblings, 0 replies; 10+ messages in thread
From: Álvaro Fernández Rojas @ 2016-06-13 7:38 UTC (permalink / raw)
To: linux-mips, linux-kernel, devicetree, ralf, f.fainelli, jogo,
cernekee, robh, simon
Cc: Álvaro Fernández Rojas
This adds a device tree example for Comtrend VR-3032u, which
also serves as a real example for brcm,bcm6328-leds.
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
---
arch/mips/bmips/Kconfig | 4 +
arch/mips/boot/dts/brcm/Makefile | 2 +
arch/mips/boot/dts/brcm/bcm63268.dtsi | 134 +++++++++++++++++++++++++++
arch/mips/boot/dts/brcm/bcm963268vr3032u.dts | 108 +++++++++++++++++++++
4 files changed, 248 insertions(+)
create mode 100644 arch/mips/boot/dts/brcm/bcm63268.dtsi
create mode 100644 arch/mips/boot/dts/brcm/bcm963268vr3032u.dts
diff --git a/arch/mips/bmips/Kconfig b/arch/mips/bmips/Kconfig
index 264328d..14f4b4c 100644
--- a/arch/mips/bmips/Kconfig
+++ b/arch/mips/bmips/Kconfig
@@ -21,6 +21,10 @@ config DT_BCM93384WVG_VIPER
bool "BCM93384WVG Viper CPU (EXPERIMENTAL)"
select BUILTIN_DTB
+config DT_BCM963268VR3032U
+ bool "BCM963268VR3032U"
+ select BUILTIN_DTB
+
config DT_BCM96358NB4SER
bool "BCM96358NB4SER"
select BUILTIN_DTB
diff --git a/arch/mips/boot/dts/brcm/Makefile b/arch/mips/boot/dts/brcm/Makefile
index fda9d38..2060e70 100644
--- a/arch/mips/boot/dts/brcm/Makefile
+++ b/arch/mips/boot/dts/brcm/Makefile
@@ -1,5 +1,6 @@
dtb-$(CONFIG_DT_BCM93384WVG) += bcm93384wvg.dtb
dtb-$(CONFIG_DT_BCM93384WVG_VIPER) += bcm93384wvg_viper.dtb
+dtb-$(CONFIG_DT_BCM963268VR3032U) += bcm963268vr3032u.dtb
dtb-$(CONFIG_DT_BCM96358NB4SER) += bcm96358nb4ser.dtb
dtb-$(CONFIG_DT_BCM96368MVWG) += bcm96368mvwg.dtb
dtb-$(CONFIG_DT_BCM9EJTAGPRB) += bcm9ejtagprb.dtb
@@ -15,6 +16,7 @@ dtb-$(CONFIG_DT_BCM97435SVMB) += bcm97435svmb.dtb
dtb-$(CONFIG_DT_NONE) += \
bcm93384wvg.dtb \
bcm93384wvg_viper.dtb \
+ bcm963268vr3032u.dtb \
bcm96358nb4ser.dtb \
bcm96368mvwg.dtb \
bcm9ejtagprb.dtb \
diff --git a/arch/mips/boot/dts/brcm/bcm63268.dtsi b/arch/mips/boot/dts/brcm/bcm63268.dtsi
new file mode 100644
index 0000000..7e6bf2c
--- /dev/null
+++ b/arch/mips/boot/dts/brcm/bcm63268.dtsi
@@ -0,0 +1,134 @@
+/ {
+ #address-cells = <1>;
+ #size-cells = <1>;
+ compatible = "brcm,bcm63268";
+
+ cpus {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ mips-hpt-frequency = <200000000>;
+
+ cpu@0 {
+ compatible = "brcm,bmips4350";
+ device_type = "cpu";
+ reg = <0>;
+ };
+
+ cpu@1 {
+ compatible = "brcm,bmips4350";
+ device_type = "cpu";
+ reg = <1>;
+ };
+ };
+
+ clocks {
+ periph_clk: periph-clk {
+ compatible = "fixed-clock";
+ #clock-cells = <0>;
+ clock-frequency = <50000000>;
+ };
+ };
+
+ aliases {
+ serial0 = &uart0;
+ serial1 = &uart1;
+ };
+
+ cpu_intc: interrupt-controller {
+ #address-cells = <0>;
+ compatible = "mti,cpu-interrupt-controller";
+
+ interrupt-controller;
+ #interrupt-cells = <1>;
+ };
+
+ ubus {
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ compatible = "simple-bus";
+ ranges;
+
+ periph_cntl: syscon@10000000 {
+ compatible = "syscon";
+ reg = <0x10000000 0x14>;
+ native-endian;
+ };
+
+ reboot: syscon-reboot@10000008 {
+ compatible = "syscon-reboot";
+ regmap = <&periph_cntl>;
+ offset = <0x8>;
+ mask = <0x1>;
+ };
+
+ periph_intc: interrupt-controller@10000020 {
+ compatible = "brcm,bcm6345-l1-intc";
+ reg = <0x10000020 0x20>,
+ <0x10000040 0x20>;
+
+ interrupt-controller;
+ #interrupt-cells = <1>;
+
+ interrupt-parent = <&cpu_intc>;
+ interrupts = <2>, <3>;
+ };
+
+ uart0: serial@10000180 {
+ compatible = "brcm,bcm6345-uart";
+ reg = <0x10000180 0x18>;
+
+ interrupt-parent = <&periph_intc>;
+ interrupts = <5>;
+
+ clocks = <&periph_clk>;
+
+ status = "disabled";
+ };
+
+ uart1: serial@100001a0 {
+ compatible = "brcm,bcm6345-uart";
+ reg = <0x100001a0 0x18>;
+
+ interrupt-parent = <&periph_intc>;
+ interrupts = <34>;
+
+ clocks = <&periph_clk>;
+
+ status = "disabled";
+ };
+
+ leds0: led-controller@10001900 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ compatible = "brcm,bcm6328-leds";
+ reg = <0x10001900 0x24>;
+
+ status = "disabled";
+ };
+
+ ehci: usb@10002500 {
+ compatible = "brcm,bcm63268-ehci", "generic-ehci";
+ reg = <0x10002500 0x100>;
+ big-endian;
+
+ interrupt-parent = <&periph_intc>;
+ interrupts = <10>;
+
+ status = "disabled";
+ };
+
+ ohci: usb@10002600 {
+ compatible = "brcm,bcm63268-ohci", "generic-ohci";
+ reg = <0x10002600 0x100>;
+ big-endian;
+ no-big-frame-no;
+
+ interrupt-parent = <&periph_intc>;
+ interrupts = <9>;
+
+ status = "disabled";
+ };
+ };
+};
diff --git a/arch/mips/boot/dts/brcm/bcm963268vr3032u.dts b/arch/mips/boot/dts/brcm/bcm963268vr3032u.dts
new file mode 100644
index 0000000..430d35c
--- /dev/null
+++ b/arch/mips/boot/dts/brcm/bcm963268vr3032u.dts
@@ -0,0 +1,108 @@
+/dts-v1/;
+
+/include/ "bcm63268.dtsi"
+
+/ {
+ compatible = "comtrend,vr-3032u", "brcm,bcm63268";
+ model = "Comtrend VR-3032u";
+
+ memory@0 {
+ device_type = "memory";
+ reg = <0x00000000 0x04000000>;
+ };
+
+ chosen {
+ bootargs = "console=ttyS0,115200";
+ stdout-path = &uart0;
+ };
+};
+
+&leds0 {
+ status = "ok";
+ brcm,serial-leds;
+ brcm,serial-dat-low;
+ brcm,serial-shift-inv;
+
+ led@0 {
+ reg = <0>;
+ brcm,hardware-controlled;
+ brcm,link-signal-sources = <0>;
+ /* GPHY0 Speed 0 */
+ };
+ led@1 {
+ reg = <1>;
+ brcm,hardware-controlled;
+ brcm,link-signal-sources = <1>;
+ /* GPHY0 Speed 1 */
+ };
+ led@2 {
+ reg = <2>;
+ active-low;
+ label = "vr-3032u:red:inet";
+ };
+ led@3 {
+ reg = <3>;
+ active-low;
+ label = "vr-3032u:green:dsl";
+ };
+ led@4 {
+ reg = <4>;
+ active-low;
+ label = "vr-3032u:green:usb";
+ };
+ led@7 {
+ reg = <7>;
+ active-low;
+ label = "vr-3032u:green:wps";
+ };
+ led@8 {
+ reg = <8>;
+ active-low;
+ label = "vr-3032u:green:inet";
+ };
+ led@9 {
+ reg = <9>;
+ brcm,hardware-controlled;
+ /* EPHY0 Activity */
+ };
+ led@10 {
+ reg = <10>;
+ brcm,hardware-controlled;
+ /* EPHY1 Activity */
+ };
+ led@11 {
+ reg = <11>;
+ brcm,hardware-controlled;
+ /* EPHY2 Activity */
+ };
+ led@12 {
+ reg = <12>;
+ brcm,hardware-controlled;
+ /* GPHY0 Activity */
+ };
+ led@13 {
+ reg = <13>;
+ brcm,hardware-controlled;
+ /* EPHY0 Speed */
+ };
+ led@14 {
+ reg = <14>;
+ brcm,hardware-controlled;
+ /* EPHY1 Speed */
+ };
+ led@15 {
+ reg = <15>;
+ brcm,hardware-controlled;
+ /* EPHY2 Speed */
+ };
+ led@20 {
+ reg = <20>;
+ active-low;
+ label = "vr-3032u:green:power";
+ default-state = "on";
+ };
+};
+
+&uart0 {
+ status = "okay";
+};
--
2.1.4
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 3/6] MIPS: BMIPS: Add BCM3368 support
2016-06-13 7:38 [PATCH 1/6] MIPS: BMIPS: add missing console to bcm96358nb4ser Álvaro Fernández Rojas
2016-06-13 7:38 ` [PATCH 2/6] MIPS: BMIPS: Add device tree example for BCM63268 Álvaro Fernández Rojas
@ 2016-06-13 7:38 ` Álvaro Fernández Rojas
2016-06-14 22:32 ` Rob Herring
2016-06-13 7:38 ` [PATCH 4/6] MIPS: BMIPS: Add device tree example for BCM3368 Álvaro Fernández Rojas
` (3 subsequent siblings)
5 siblings, 1 reply; 10+ messages in thread
From: Álvaro Fernández Rojas @ 2016-06-13 7:38 UTC (permalink / raw)
To: linux-mips, linux-kernel, devicetree, ralf, f.fainelli, jogo,
cernekee, robh, simon
Cc: Álvaro Fernández Rojas
BCM3368 has a shared TLB which conflicts with current SMP support, so it must
be disabled for now.
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
---
Documentation/devicetree/bindings/mips/brcm/soc.txt | 2 +-
arch/mips/bmips/setup.c | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/Documentation/devicetree/bindings/mips/brcm/soc.txt b/Documentation/devicetree/bindings/mips/brcm/soc.txt
index 4a7e030..65bc572 100644
--- a/Documentation/devicetree/bindings/mips/brcm/soc.txt
+++ b/Documentation/devicetree/bindings/mips/brcm/soc.txt
@@ -2,7 +2,7 @@
Required properties:
-- compatible: "brcm,bcm3384", "brcm,bcm33843"
+- compatible: "brcm,bcm3368", "brcm,bcm3384", "brcm,bcm33843"
"brcm,bcm3384-viper", "brcm,bcm33843-viper"
"brcm,bcm6328", "brcm,bcm6358", "brcm,bcm6368",
"brcm,bcm63168", "brcm,bcm63268",
diff --git a/arch/mips/bmips/setup.c b/arch/mips/bmips/setup.c
index f146d12..4fbd2f1 100644
--- a/arch/mips/bmips/setup.c
+++ b/arch/mips/bmips/setup.c
@@ -98,7 +98,7 @@ static void bcm6328_quirks(void)
static void bcm6358_quirks(void)
{
/*
- * BCM6358 needs special handling for its shared TLB, so
+ * BCM3368/BCM6358 need special handling for their shared TLB, so
* disable SMP for now
*/
bmips_smp_enabled = 0;
@@ -110,6 +110,7 @@ static void bcm6368_quirks(void)
}
static const struct bmips_quirk bmips_quirk_list[] = {
+ { "brcm,bcm3368", &bcm6358_quirks },
{ "brcm,bcm3384-viper", &bcm3384_viper_quirks },
{ "brcm,bcm33843-viper", &bcm3384_viper_quirks },
{ "brcm,bcm6328", &bcm6328_quirks },
--
2.1.4
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [PATCH 3/6] MIPS: BMIPS: Add BCM3368 support
2016-06-13 7:38 ` [PATCH 3/6] MIPS: BMIPS: Add BCM3368 support Álvaro Fernández Rojas
@ 2016-06-14 22:32 ` Rob Herring
0 siblings, 0 replies; 10+ messages in thread
From: Rob Herring @ 2016-06-14 22:32 UTC (permalink / raw)
To: Álvaro Fernández Rojas
Cc: linux-mips, linux-kernel, devicetree, ralf, f.fainelli, jogo,
cernekee, simon
On Mon, Jun 13, 2016 at 09:38:51AM +0200, Álvaro Fernández Rojas wrote:
> BCM3368 has a shared TLB which conflicts with current SMP support, so it must
> be disabled for now.
>
> Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
> ---
> Documentation/devicetree/bindings/mips/brcm/soc.txt | 2 +-
> arch/mips/bmips/setup.c | 3 ++-
> 2 files changed, 3 insertions(+), 2 deletions(-)
Acked-by: Rob Herring <robh@kernel.org>
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH 4/6] MIPS: BMIPS: Add device tree example for BCM3368
2016-06-13 7:38 [PATCH 1/6] MIPS: BMIPS: add missing console to bcm96358nb4ser Álvaro Fernández Rojas
2016-06-13 7:38 ` [PATCH 2/6] MIPS: BMIPS: Add device tree example for BCM63268 Álvaro Fernández Rojas
2016-06-13 7:38 ` [PATCH 3/6] MIPS: BMIPS: Add BCM3368 support Álvaro Fernández Rojas
@ 2016-06-13 7:38 ` Álvaro Fernández Rojas
2016-06-13 7:38 ` [PATCH 5/6] MIPS: BMIPS: Add BCM6362 support Álvaro Fernández Rojas
` (2 subsequent siblings)
5 siblings, 0 replies; 10+ messages in thread
From: Álvaro Fernández Rojas @ 2016-06-13 7:38 UTC (permalink / raw)
To: linux-mips, linux-kernel, devicetree, ralf, f.fainelli, jogo,
cernekee, robh, simon
Cc: Álvaro Fernández Rojas
This adds a device tree example for Netgear CVG834G.
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
---
arch/mips/bmips/Kconfig | 4 ++
arch/mips/boot/dts/brcm/Makefile | 2 +
arch/mips/boot/dts/brcm/bcm3368.dtsi | 101 ++++++++++++++++++++++++++++
arch/mips/boot/dts/brcm/bcm93368cvg834g.dts | 22 ++++++
4 files changed, 129 insertions(+)
create mode 100644 arch/mips/boot/dts/brcm/bcm3368.dtsi
create mode 100644 arch/mips/boot/dts/brcm/bcm93368cvg834g.dts
diff --git a/arch/mips/bmips/Kconfig b/arch/mips/bmips/Kconfig
index 14f4b4c..5b0ad8c 100644
--- a/arch/mips/bmips/Kconfig
+++ b/arch/mips/bmips/Kconfig
@@ -13,6 +13,10 @@ choice
config DT_NONE
bool "None"
+config DT_BCM93368CVG834G
+ bool "BCM93368CVG834G"
+ select BUILTIN_DTB
+
config DT_BCM93384WVG
bool "BCM93384WVG Zephyr CPU"
select BUILTIN_DTB
diff --git a/arch/mips/boot/dts/brcm/Makefile b/arch/mips/boot/dts/brcm/Makefile
index 2060e70..c553b95 100644
--- a/arch/mips/boot/dts/brcm/Makefile
+++ b/arch/mips/boot/dts/brcm/Makefile
@@ -1,3 +1,4 @@
+dtb-$(CONFIG_DT_BCM93368CVG834G) += bcm93368cvg834g.dtb
dtb-$(CONFIG_DT_BCM93384WVG) += bcm93384wvg.dtb
dtb-$(CONFIG_DT_BCM93384WVG_VIPER) += bcm93384wvg_viper.dtb
dtb-$(CONFIG_DT_BCM963268VR3032U) += bcm963268vr3032u.dtb
@@ -14,6 +15,7 @@ dtb-$(CONFIG_DT_BCM97425SVMB) += bcm97425svmb.dtb
dtb-$(CONFIG_DT_BCM97435SVMB) += bcm97435svmb.dtb
dtb-$(CONFIG_DT_NONE) += \
+ bcm93368cvg834g.dtb \
bcm93384wvg.dtb \
bcm93384wvg_viper.dtb \
bcm963268vr3032u.dtb \
diff --git a/arch/mips/boot/dts/brcm/bcm3368.dtsi b/arch/mips/boot/dts/brcm/bcm3368.dtsi
new file mode 100644
index 0000000..bee855c
--- /dev/null
+++ b/arch/mips/boot/dts/brcm/bcm3368.dtsi
@@ -0,0 +1,101 @@
+/ {
+ #address-cells = <1>;
+ #size-cells = <1>;
+ compatible = "brcm,bcm3368";
+
+ cpus {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ mips-hpt-frequency = <150000000>;
+
+ cpu@0 {
+ compatible = "brcm,bmips4350";
+ device_type = "cpu";
+ reg = <0>;
+ };
+
+ cpu@1 {
+ compatible = "brcm,bmips4350";
+ device_type = "cpu";
+ reg = <1>;
+ };
+ };
+
+ clocks {
+ periph_clk: periph-clk {
+ compatible = "fixed-clock";
+ #clock-cells = <0>;
+ clock-frequency = <50000000>;
+ };
+ };
+
+ aliases {
+ serial0 = &uart0;
+ serial1 = &uart1;
+ };
+
+ cpu_intc: interrupt-controller {
+ #address-cells = <0>;
+ compatible = "mti,cpu-interrupt-controller";
+
+ interrupt-controller;
+ #interrupt-cells = <1>;
+ };
+
+ ubus {
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ compatible = "simple-bus";
+ ranges;
+
+ periph_cntl: syscon@fff8c000 {
+ compatible = "syscon";
+ reg = <0xfff8c000 0xc>;
+ native-endian;
+ };
+
+ reboot: syscon-reboot@fff8c008 {
+ compatible = "syscon-reboot";
+ regmap = <&periph_cntl>;
+ offset = <0x8>;
+ mask = <0x1>;
+ };
+
+ periph_intc: interrupt-controller@fff8c00c {
+ compatible = "brcm,bcm6345-l1-intc";
+ reg = <0xfff8c00c 0x8>;
+
+ interrupt-controller;
+ #interrupt-cells = <1>;
+
+ interrupt-parent = <&cpu_intc>;
+ interrupts = <2>;
+ };
+
+ uart0: serial@fff8c100 {
+ compatible = "brcm,bcm6345-uart";
+ reg = <0xfff8c100 0x18>;
+
+ interrupt-parent = <&periph_intc>;
+ interrupts = <2>;
+
+ clocks = <&periph_clk>;
+
+ status = "disabled";
+ };
+
+ uart1: serial@fff8c120 {
+ compatible = "brcm,bcm6345-uart";
+ reg = <0xfff8c120 0x18>;
+
+ interrupt-parent = <&periph_intc>;
+ interrupts = <3>;
+
+ clocks = <&periph_clk>;
+
+ status = "disabled";
+ };
+ };
+};
diff --git a/arch/mips/boot/dts/brcm/bcm93368cvg834g.dts b/arch/mips/boot/dts/brcm/bcm93368cvg834g.dts
new file mode 100644
index 0000000..68475c4
--- /dev/null
+++ b/arch/mips/boot/dts/brcm/bcm93368cvg834g.dts
@@ -0,0 +1,22 @@
+/dts-v1/;
+
+/include/ "bcm3368.dtsi"
+
+/ {
+ compatible = "netgear,cvg834g", "brcm,bcm3368";
+ model = "Netgear CVG834G";
+
+ memory@0 {
+ device_type = "memory";
+ reg = <0x00000000 0x02000000>;
+ };
+
+ chosen {
+ bootargs = "console=ttyS0,115200";
+ stdout-path = &uart0;
+ };
+};
+
+&uart0 {
+ status = "okay";
+};
--
2.1.4
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 5/6] MIPS: BMIPS: Add BCM6362 support
2016-06-13 7:38 [PATCH 1/6] MIPS: BMIPS: add missing console to bcm96358nb4ser Álvaro Fernández Rojas
` (2 preceding siblings ...)
2016-06-13 7:38 ` [PATCH 4/6] MIPS: BMIPS: Add device tree example for BCM3368 Álvaro Fernández Rojas
@ 2016-06-13 7:38 ` Álvaro Fernández Rojas
2016-06-14 22:32 ` Rob Herring
2016-06-13 7:38 ` [PATCH 6/6] MIPS: BMIPS: Add device tree example for BCM6362 Álvaro Fernández Rojas
2016-06-14 14:38 ` [PATCH 1/6] MIPS: BMIPS: add missing console to bcm96358nb4ser Jonas Gorski
5 siblings, 1 reply; 10+ messages in thread
From: Álvaro Fernández Rojas @ 2016-06-13 7:38 UTC (permalink / raw)
To: linux-mips, linux-kernel, devicetree, ralf, f.fainelli, jogo,
cernekee, robh, simon
Cc: Álvaro Fernández Rojas
BCM6362 is a BMIPS4350 SoC which needs the same fixup as BCM6368 in order to
enable SMP support.
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
---
Documentation/devicetree/bindings/mips/brcm/soc.txt | 2 +-
arch/mips/bmips/setup.c | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/Documentation/devicetree/bindings/mips/brcm/soc.txt b/Documentation/devicetree/bindings/mips/brcm/soc.txt
index 65bc572..e4e1cd9 100644
--- a/Documentation/devicetree/bindings/mips/brcm/soc.txt
+++ b/Documentation/devicetree/bindings/mips/brcm/soc.txt
@@ -4,7 +4,7 @@ Required properties:
- compatible: "brcm,bcm3368", "brcm,bcm3384", "brcm,bcm33843"
"brcm,bcm3384-viper", "brcm,bcm33843-viper"
- "brcm,bcm6328", "brcm,bcm6358", "brcm,bcm6368",
+ "brcm,bcm6328", "brcm,bcm6358", "brcm,bcm6362", "brcm,bcm6368",
"brcm,bcm63168", "brcm,bcm63268",
"brcm,bcm7125", "brcm,bcm7346", "brcm,bcm7358", "brcm,bcm7360",
"brcm,bcm7362", "brcm,bcm7420", "brcm,bcm7425"
diff --git a/arch/mips/bmips/setup.c b/arch/mips/bmips/setup.c
index 4fbd2f1..bde62bc 100644
--- a/arch/mips/bmips/setup.c
+++ b/arch/mips/bmips/setup.c
@@ -115,6 +115,7 @@ static const struct bmips_quirk bmips_quirk_list[] = {
{ "brcm,bcm33843-viper", &bcm3384_viper_quirks },
{ "brcm,bcm6328", &bcm6328_quirks },
{ "brcm,bcm6358", &bcm6358_quirks },
+ { "brcm,bcm6362", &bcm6368_quirks },
{ "brcm,bcm6368", &bcm6368_quirks },
{ "brcm,bcm63168", &bcm6368_quirks },
{ "brcm,bcm63268", &bcm6368_quirks },
--
2.1.4
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [PATCH 5/6] MIPS: BMIPS: Add BCM6362 support
2016-06-13 7:38 ` [PATCH 5/6] MIPS: BMIPS: Add BCM6362 support Álvaro Fernández Rojas
@ 2016-06-14 22:32 ` Rob Herring
0 siblings, 0 replies; 10+ messages in thread
From: Rob Herring @ 2016-06-14 22:32 UTC (permalink / raw)
To: Álvaro Fernández Rojas
Cc: linux-mips, linux-kernel, devicetree, ralf, f.fainelli, jogo,
cernekee, simon
On Mon, Jun 13, 2016 at 09:38:53AM +0200, Álvaro Fernández Rojas wrote:
> BCM6362 is a BMIPS4350 SoC which needs the same fixup as BCM6368 in order to
> enable SMP support.
>
> Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
> ---
> Documentation/devicetree/bindings/mips/brcm/soc.txt | 2 +-
> arch/mips/bmips/setup.c | 1 +
> 2 files changed, 2 insertions(+), 1 deletion(-)
Acked-by: Rob Herring <robh@kernel.org>
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH 6/6] MIPS: BMIPS: Add device tree example for BCM6362
2016-06-13 7:38 [PATCH 1/6] MIPS: BMIPS: add missing console to bcm96358nb4ser Álvaro Fernández Rojas
` (3 preceding siblings ...)
2016-06-13 7:38 ` [PATCH 5/6] MIPS: BMIPS: Add BCM6362 support Álvaro Fernández Rojas
@ 2016-06-13 7:38 ` Álvaro Fernández Rojas
2016-06-14 14:46 ` Jonas Gorski
2016-06-14 14:38 ` [PATCH 1/6] MIPS: BMIPS: add missing console to bcm96358nb4ser Jonas Gorski
5 siblings, 1 reply; 10+ messages in thread
From: Álvaro Fernández Rojas @ 2016-06-13 7:38 UTC (permalink / raw)
To: linux-mips, linux-kernel, devicetree, ralf, f.fainelli, jogo,
cernekee, robh, simon
Cc: Álvaro Fernández Rojas
This adds a device tree example for SFR NeufBox 6.
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
---
arch/mips/bmips/Kconfig | 4 +
arch/mips/boot/dts/brcm/Makefile | 2 +
arch/mips/boot/dts/brcm/bcm6362.dtsi | 134 +++++++++++++++++++++++++++++
arch/mips/boot/dts/brcm/bcm96362nb6ser.dts | 22 +++++
4 files changed, 162 insertions(+)
create mode 100644 arch/mips/boot/dts/brcm/bcm6362.dtsi
create mode 100644 arch/mips/boot/dts/brcm/bcm96362nb6ser.dts
diff --git a/arch/mips/bmips/Kconfig b/arch/mips/bmips/Kconfig
index 5b0ad8c..43da496 100644
--- a/arch/mips/bmips/Kconfig
+++ b/arch/mips/bmips/Kconfig
@@ -33,6 +33,10 @@ config DT_BCM96358NB4SER
bool "BCM96358NB4SER"
select BUILTIN_DTB
+config DT_BCM96362NB6SER
+ bool "BCM96362NB6SER"
+ select BUILTIN_DTB
+
config DT_BCM96368MVWG
bool "BCM96368MVWG"
select BUILTIN_DTB
diff --git a/arch/mips/boot/dts/brcm/Makefile b/arch/mips/boot/dts/brcm/Makefile
index c553b95..161e54b 100644
--- a/arch/mips/boot/dts/brcm/Makefile
+++ b/arch/mips/boot/dts/brcm/Makefile
@@ -3,6 +3,7 @@ dtb-$(CONFIG_DT_BCM93384WVG) += bcm93384wvg.dtb
dtb-$(CONFIG_DT_BCM93384WVG_VIPER) += bcm93384wvg_viper.dtb
dtb-$(CONFIG_DT_BCM963268VR3032U) += bcm963268vr3032u.dtb
dtb-$(CONFIG_DT_BCM96358NB4SER) += bcm96358nb4ser.dtb
+dtb-$(CONFIG_DT_BCM96362NB6SER) += bcm96362nb6ser.dtb
dtb-$(CONFIG_DT_BCM96368MVWG) += bcm96368mvwg.dtb
dtb-$(CONFIG_DT_BCM9EJTAGPRB) += bcm9ejtagprb.dtb
dtb-$(CONFIG_DT_BCM97125CBMB) += bcm97125cbmb.dtb
@@ -20,6 +21,7 @@ dtb-$(CONFIG_DT_NONE) += \
bcm93384wvg_viper.dtb \
bcm963268vr3032u.dtb \
bcm96358nb4ser.dtb \
+ bcm96362nb6ser.dtb \
bcm96368mvwg.dtb \
bcm9ejtagprb.dtb \
bcm97125cbmb.dtb \
diff --git a/arch/mips/boot/dts/brcm/bcm6362.dtsi b/arch/mips/boot/dts/brcm/bcm6362.dtsi
new file mode 100644
index 0000000..c507da5
--- /dev/null
+++ b/arch/mips/boot/dts/brcm/bcm6362.dtsi
@@ -0,0 +1,134 @@
+/ {
+ #address-cells = <1>;
+ #size-cells = <1>;
+ compatible = "brcm,bcm6362";
+
+ cpus {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ mips-hpt-frequency = <200000000>;
+
+ cpu@0 {
+ compatible = "brcm,bmips4350";
+ device_type = "cpu";
+ reg = <0>;
+ };
+
+ cpu@1 {
+ compatible = "brcm,bmips4350";
+ device_type = "cpu";
+ reg = <1>;
+ };
+ };
+
+ clocks {
+ periph_clk: periph-clk {
+ compatible = "fixed-clock";
+ #clock-cells = <0>;
+ clock-frequency = <50000000>;
+ };
+ };
+
+ aliases {
+ serial0 = &uart0;
+ serial1 = &uart1;
+ };
+
+ cpu_intc: interrupt-controller {
+ #address-cells = <0>;
+ compatible = "mti,cpu-interrupt-controller";
+
+ interrupt-controller;
+ #interrupt-cells = <1>;
+ };
+
+ ubus {
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ compatible = "simple-bus";
+ ranges;
+
+ periph_cntl: syscon@10000000 {
+ compatible = "syscon";
+ reg = <0x10000000 0x14>;
+ native-endian;
+ };
+
+ reboot: syscon-reboot@10000008 {
+ compatible = "syscon-reboot";
+ regmap = <&periph_cntl>;
+ offset = <0x8>;
+ mask = <0x1>;
+ };
+
+ periph_intc: interrupt-controller@10000020 {
+ compatible = "brcm,bcm6345-l1-intc";
+ reg = <0x10000020 0x10>,
+ <0x10000030 0x10>;
+
+ interrupt-controller;
+ #interrupt-cells = <1>;
+
+ interrupt-parent = <&cpu_intc>;
+ interrupts = <2>, <3>;
+ };
+
+ uart0: serial@10000100 {
+ compatible = "brcm,bcm6345-uart";
+ reg = <0x10000100 0x18>;
+
+ interrupt-parent = <&periph_intc>;
+ interrupts = <3>;
+
+ clocks = <&periph_clk>;
+
+ status = "disabled";
+ };
+
+ uart1: serial@10000120 {
+ compatible = "brcm,bcm6345-uart";
+ reg = <0x10000120 0x18>;
+
+ interrupt-parent = <&periph_intc>;
+ interrupts = <4>;
+
+ clocks = <&periph_clk>;
+
+ status = "disabled";
+ };
+
+ leds0: led-controller@10001900 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ compatible = "brcm,bcm6328-leds";
+ reg = <0x10001900 0x24>;
+
+ status = "disabled";
+ };
+
+ ehci: usb@10002500 {
+ compatible = "brcm,bcm6362-ehci", "generic-ehci";
+ reg = <0x10002500 0x100>;
+ big-endian;
+
+ interrupt-parent = <&periph_intc>;
+ interrupts = <10>;
+
+ status = "disabled";
+ };
+
+ ohci: usb@10002600 {
+ compatible = "brcm,bcm6362-ohci", "generic-ohci";
+ reg = <0x10002600 0x100>;
+ big-endian;
+ no-big-frame-no;
+
+ interrupt-parent = <&periph_intc>;
+ interrupts = <9>;
+
+ status = "disabled";
+ };
+ };
+};
diff --git a/arch/mips/boot/dts/brcm/bcm96362nb6ser.dts b/arch/mips/boot/dts/brcm/bcm96362nb6ser.dts
new file mode 100644
index 0000000..a470230
--- /dev/null
+++ b/arch/mips/boot/dts/brcm/bcm96362nb6ser.dts
@@ -0,0 +1,22 @@
+/dts-v1/;
+
+/include/ "bcm6362.dtsi"
+
+/ {
+ compatible = "sfr,nb6-ser", "brcm,bcm6362";
+ model = "SFT NeufBox 6 (Sercomm)";
+
+ memory@0 {
+ device_type = "memory";
+ reg = <0x00000000 0x08000000>;
+ };
+
+ chosen {
+ bootargs = "console=ttyS0,115200";
+ stdout-path = &uart0;
+ };
+};
+
+&uart0 {
+ status = "okay";
+};
--
2.1.4
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [PATCH 6/6] MIPS: BMIPS: Add device tree example for BCM6362
2016-06-13 7:38 ` [PATCH 6/6] MIPS: BMIPS: Add device tree example for BCM6362 Álvaro Fernández Rojas
@ 2016-06-14 14:46 ` Jonas Gorski
0 siblings, 0 replies; 10+ messages in thread
From: Jonas Gorski @ 2016-06-14 14:46 UTC (permalink / raw)
To: Álvaro Fernández Rojas
Cc: MIPS Mailing List, linux-kernel, devicetree, Ralf Baechle,
Florian Fainelli, Kevin Cernekee, Rob Herring, Simon Arlott
Hi,
On 13 June 2016 at 09:38, Álvaro Fernández Rojas <noltari@gmail.com> wrote:
> This adds a device tree example for SFR NeufBox 6.
>
> Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
> ---
> arch/mips/bmips/Kconfig | 4 +
> arch/mips/boot/dts/brcm/Makefile | 2 +
> arch/mips/boot/dts/brcm/bcm6362.dtsi | 134 +++++++++++++++++++++++++++++
> arch/mips/boot/dts/brcm/bcm96362nb6ser.dts | 22 +++++
> 4 files changed, 162 insertions(+)
> create mode 100644 arch/mips/boot/dts/brcm/bcm6362.dtsi
> create mode 100644 arch/mips/boot/dts/brcm/bcm96362nb6ser.dts
>
> diff --git a/arch/mips/bmips/Kconfig b/arch/mips/bmips/Kconfig
> index 5b0ad8c..43da496 100644
> --- a/arch/mips/bmips/Kconfig
> +++ b/arch/mips/bmips/Kconfig
> @@ -33,6 +33,10 @@ config DT_BCM96358NB4SER
> bool "BCM96358NB4SER"
> select BUILTIN_DTB
>
> +config DT_BCM96362NB6SER
> + bool "BCM96362NB6SER"
DT_SFR_NEUFBOX6_SERCOMM
bool "SFR Neufbox 6 (Sercomm)"
maybe?
> + select BUILTIN_DTB
> +
> config DT_BCM96368MVWG
> bool "BCM96368MVWG"
> select BUILTIN_DTB
> diff --git a/arch/mips/boot/dts/brcm/Makefile b/arch/mips/boot/dts/brcm/Makefile
> index c553b95..161e54b 100644
> --- a/arch/mips/boot/dts/brcm/Makefile
> +++ b/arch/mips/boot/dts/brcm/Makefile
> @@ -3,6 +3,7 @@ dtb-$(CONFIG_DT_BCM93384WVG) += bcm93384wvg.dtb
> dtb-$(CONFIG_DT_BCM93384WVG_VIPER) += bcm93384wvg_viper.dtb
> dtb-$(CONFIG_DT_BCM963268VR3032U) += bcm963268vr3032u.dtb
> dtb-$(CONFIG_DT_BCM96358NB4SER) += bcm96358nb4ser.dtb
> +dtb-$(CONFIG_DT_BCM96362NB6SER) += bcm96362nb6ser.dtb
Similar here.
> dtb-$(CONFIG_DT_BCM96368MVWG) += bcm96368mvwg.dtb
> dtb-$(CONFIG_DT_BCM9EJTAGPRB) += bcm9ejtagprb.dtb
> dtb-$(CONFIG_DT_BCM97125CBMB) += bcm97125cbmb.dtb
> @@ -20,6 +21,7 @@ dtb-$(CONFIG_DT_NONE) += \
> bcm93384wvg_viper.dtb \
> bcm963268vr3032u.dtb \
> bcm96358nb4ser.dtb \
> + bcm96362nb6ser.dtb \
> bcm96368mvwg.dtb \
> bcm9ejtagprb.dtb \
> bcm97125cbmb.dtb \
(snip)
> diff --git a/arch/mips/boot/dts/brcm/bcm96362nb6ser.dts b/arch/mips/boot/dts/brcm/bcm96362nb6ser.dts
> new file mode 100644
> index 0000000..a470230
> --- /dev/null
> +++ b/arch/mips/boot/dts/brcm/bcm96362nb6ser.dts
Similar here.
> @@ -0,0 +1,22 @@
> +/dts-v1/;
> +
> +/include/ "bcm6362.dtsi"
> +
> +/ {
> + compatible = "sfr,nb6-ser", "brcm,bcm6362";
I don't see the sfr vendor prefix documented (at least not in
4.7-rc2). If it is already in -next, then disregard that comment.
> + model = "SFT NeufBox 6 (Sercomm)";
SFT? Not SFR? ;p
Regards
Jonas
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 1/6] MIPS: BMIPS: add missing console to bcm96358nb4ser
2016-06-13 7:38 [PATCH 1/6] MIPS: BMIPS: add missing console to bcm96358nb4ser Álvaro Fernández Rojas
` (4 preceding siblings ...)
2016-06-13 7:38 ` [PATCH 6/6] MIPS: BMIPS: Add device tree example for BCM6362 Álvaro Fernández Rojas
@ 2016-06-14 14:38 ` Jonas Gorski
5 siblings, 0 replies; 10+ messages in thread
From: Jonas Gorski @ 2016-06-14 14:38 UTC (permalink / raw)
To: Álvaro Fernández Rojas
Cc: MIPS Mailing List, linux-kernel, devicetree, Ralf Baechle,
Florian Fainelli, Kevin Cernekee, Rob Herring, Simon Arlott
Hi Álvaro,
On 13 June 2016 at 09:38, Álvaro Fernández Rojas <noltari@gmail.com> wrote:
> Console definition is needed in order to avoid a warning in earlycon to
> console transition.
>
> Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
> ---
> arch/mips/boot/dts/brcm/bcm96358nb4ser.dts | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/arch/mips/boot/dts/brcm/bcm96358nb4ser.dts b/arch/mips/boot/dts/brcm/bcm96358nb4ser.dts
> index f412117..702eae2 100644
> --- a/arch/mips/boot/dts/brcm/bcm96358nb4ser.dts
> +++ b/arch/mips/boot/dts/brcm/bcm96358nb4ser.dts
Unfortunately I haven't seen this earlier, but please don't name the
dts file bcm9* unless it's an actual reference/eval board from
Broadcom.
A more sensible name would be neufbox4-sercom.dts or
bcm6358-neufbox4-sercom.dts.
Regards
Jonas
^ permalink raw reply [flat|nested] 10+ messages in thread