diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-09-15 07:17:40 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-09-15 07:17:40 +0200 |
commit | 882ebfc28c389be86535bda4a7d9e407020356bf (patch) | |
tree | e8f3ddeda13196f40040f3ba4701ece5d38c63cc /arch/arm/boot/dts/at91sam9g20.dtsi | |
parent | mips/uapi: Add definition of TIOC[SG]RS485 (diff) | |
parent | Linux 3.17-rc5 (diff) | |
download | linux-882ebfc28c389be86535bda4a7d9e407020356bf.tar.xz linux-882ebfc28c389be86535bda4a7d9e407020356bf.zip |
Merge 3.17-rc5 into tty-next
We want those fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arm/boot/dts/at91sam9g20.dtsi')
-rw-r--r-- | arch/arm/boot/dts/at91sam9g20.dtsi | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/at91sam9g20.dtsi b/arch/arm/boot/dts/at91sam9g20.dtsi index 31f7652612fc..4e0abbd9d655 100644 --- a/arch/arm/boot/dts/at91sam9g20.dtsi +++ b/arch/arm/boot/dts/at91sam9g20.dtsi @@ -40,6 +40,7 @@ }; pllb: pllbck { + compatible = "atmel,at91sam9g20-clk-pllb"; atmel,clk-input-range = <2000000 32000000>; atmel,pll-clk-output-ranges = <30000000 100000000 0 0>; }; |