diff options
| author | Dave Airlie <airlied@redhat.com> | 2016-05-09 05:49:56 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2016-05-09 05:49:56 +0200 |
| commit | bafb86f5bc3173479002555dea7f31d943b12332 (patch) | |
| tree | 6ec94c96460faf782cdb8781339560e13e0918b0 /arch/arm/boot/dts/am43x-epos-evm.dts | |
| parent | drm/amdgpu: fix build on aarch64. (diff) | |
| parent | Linux 4.6-rc7 (diff) | |
| download | linux-bafb86f5bc3173479002555dea7f31d943b12332.tar.xz linux-bafb86f5bc3173479002555dea7f31d943b12332.zip | |
Merge tag 'v4.6-rc7' into drm-next
Merge this back as we've built up a fair few conflicts, and I have
some newer trees to pull in.
Diffstat (limited to 'arch/arm/boot/dts/am43x-epos-evm.dts')
| -rw-r--r-- | arch/arm/boot/dts/am43x-epos-evm.dts | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/am43x-epos-evm.dts b/arch/arm/boot/dts/am43x-epos-evm.dts index 83dfafaaba1b..d5dd72047a7e 100644 --- a/arch/arm/boot/dts/am43x-epos-evm.dts +++ b/arch/arm/boot/dts/am43x-epos-evm.dts @@ -794,3 +794,8 @@ tx-num-evt = <32>; rx-num-evt = <32>; }; + +&synctimer_32kclk { + assigned-clocks = <&mux_synctimer32k_ck>; + assigned-clock-parents = <&clkdiv32k_ick>; +}; |