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

mips: bmips: bcm6362: populate device tree nodes

- Rename periph_clk to periph_osc.
- Rename clkctl to periph_clk.
- Move syscon-reboot to subnode.
- Add hsspi-osc clock.
- Add watchdog.
- Add SPI controller.
- Add HS SPI controller.
- Add NAND controller.
- Add USBH PHY.

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
277bb6e2 add95623

+116 -11
+116 -11
arch/mips/boot/dts/brcm/bcm6362.dtsi
··· 29 29 }; 30 30 31 31 clocks { 32 - periph_clk: periph-clk { 32 + periph_osc: periph-osc { 33 33 compatible = "fixed-clock"; 34 34 #clock-cells = <0>; 35 35 clock-frequency = <50000000>; 36 + clock-output-names = "periph"; 37 + }; 38 + 39 + hsspi_osc: hsspi-osc { 40 + compatible = "fixed-clock"; 41 + 42 + #clock-cells = <0>; 43 + 44 + clock-frequency = <400000000>; 45 + clock-output-names = "hsspi_osc"; 36 46 }; 37 47 }; 38 48 39 49 aliases { 50 + nflash = &nflash; 40 51 serial0 = &uart0; 41 52 serial1 = &uart1; 53 + spi0 = &lsspi; 54 + spi1 = &hsspi; 42 55 }; 43 56 44 57 cpu_intc: interrupt-controller { ··· 69 56 compatible = "simple-bus"; 70 57 ranges; 71 58 72 - clkctl: clock-controller@10000004 { 59 + periph_clk: clock-controller@10000004 { 73 60 compatible = "brcm,bcm6362-clocks"; 74 61 reg = <0x10000004 0x4>; 75 62 #clock-cells = <1>; 76 63 }; 77 64 78 - periph_cntl: syscon@10000008 { 65 + pll_cntl: syscon@10000008 { 79 66 compatible = "syscon"; 80 67 reg = <0x10000008 0x4>; 81 68 native-endian; 82 - }; 83 69 84 - reboot: syscon-reboot@10000008 { 85 - compatible = "syscon-reboot"; 86 - regmap = <&periph_cntl>; 87 - offset = <0x0>; 88 - mask = <0x1>; 70 + reboot { 71 + compatible = "syscon-reboot"; 72 + offset = <0x0>; 73 + mask = <0x1>; 74 + }; 89 75 }; 90 76 91 77 periph_rst: reset-controller@10000010 { ··· 105 93 interrupts = <2>, <3>; 106 94 }; 107 95 96 + wdt: watchdog@1000005c { 97 + compatible = "brcm,bcm7038-wdt"; 98 + reg = <0x1000005c 0xc>; 99 + 100 + clocks = <&periph_osc>; 101 + clock-names = "refclk"; 102 + 103 + timeout-sec = <30>; 104 + }; 105 + 108 106 uart0: serial@10000100 { 109 107 compatible = "brcm,bcm6345-uart"; 110 108 reg = <0x10000100 0x18>; ··· 122 100 interrupt-parent = <&periph_intc>; 123 101 interrupts = <3>; 124 102 125 - clocks = <&periph_clk>; 103 + clocks = <&periph_osc>; 126 104 clock-names = "refclk"; 127 105 128 106 status = "disabled"; ··· 135 113 interrupt-parent = <&periph_intc>; 136 114 interrupts = <4>; 137 115 138 - clocks = <&periph_clk>; 116 + clocks = <&periph_osc>; 139 117 clock-names = "refclk"; 118 + 119 + status = "disabled"; 120 + }; 121 + 122 + nflash: nand@10000200 { 123 + #address-cells = <1>; 124 + #size-cells = <0>; 125 + compatible = "brcm,nand-bcm6368", 126 + "brcm,brcmnand-v2.2", 127 + "brcm,brcmnand"; 128 + reg = <0x10000200 0x180>, 129 + <0x10000600 0x200>, 130 + <0x10000070 0x10>; 131 + reg-names = "nand", 132 + "nand-cache", 133 + "nand-int-base"; 134 + 135 + interrupt-parent = <&periph_intc>; 136 + interrupts = <12>; 137 + 138 + clocks = <&periph_clk BCM6362_CLK_NAND>; 139 + clock-names = "nand"; 140 + 141 + status = "disabled"; 142 + }; 143 + 144 + lsspi: spi@10000800 { 145 + #address-cells = <1>; 146 + #size-cells = <0>; 147 + compatible = "brcm,bcm6358-spi"; 148 + reg = <0x10000800 0x70c>; 149 + 150 + interrupt-parent = <&periph_intc>; 151 + interrupts = <2>; 152 + 153 + clocks = <&periph_clk BCM6362_CLK_SPI>; 154 + clock-names = "spi"; 155 + 156 + resets = <&periph_rst BCM6362_RST_SPI>; 157 + reset-names = "spi"; 158 + 159 + status = "disabled"; 160 + }; 161 + 162 + hsspi: spi@10001000 { 163 + #address-cells = <1>; 164 + #size-cells = <0>; 165 + compatible = "brcm,bcm6328-hsspi"; 166 + reg = <0x10001000 0x600>; 167 + 168 + interrupt-parent = <&periph_intc>; 169 + interrupts = <5>; 170 + 171 + clocks = <&periph_clk BCM6362_CLK_HSSPI>, 172 + <&hsspi_osc>; 173 + clock-names = "hsspi", 174 + "pll"; 175 + 176 + resets = <&periph_rst BCM6362_RST_SPI>; 177 + reset-names = "hsspi"; 140 178 141 179 status = "disabled"; 142 180 }; ··· 224 142 interrupt-parent = <&periph_intc>; 225 143 interrupts = <10>; 226 144 145 + phys = <&usbh 0>; 146 + phy-names = "usb"; 147 + 227 148 status = "disabled"; 228 149 }; 229 150 ··· 238 153 239 154 interrupt-parent = <&periph_intc>; 240 155 interrupts = <9>; 156 + 157 + phys = <&usbh 0>; 158 + phy-names = "usb"; 159 + 160 + status = "disabled"; 161 + }; 162 + 163 + usbh: usb-phy@10002700 { 164 + compatible = "brcm,bcm6362-usbh-phy"; 165 + reg = <0x10002700 0x38>; 166 + 167 + #phy-cells = <1>; 168 + 169 + clocks = <&periph_clk BCM6362_CLK_USBH>; 170 + clock-names = "usbh"; 171 + 172 + power-domains = <&periph_pwr BCM6362_POWER_DOMAIN_USBH>; 173 + 174 + resets = <&periph_rst BCM6362_RST_USBH>; 175 + reset-names = "usbh"; 241 176 242 177 status = "disabled"; 243 178 };