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

mips: bmips: bcm6358: populate device tree nodes

- Rename periph_clk to periph_osc.
- Rename clkctl to periph_clk.
- Move syscon-reboot to subnode.
- Add watchdog.
- Add SPI controller.
- Add USBH PHY.
- Add cfi-flash.

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>

authored by

Álvaro Fernández Rojas and committed by
Thomas Bogendoerfer
add95623 7ea42936

+72 -11
+72 -11
arch/mips/boot/dts/brcm/bcm6358.dtsi
··· 28 28 }; 29 29 30 30 clocks { 31 - periph_clk: periph-clk { 31 + periph_osc: periph-osc { 32 32 compatible = "fixed-clock"; 33 33 #clock-cells = <0>; 34 34 clock-frequency = <50000000>; 35 + clock-output-names = "periph"; 35 36 }; 36 37 }; 37 38 38 39 aliases { 40 + pflash = &pflash; 39 41 serial0 = &uart0; 40 42 serial1 = &uart1; 43 + spi0 = &lsspi; 41 44 }; 42 45 43 46 cpu_intc: interrupt-controller { ··· 58 55 compatible = "simple-bus"; 59 56 ranges; 60 57 61 - clkctl: clock-controller@fffe0004 { 58 + periph_clk: clock-controller@fffe0004 { 62 59 compatible = "brcm,bcm6358-clocks"; 63 60 reg = <0xfffe0004 0x4>; 64 61 #clock-cells = <1>; 65 62 }; 66 63 67 - periph_cntl: syscon@fffe0008 { 64 + pll_cntl: syscon@fffe0008 { 68 65 compatible = "syscon"; 69 66 reg = <0xfffe0008 0x4>; 70 67 native-endian; 71 - }; 72 68 73 - reboot: syscon-reboot@fffe0008 { 74 - compatible = "syscon-reboot"; 75 - regmap = <&periph_cntl>; 76 - offset = <0x0>; 77 - mask = <0x1>; 69 + reboot { 70 + compatible = "syscon-reboot"; 71 + offset = <0x0>; 72 + mask = <0x1>; 73 + }; 78 74 }; 79 75 80 76 periph_intc: interrupt-controller@fffe000c { ··· 94 92 #reset-cells = <1>; 95 93 }; 96 94 95 + wdt: watchdog@fffe005c { 96 + compatible = "brcm,bcm7038-wdt"; 97 + reg = <0xfffe005c 0xc>; 98 + 99 + clocks = <&periph_osc>; 100 + clock-names = "refclk"; 101 + 102 + timeout-sec = <30>; 103 + }; 104 + 97 105 leds0: led-controller@fffe00d0 { 98 106 #address-cells = <1>; 99 107 #size-cells = <0>; ··· 120 108 interrupt-parent = <&periph_intc>; 121 109 interrupts = <2>; 122 110 123 - clocks = <&periph_clk>; 111 + clocks = <&periph_osc>; 124 112 clock-names = "refclk"; 125 113 126 114 status = "disabled"; ··· 133 121 interrupt-parent = <&periph_intc>; 134 122 interrupts = <3>; 135 123 136 - clocks = <&periph_clk>; 124 + clocks = <&periph_osc>; 137 125 clock-names = "refclk"; 126 + 127 + status = "disabled"; 128 + }; 129 + 130 + lsspi: spi@fffe0800 { 131 + #address-cells = <1>; 132 + #size-cells = <0>; 133 + compatible = "brcm,bcm6358-spi"; 134 + reg = <0xfffe0800 0x70c>; 135 + 136 + interrupt-parent = <&periph_intc>; 137 + interrupts = <1>; 138 + 139 + clocks = <&periph_clk BCM6358_CLK_SPI>; 140 + clock-names = "spi"; 141 + 142 + resets = <&periph_rst BCM6358_RST_SPI>; 143 + reset-names = "spi"; 138 144 139 145 status = "disabled"; 140 146 }; ··· 161 131 compatible = "brcm,bcm6358-ehci", "generic-ehci"; 162 132 reg = <0xfffe1300 0x100>; 163 133 big-endian; 134 + 164 135 interrupt-parent = <&periph_intc>; 165 136 interrupts = <10>; 137 + 138 + phys = <&usbh 0>; 139 + phy-names = "usb"; 140 + 166 141 status = "disabled"; 167 142 }; 168 143 ··· 176 141 reg = <0xfffe1400 0x100>; 177 142 big-endian; 178 143 no-big-frame-no; 144 + 179 145 interrupt-parent = <&periph_intc>; 180 146 interrupts = <5>; 147 + 148 + phys = <&usbh 0>; 149 + phy-names = "usb"; 150 + 181 151 status = "disabled"; 182 152 }; 153 + 154 + usbh: usb-phy@fffe1500 { 155 + compatible = "brcm,bcm6358-usbh-phy"; 156 + reg = <0xfffe1500 0x38>; 157 + #phy-cells = <1>; 158 + 159 + resets = <&periph_rst BCM6358_RST_USBH>; 160 + reset-names = "usbh"; 161 + 162 + status = "disabled"; 163 + }; 164 + }; 165 + 166 + pflash: nor@1e000000 { 167 + #address-cells = <1>; 168 + #size-cells = <1>; 169 + compatible = "cfi-flash"; 170 + reg = <0x1e000000 0x2000000>; 171 + bank-width = <2>; 172 + 173 + status = "disabled"; 183 174 }; 184 175 };