Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 184f84d9 authored Oct 23, 2014 by Olof Johansson

Merge tag 'at91-fixes' of...

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>

parents bcd09f17 106c67af

MAINTAINERS

+7 −0

Original line number	Diff line number	Diff line
		@@ -1749,6 +1749,13 @@ M: Nicolas Ferre <nicolas.ferre@atmel.com>
		S: Supported
		F: drivers/spi/spi-atmel.*

		ATMEL SSC DRIVER
		M: Bo Shen <voice.shen@atmel.com>
		L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
		S: Supported
		F: drivers/misc/atmel-ssc.c
		F: include/linux/atmel-ssc.h

		ATMEL Timer Counter (TC) AND CLOCKSOURCE DRIVERS
		M: Nicolas Ferre <nicolas.ferre@atmel.com>
		L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

arch/arm/boot/dts/at91sam9263.dtsi

+3 −2

Original line number	Diff line number	Diff line
		@@ -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 {

drivers/power/reset/at91-reset.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -100,11 +100,11 @@ static void at91sam9g45_restart(enum reboot_mode mode, const char *cmd)
		/* Disable SDRAM0 accesses */
		"1: str %3, [%0, #" __stringify(AT91_DDRSDRC_RTR) "]\n\t"
		/* Power down SDRAM0 */
		" str %4, [%0, #" __stringify(AT91_DDRSDRC_RTR) "]\n\t"
		" str %4, [%0, #" __stringify(AT91_DDRSDRC_LPR) "]\n\t"
		/* Disable SDRAM1 accesses */
		" strne %3, [%1, #" __stringify(AT91_DDRSDRC_RTR) "]\n\t"
		/* Power down SDRAM1 */
		" strne %4, [%1, #" __stringify(AT91_DDRSDRC_RTR) "]\n\t"
		" strne %4, [%1, #" __stringify(AT91_DDRSDRC_LPR) "]\n\t"
		/* Reset CPU */
		" str %5, [%2, #" __stringify(AT91_RSTC_CR) "]\n\t"