diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-09-14 15:17:53 (GMT) |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-09-14 15:17:53 (GMT) |
| commit | 3073be6c29487ca81fcb5efd1748249a6f153c17 (patch) | |
| tree | 72b3e14feb1eae6d006822909556100c296fc3c4 | |
| parent | ddee928d8f8c999d6c618f2b95fd56ecf4d67bb3 (diff) | |
| parent | 5072ed1fa29fa7cef73a7fb82f696e50973e02dc (diff) | |
| download | linux-3073be6c29487ca81fcb5efd1748249a6f153c17.tar.xz | |
Merge tag 'arm-soc/for-4.9/devicetree-arm64' of http://github.com/Broadcom/stblinux into next/dt64
Pull "Broadcom devicetree-arm64 changes for 4.9" from Florian Fainelli:
This pull request contains Broadcom ARM64-based SoC Device Tree changes for
v4.9, please pull the folllowing:
- Dhanajay adds the PWM Device Tree nodes to the Northstar 2 DTS files
* tag 'arm-soc/for-4.9/devicetree-arm64' of http://github.com/Broadcom/stblinux:
arm64: dts: Add PWM DT node for NS2
| -rw-r--r-- | arch/arm64/boot/dts/broadcom/ns2.dtsi | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm64/boot/dts/broadcom/ns2.dtsi b/arch/arm64/boot/dts/broadcom/ns2.dtsi index f53b095..7dd66f9 100644 --- a/arch/arm64/boot/dts/broadcom/ns2.dtsi +++ b/arch/arm64/boot/dts/broadcom/ns2.dtsi @@ -299,6 +299,14 @@ }; }; + pwm: pwm@66010000 { + compatible = "brcm,iproc-pwm"; + reg = <0x66010000 0x28>; + clocks = <&osc>; + #pwm-cells = <3>; + status = "disabled"; + }; + mdio_mux_iproc: mdio-mux@6602023c { compatible = "brcm,mdio-mux-iproc"; reg = <0x6602023c 0x14>; |