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

Commit 8ef9aea8 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'at91-ab-4.16-dt' of... 

Merge tag 'at91-ab-4.16-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into next/dt

DT for 4.16

 - New boards:
   - Axentia Nattis with Natte power
   - sama5d2 PTC ek
 - Document and use extended TCB bindings

* tag 'at91-ab-4.16-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux

: (50 commits)
  ARM: dts: at91: sama5d2_ptc_ek: use TCB0 as timers
  ARM: dts: at91: sama5d27_som1_ek: use TCB0 as timers
  ARM: dts: at91: sama5d2 Xplained: use TCB0 as timers
  ARM: dts: at91: sama5d2: TC blocks are also simple-mfd and syscon devices
  ARM: dts: at91: vinco: use TCB2 as timers
  ARM: dts: at91: ma5d4: use TCB2 as timers
  ARM: dts: at91: sama5d4 Xplained: use TCB2 as timers
  ARM: dts: at91: sama5d4ek: use TCB2 as timers
  ARM: dts: at91: sama5d4: Add TCB2
  ARM: dts: at91: sama5d4: TC blocks are also simple-mfd and syscon devices
  ARM: dts: at91: linea/tse850-3: use TCB0 as timers
  ARM: dts: at91: sama5d3xek_cmp: use TCB0 as timers
  ARM: dts: at91: kizbox2: use TCB0 as timers
  ARM: dts: at91: sama5d3 Xplained: use TCB0 as timers
  ARM: dts: at91: sama5d3xek: use TCB0 as timers
  ARM: dts: at91: sama5d3: TC blocks are also simple-mfd and syscon devices
  ARM: dts: at91: kizboxmini: use TCB0 as timers
  ARM: dts: at91: cosino: use TCB0 as timers
  ARM: dts: at91: acme/g25: use TCB0 as timers
  ARM: dts: at91: at91sam9x5cm: use TCB0 as timers
  ...

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents b357e884 34a7fc31

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

+0 −32
Original line number Diff line number Diff line
@@ -90,38 +90,6 @@ System Timer (ST) required properties: 
Its subnodes can be:

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



TC/TCLIB Timer required properties:

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

  <chip> can be "at91rm9200" or "at91sam9x5"

- reg: Should contain registers location and length

- interrupts: Should contain all interrupts for the TC block

  Note that you can specify several interrupt cells if the TC

  block has one interrupt per channel.

- clock-names: tuple listing input clock names.

	Required elements: "t0_clk", "slow_clk"

	Optional elements: "t1_clk", "t2_clk"

- clocks: phandles to input clocks.



Examples:



One interrupt per TC block:

	tcb0: timer@fff7c000 {

		compatible = "atmel,at91rm9200-tcb";

		reg = <0xfff7c000 0x100>;

		interrupts = <18 4>;

		clocks = <&tcb0_clk>;

		clock-names = "t0_clk";

	};



One interrupt per TC channel in a TC block:

	tcb1: timer@fffdc000 {

		compatible = "atmel,at91rm9200-tcb";

		reg = <0xfffdc000 0x100>;

		interrupts = <26 4 27 4 28 4>;

		clocks = <&tcb1_clk>;

		clock-names = "t0_clk";

	};



RSTC Reset Controller required properties:

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

  <chip> can be "at91sam9260" or "at91sam9g45" or "sama5d3"

Documentation/devicetree/bindings/arm/axentia.txt

+9 −0
Original line number Diff line number Diff line
@@ -10,6 +10,15 @@ compatible = "axentia,linea", 
and following the rules from atmel-at91.txt for a sama5d31 SoC.





Nattis v2 board with Natte v2 power board

-----------------------------------------



Required root node properties:

compatible = "axentia,nattis-2", "axentia,natte-2", "axentia,linea",

	     "atmel,sama5d31", "atmel,sama5d3", "atmel,sama5";

and following the rules from above for the axentia,linea CPU module.





TSE-850 v3 board

----------------

Documentation/devicetree/bindings/mfd/atmel-tcb.txt

0 → 100644
+56 −0
Original line number Diff line number Diff line 
* Device tree bindings for Atmel Timer Counter Blocks

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

  <chip> can be "at91rm9200" or "at91sam9x5"

- reg: Should contain registers location and length

- #address-cells: has to be 1

- #size-cells: has to be 0

- interrupts: Should contain all interrupts for the TC block

  Note that you can specify several interrupt cells if the TC

  block has one interrupt per channel.

- clock-names: tuple listing input clock names.

	Required elements: "t0_clk", "slow_clk"

	Optional elements: "t1_clk", "t2_clk"

- clocks: phandles to input clocks.



The TCB can expose multiple subdevices:

 * a timer

   - compatible: Should be "atmel,tcb-timer"

   - reg: Should contain the TCB channels to be used. If the

     counter width is 16 bits (at91rm9200-tcb), two consecutive

     channels are needed. Else, only one channel will be used.



Examples:



One interrupt per TC block:

	tcb0: timer@fff7c000 {

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

		#address-cells = <1>;

		#size-cells = <0>;

		reg = <0xfff7c000 0x100>;

		interrupts = <18 4>;

		clocks = <&tcb0_clk>, <&clk32k>;

		clock-names = "t0_clk", "slow_clk";



		timer@0 {

			compatible = "atmel,tcb-timer";

			reg = <0>, <1>;

		};



		timer@2 {

			compatible = "atmel,tcb-timer";

			reg = <2>;

		};

	};



One interrupt per TC channel in a TC block:

	tcb1: timer@fffdc000 {

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

		#address-cells = <1>;

		#size-cells = <0>;

		reg = <0xfffdc000 0x100>;

		interrupts = <26 4>, <27 4>, <28 4>;

		clocks = <&tcb1_clk>, <&clk32k>;

		clock-names = "t0_clk", "slow_clk";

	};

MAINTAINERS

+2 −0
Original line number Diff line number Diff line
@@ -2501,6 +2501,8 @@ L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) 
S:	Maintained

F:	Documentation/devicetree/bindings/arm/axentia.txt

F:	arch/arm/boot/dts/at91-linea.dtsi

F:	arch/arm/boot/dts/at91-natte.dtsi

F:	arch/arm/boot/dts/at91-nattis-2-natte-2.dts

F:	arch/arm/boot/dts/at91-tse850-3.dts



AXENTIA ASOC DRIVERS

arch/arm/boot/dts/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -45,7 +45,9 @@ dtb-$(CONFIG_SOC_AT91SAM9) += \ 
	at91sam9x35ek.dtb

dtb-$(CONFIG_SOC_SAM_V7) += \

	at91-kizbox2.dtb \

	at91-nattis-2-natte-2.dtb \

	at91-sama5d27_som1_ek.dtb \

	at91-sama5d2_ptc_ek.dtb \

	at91-sama5d2_xplained.dtb \

	at91-sama5d3_xplained.dtb \

	at91-tse850-3.dtb \