diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2016-07-13 17:01:34 +0200 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2016-07-13 17:01:51 +0200 |
commit | 54f54496779661678d906b57e4cba48239ab7c9b (patch) | |
tree | feb06330bfa37391a5502e8dc6dfdd58b46b56fb /arch/arm64 | |
parent | 92d21ac74a9e3c09b0b01c764e530657e4c85c49 (diff) | |
parent | 1d661bf5327a2c059ec967f850e89362e637f4e6 (diff) | |
download | op-kernel-dev-54f54496779661678d906b57e4cba48239ab7c9b.zip op-kernel-dev-54f54496779661678d906b57e4cba48239ab7c9b.tar.gz |
Merge branch 'timers/core' into smp/hotplug to pick up dependencies
Diffstat (limited to 'arch/arm64')
-rw-r--r-- | arch/arm64/boot/dts/rockchip/rk3399.dtsi | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi index d7f8e06..188bbea 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi @@ -492,6 +492,14 @@ interrupts = <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>; }; + rktimer: rktimer@ff850000 { + compatible = "rockchip,rk3399-timer"; + reg = <0x0 0xff850000 0x0 0x1000>; + interrupts = <GIC_SPI 81 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&cru PCLK_TIMER0>, <&cru SCLK_TIMER00>; + clock-names = "pclk", "timer"; + }; + spdif: spdif@ff870000 { compatible = "rockchip,rk3399-spdif"; reg = <0x0 0xff870000 0x0 0x1000>; |