diff options
author | Tony Lindgren <tony@atomide.com> | 2014-05-28 19:14:48 +0200 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2014-05-28 19:14:48 +0200 |
commit | 43369f0fe81044427f6b1eedeb16bf8c74c86d48 (patch) | |
tree | 542d6bf069f0983daf52a994751ca63c1472d84f /arch/arm/boot/dts/omap4.dtsi | |
parent | ARM: dts: am437x-gp-evm: add support for parallel NAND flash (diff) | |
parent | ARM: dts: omap2 clock data (diff) | |
download | linux-43369f0fe81044427f6b1eedeb16bf8c74c86d48.tar.xz linux-43369f0fe81044427f6b1eedeb16bf8c74c86d48.zip |
Merge branch 'for-v3.16/clk-dt' of https://github.com/t-kristo/linux-pm into omap-for-v3.16/dt-v2
Diffstat (limited to 'arch/arm/boot/dts/omap4.dtsi')
-rw-r--r-- | arch/arm/boot/dts/omap4.dtsi | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi index f866de954c29..203131ebb581 100644 --- a/arch/arm/boot/dts/omap4.dtsi +++ b/arch/arm/boot/dts/omap4.dtsi @@ -67,6 +67,7 @@ local-timer@48240600 { compatible = "arm,cortex-a9-twd-timer"; + clocks = <&mpu_periphclk>; reg = <0x48240600 0x20>; interrupts = <GIC_PPI 13 (GIC_CPU_MASK_RAW(3) | IRQ_TYPE_LEVEL_HIGH)>; }; |