diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-06-08 13:02:16 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-06-08 13:02:16 +0200 |
| commit | 8e8c668927b029f6ccc350eb1aa936864cc4eb6f (patch) | |
| tree | f91ec6d49e2b01de5b4b3d517209d13b216a3f0f /arch/arm/boot/dts/sama5d4.dtsi | |
| parent | f0133acc7d4835cfbb86393b7d2a4fba7519585b (diff) | |
| parent | 970442c599b22ccd644ebfe94d1d303bf6f87c05 (diff) | |
Merge branch 'x86/urgent' into x86/cpu, to pick up dependency
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm/boot/dts/sama5d4.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/sama5d4.dtsi | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/sama5d4.dtsi b/arch/arm/boot/dts/sama5d4.dtsi index db1151c18466..4e2cc30d6615 100644 --- a/arch/arm/boot/dts/sama5d4.dtsi +++ b/arch/arm/boot/dts/sama5d4.dtsi @@ -1202,6 +1202,13 @@ status = "disabled"; }; + trng@fc030000 { + compatible = "atmel,at91sam9g45-trng"; + reg = <0xfc030000 0x100>; + interrupts = <53 IRQ_TYPE_LEVEL_HIGH 0>; + clocks = <&trng_clk>; + }; + adc0: adc@fc034000 { compatible = "atmel,at91sam9x5-adc"; reg = <0xfc034000 0x100>; @@ -1302,6 +1309,7 @@ watchdog@fc068640 { compatible = "atmel,sama5d4-wdt"; reg = <0xfc068640 0x10>; + interrupts = <4 IRQ_TYPE_LEVEL_HIGH 7>; clocks = <&clk32k>; status = "disabled"; }; |