diff options
| author |   Olof Johansson <olof@lixom.net> | 2016-11-17 17:49:33 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2016-11-17 17:49:33 -0800 |
| commit | 4ce410a2bf969a4338a2fea7ffec8e5f1a35608a (patch) | |
| tree | 9fd33f188e85d25ee371780fde04d055488dae03 | |
| parent | Merge tag 'uniphier-dt-v4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier into next/dt (diff) | |
| parent | ARM: dts: lpc32xx: set default parent clock for pwm1 & pwm2 (diff) | |
| download | wireguard-linux-4ce410a2bf969a4338a2fea7ffec8e5f1a35608a.tar.xz wireguard-linux-4ce410a2bf969a4338a2fea7ffec8e5f1a35608a.zip | |
Merge tag 'lpc32xx-dt-v4.10' of https://github.com/sylemieux/linux-lpc32xx into next/dt
NXP LPC32xx ARM SoC device tree updates for v4.10
This includes a single functional change:
* set default parent clock for PWM1 & PWM2.
* tag 'lpc32xx-dt-v4.10' of https://github.com/sylemieux/linux-lpc32xx:
ARM: dts: lpc32xx: set default parent clock for pwm1 & pwm2
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to '')
| -rw-r--r-- | arch/arm/boot/dts/lpc32xx.dtsi | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/lpc32xx.dtsi b/arch/arm/boot/dts/lpc32xx.dtsi index b5841fab51c1..d81fe433e3c8 100644 --- a/arch/arm/boot/dts/lpc32xx.dtsi +++ b/arch/arm/boot/dts/lpc32xx.dtsi @@ -479,6 +479,8 @@ compatible = "nxp,lpc3220-pwm"; reg = <0x4005C000 0x4>; clocks = <&clk LPC32XX_CLK_PWM1>; + assigned-clocks = <&clk LPC32XX_CLK_PWM1>; + assigned-clock-parents = <&clk LPC32XX_CLK_PERIPH>; status = "disabled"; }; @@ -486,6 +488,8 @@ compatible = "nxp,lpc3220-pwm"; reg = <0x4005C004 0x4>; clocks = <&clk LPC32XX_CLK_PWM2>; + assigned-clocks = <&clk LPC32XX_CLK_PWM2>; + assigned-clock-parents = <&clk LPC32XX_CLK_PERIPH>; status = "disabled"; }; |