Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Álvaro Fernández Rojas and committed by
Ralf Baechle
e3b992d0 3652acd2

+39 -11
+39 -11
arch/mips/boot/dts/brcm/bcm6328.dtsi
··· 23 23 }; 24 24 25 25 clocks { 26 - periph_clk: periph_clk { 26 + periph_clk: periph-clk { 27 27 compatible = "fixed-clock"; 28 28 #clock-cells = <0>; 29 29 clock-frequency = <50000000>; ··· 31 31 }; 32 32 33 33 aliases { 34 - leds0 = &leds0; 35 - uart0 = &uart0; 34 + serial0 = &uart0; 35 + serial1 = &uart1; 36 36 }; 37 37 38 - cpu_intc: cpu_intc { 38 + cpu_intc: interrupt-controller { 39 39 #address-cells = <0>; 40 40 compatible = "mti,cpu-interrupt-controller"; 41 41 ··· 50 50 compatible = "simple-bus"; 51 51 ranges; 52 52 53 - periph_intc: periph_intc@10000020 { 54 - compatible = "brcm,bcm3380-l2-intc"; 55 - reg = <0x10000024 0x4 0x1000002c 0x4>, 56 - <0x10000020 0x4 0x10000028 0x4>; 53 + periph_intc: interrupt-controller@10000020 { 54 + compatible = "brcm,bcm6345-l1-intc"; 55 + reg = <0x10000020 0x10>, 56 + <0x10000030 0x10>; 57 57 58 58 interrupt-controller; 59 59 #interrupt-cells = <1>; 60 60 61 61 interrupt-parent = <&cpu_intc>; 62 - interrupts = <2>; 62 + interrupts = <2>, <3>; 63 63 }; 64 64 65 65 uart0: serial@10000100 { ··· 71 71 status = "disabled"; 72 72 }; 73 73 74 - timer: timer@10000040 { 74 + uart1: serial@10000120 { 75 + compatible = "brcm,bcm6345-uart"; 76 + reg = <0x10000120 0x18>; 77 + interrupt-parent = <&periph_intc>; 78 + interrupts = <39>; 79 + clocks = <&periph_clk>; 80 + status = "disabled"; 81 + }; 82 + 83 + timer: syscon@10000040 { 75 84 compatible = "syscon"; 76 85 reg = <0x10000040 0x2c>; 77 86 native-endian; 78 87 }; 79 88 80 - reboot { 89 + reboot: syscon-reboot@10000068 { 81 90 compatible = "syscon-reboot"; 82 91 regmap = <&timer>; 83 92 offset = <0x28>; ··· 98 89 #size-cells = <0>; 99 90 compatible = "brcm,bcm6328-leds"; 100 91 reg = <0x10000800 0x24>; 92 + status = "disabled"; 93 + }; 94 + 95 + ehci: usb@10002500 { 96 + compatible = "brcm,bcm6328-ehci", "generic-ehci"; 97 + reg = <0x10002500 0x100>; 98 + big-endian; 99 + interrupt-parent = <&periph_intc>; 100 + interrupts = <42>; 101 + status = "disabled"; 102 + }; 103 + 104 + ohci: usb@10002600 { 105 + compatible = "brcm,bcm6328-ohci", "generic-ohci"; 106 + reg = <0x10002600 0x100>; 107 + big-endian; 108 + no-big-frame-no; 109 + interrupt-parent = <&periph_intc>; 110 + interrupts = <41>; 101 111 status = "disabled"; 102 112 }; 103 113 };