diff options
| author | Olof Johansson <olof@lixom.net> | 2014-10-23 21:02:49 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-10-23 21:02:49 -0700 |
| commit | 184f84d9b94e142009835bd872f180c5264fbeeb (patch) | |
| tree | 8154d8423192050b9aa3d1f647203efb197d354d /arch | |
| parent | bcd09f17cbcc88ff32e59eddc7faab1964ae3596 (diff) | |
| parent | 106c67af2fb938880edbf43b49dabbd8d2534839 (diff) | |
| download | linux-stable-184f84d9b94e142009835bd872f180c5264fbeeb.tar.gz linux-stable-184f84d9b94e142009835bd872f180c5264fbeeb.tar.bz2 linux-stable-184f84d9b94e142009835bd872f180c5264fbeeb.zip | |
Merge tag 'at91-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91 into fixes
Merge "at91: fixes for v3.18 #1" from Nicholas Ferre:
First AT91 fixes for 3.18:
- one more MAINTAINERS entry for the SSC driver
- a fix for the newly introduced power/reset driver
- a fix on at91sam9263 USB due to PLLB misconfiguration
* tag 'at91-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91:
ARM: at91/dt: sam9263: fix PLLB frequencies
power: reset: at91-reset: fix power down register
MAINTAINERS: add atmel ssc driver maintainer entry
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/at91sam9263.dtsi | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/at91sam9263.dtsi b/arch/arm/boot/dts/at91sam9263.dtsi index d68b3c4862bc..51416c7d0625 100644 --- a/arch/arm/boot/dts/at91sam9263.dtsi +++ b/arch/arm/boot/dts/at91sam9263.dtsi @@ -122,9 +122,10 @@ interrupts-extended = <&pmc AT91_PMC_LOCKB>; clocks = <&main>; reg = <1>; - atmel,clk-input-range = <1000000 5000000>; + atmel,clk-input-range = <1000000 32000000>; #atmel,pll-clk-output-range-cells = <4>; - atmel,pll-clk-output-ranges = <70000000 130000000 1 1>; + atmel,pll-clk-output-ranges = <80000000 200000000 0 1>, + <190000000 240000000 2 1>; }; mck: masterck { |