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

Commit aabab880 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'at91-cleanup3' of... 

Merge tag 'at91-cleanup3' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91 into next/drivers

Merge "at91: cleanup for 4.1 #3" from Nicolas Ferre:

Third batch of cleanup for 4.1:
- System Timer (ST) for at91rm9200 re-work (syscon/regmap):
  - watchdog
  - restart handler
  - timer as a proper clocksource
  => remove mach dependency + cleanup

* tag 'at91-cleanup3' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91

: (54 commits)
  ARM: at91: remove useless include
  clocksource: atmel-st: remove mach/hardware dependency
  clocksource: atmel-st: use syscon/regmap
  ARM: at91: time: move the system timer driver to drivers/clocksource
  ARM: at91: properly initialize timer
  ARM: at91: at91rm9200: remove deprecated arm_pm_restart
  watchdog: at91rm9200: implement restart handler
  watchdog: at91rm9200: use the system timer syscon
  mfd: syscon: Add atmel system timer registers definition
  ARM: at91/dt: declare atmel,at91rm9200-st as a syscon
  ARM: at91: remove old setup
  ARM: at91: sama5d4: remove useless map_io
  ARM: at91: sama5 use SoC detection infrastructure
  ARM: at91: at91sam9: use SoC detection infrastructure
  ARM: at91: at91rm9200 use SoC detection infrastructure
  ARM: at91: add soc detection infrastructure
  ARM: at91/dt: introduce atmel,<chip>-dbgu
  ARM: at91: remove unused _matrix.h headers
  ARM: at91: remove unused at91_ioremap_matrix and header
  ARM: at91: remove NEED_MACH_IO_H
  ...

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 4580cb8a 8590ca65

Documentation/devicetree/bindings/arm/atmel-at91.txt

+3 −1
Original line number Original line Diff line number Diff line
@@ -46,10 +46,12 @@ PIT Timer required properties: 
  shared across all System Controller members.

  shared across all System Controller members.





System Timer (ST) required properties:

System Timer (ST) required properties:

- compatible: Should be "atmel,at91rm9200-st"

- compatible: Should be "atmel,at91rm9200-st", "syscon", "simple-mfd"

- reg: Should contain registers location and length

- reg: Should contain registers location and length

- interrupts: Should contain interrupt for the ST which is the IRQ line

- interrupts: Should contain interrupt for the ST which is the IRQ line

  shared across all System Controller members.

  shared across all System Controller members.

Its subnodes can be:

- watchdog: compatible should be "atmel,at91rm9200-wdt"





TC/TCLIB Timer required properties:

TC/TCLIB Timer required properties:

- compatible: Should be "atmel,<chip>-tcb".

- compatible: Should be "atmel,<chip>-tcb".

Documentation/devicetree/bindings/serial/atmel-usart.txt

+2 −1
Original line number Original line Diff line number Diff line 
* Atmel Universal Synchronous Asynchronous Receiver/Transmitter (USART)

* Atmel Universal Synchronous Asynchronous Receiver/Transmitter (USART)





Required properties:

Required properties:

- compatible: Should be "atmel,<chip>-usart"

- compatible: Should be "atmel,<chip>-usart" or "atmel,<chip>-dbgu"

  The compatible <chip> indicated will be the first SoC to support an

  The compatible <chip> indicated will be the first SoC to support an

  additional mode or an USART new feature.

  additional mode or an USART new feature.

  For the dbgu UART, use "atmel,<chip>-dbgu", "atmel,<chip>-usart"

- reg: Should contain registers location and length

- reg: Should contain registers location and length

- interrupts: Should contain interrupt

- interrupts: Should contain interrupt

- clock-names: tuple listing input clock names.

- clock-names: tuple listing input clock names.

Documentation/devicetree/bindings/watchdog/atmel-wdt.txt

+5 −0
Original line number Original line Diff line number Diff line
@@ -26,6 +26,11 @@ Optional properties: 
- atmel,disable : Should be present if you want to disable the watchdog.

- atmel,disable : Should be present if you want to disable the watchdog.

- atmel,idle-halt : Should be present if you want to stop the watchdog when

- atmel,idle-halt : Should be present if you want to stop the watchdog when

	entering idle state.

	entering idle state.

	CAUTION: This property should be used with care, it actually makes the

	watchdog not counting when the CPU is in idle state, therefore the

	watchdog reset time depends on mean CPU usage and will not reset at all

	if the CPU stop working while it is in idle state, which is probably

	not what you want.

- atmel,dbg-halt : Should be present if you want to stop the watchdog when

- atmel,dbg-halt : Should be present if you want to stop the watchdog when

	entering debug state.

	entering debug state.

arch/arm/Kconfig

+1 −1
Original line number Original line Diff line number Diff line
@@ -361,9 +361,9 @@ config ARCH_AT91 
	select ARCH_REQUIRE_GPIOLIB

	select ARCH_REQUIRE_GPIOLIB

	select CLKDEV_LOOKUP

	select CLKDEV_LOOKUP

	select IRQ_DOMAIN

	select IRQ_DOMAIN

	select NEED_MACH_IO_H if PCCARD

	select PINCTRL

	select PINCTRL

	select PINCTRL_AT91

	select PINCTRL_AT91

	select SOC_BUS

	select USE_OF

	select USE_OF

	help

	help

	  This enables support for systems based on Atmel

	  This enables support for systems based on Atmel

arch/arm/boot/dts/at91rm9200.dtsi

+6 −2
Original line number Original line Diff line number Diff line
@@ -356,9 +356,13 @@ 
			};

			};





			st: timer@fffffd00 {

			st: timer@fffffd00 {

				compatible = "atmel,at91rm9200-st";

				compatible = "atmel,at91rm9200-st", "syscon", "simple-mfd";

				reg = <0xfffffd00 0x100>;

				reg = <0xfffffd00 0x100>;

				interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;

				interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;



				watchdog {

					compatible = "atmel,at91rm9200-wdt";

				};

			};

			};





			rtc: rtc@fffffe00 {

			rtc: rtc@fffffe00 {
@@ -830,7 +834,7 @@ 
			};

			};





			dbgu: serial@fffff200 {

			dbgu: serial@fffff200 {

				compatible = "atmel,at91rm9200-usart";

				compatible = "atmel,at91rm9200-dbgu", "atmel,at91rm9200-usart";

				reg = <0xfffff200 0x200>;

				reg = <0xfffff200 0x200>;

				interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;

				interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;

				pinctrl-names = "default";

				pinctrl-names = "default";