MIPS: BMIPS: Improve BCM6328 device tree

- Remove unneeded leds0 alias.
- Switch to bcm6345-l1-intc interrupt controller.
- Use interrupt-controller instead of periph_intc and cpu_intc.
- Add uart1, ehci and ohci nodes.
- Refactor syscon and syscon-reboot.
- Avoid using underscores in node names.
- Rename uart aliases to serial.

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
Cc: f.fainelli@gmail.com
Cc: jogo@openwrt.org
Cc: cernekee@gmail.com
Cc: robh@kernel.org
Cc: simon@fire.lp0.eu
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Cc: devicetree@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/13043/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

1 files changed, 39 insertions, 11 deletions

diff --git a/arch/mips/boot/dts/brcm/bcm6328.dtsi b/arch/mips/boot/dts/brcm/bcm6328.dtsi
index 9d19236f53e7..5633b9d90f55 100644
--- a/arch/mips/boot/dts/brcm/bcm6328.dtsi
+++ b/arch/mips/boot/dts/brcm/bcm6328.dtsi
@@ -23,7 +23,7 @@
         };
 
         clocks {
-                periph_clk: periph_clk {
+                periph_clk: periph-clk {
                         compatible = "fixed-clock";
                         #clock-cells = <0>;
                         clock-frequency = <50000000>;
@@ -31,11 +31,11 @@
         };
 
         aliases {
-                leds0 = &leds0;
-                uart0 = &uart0;
+                serial0 = &uart0;
+                serial1 = &uart1;
         };
 
-        cpu_intc: cpu_intc {
+        cpu_intc: interrupt-controller {
                 #address-cells = <0>;
                 compatible = "mti,cpu-interrupt-controller";
 
@@ -50,16 +50,16 @@
                 compatible = "simple-bus";
                 ranges;
 
-                periph_intc: periph_intc@10000020 {
-                        compatible = "brcm,bcm3380-l2-intc";
-                        reg = <0x10000024 0x4 0x1000002c 0x4>,
-                              <0x10000020 0x4 0x10000028 0x4>;
+                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>;
+                        interrupts = <2>, <3>;
                 };
 
                 uart0: serial@10000100 {
@@ -71,13 +71,22 @@
                         status = "disabled";
                 };
 
-                timer: timer@10000040 {
+                uart1: serial@10000120 {
+                        compatible = "brcm,bcm6345-uart";
+                        reg = <0x10000120 0x18>;
+                        interrupt-parent = <&periph_intc>;
+                        interrupts = <39>;
+                        clocks = <&periph_clk>;
+                        status = "disabled";
+                };
+
+                timer: syscon@10000040 {
                         compatible = "syscon";
                         reg = <0x10000040 0x2c>;
                         native-endian;
                 };
 
-                reboot {
+                reboot: syscon-reboot@10000068 {
                         compatible = "syscon-reboot";
                         regmap = <&timer>;
                         offset = <0x28>;
@@ -91,5 +100,24 @@
                         reg = <0x10000800 0x24>;
                         status = "disabled";
                 };
+
+                ehci: usb@10002500 {
+                        compatible = "brcm,bcm6328-ehci", "generic-ehci";
+                        reg = <0x10002500 0x100>;
+                        big-endian;
+                        interrupt-parent = <&periph_intc>;
+                        interrupts = <42>;
+                        status = "disabled";
+                };
+
+                ohci: usb@10002600 {
+                        compatible = "brcm,bcm6328-ohci", "generic-ohci";
+                        reg = <0x10002600 0x100>;
+                        big-endian;
+                        no-big-frame-no;
+                        interrupt-parent = <&periph_intc>;
+                        interrupts = <41>;
+                        status = "disabled";
+                };
         };
 };