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

Commit 28e603b2 authored by Olof Johansson's avatar Olof Johansson
Browse files

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

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

DT for 4.11:

 - New boards: Axentia TSE-850, sama5d36ek CMP
 - new device definitions for sama5d2
 - Fix DMA allocation on sama5d4 for secure peripherals

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

:
  ARM: dts: at91: add devicetree for the Axentia TSE-850
  ARM: dts: at91: add dts file for sama5d36ek CMP board
  ARM: dts: at91: sama5d2: add ssc0 definition
  ARM: dts: at91: sama5d2 Xplained: use DMA for UART3
  ARM: dts: at91: sama5d2: move UART3 to DMA1
  ARM: dts: at91: add dma1 definition to sama5d2
  ARM: dts: at91: sama5d4 Xplained: enable UART1 node with DMA
  ARM: dts: at91: sama5d4: change DMA allocation for secure peripherals
  ARM: dts: at91: sama5d3_uart: fix reg sizes to match documentation

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents c2b36044 21dd0ece

Documentation/devicetree/bindings/arm/axentia.txt

0 → 100644
+19 −0
Original line number Diff line number Diff line 
Device tree bindings for Axentia ARM devices

============================================



Linea CPU module

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



Required root node properties:

compatible = "axentia,linea",

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

and following the rules from atmel-at91.txt for a sama5d31 SoC.





TSE-850 v3 board

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



Required root node properties:

compatible = "axentia,tse850v3", "axentia,linea",

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

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

MAINTAINERS

+8 −0
Original line number Diff line number Diff line
@@ -2353,6 +2353,14 @@ S: Maintained 
F:	Documentation/devicetree/bindings/sound/axentia,*

F:	sound/soc/atmel/tse850-pcm5142.c



AXENTIA ARM DEVICES

M:	Peter Rosin <peda@axentia.se>

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-tse850-3.dts



AZ6007 DVB DRIVER

M:	Mauro Carvalho Chehab <mchehab@s-opensource.com>

M:	Mauro Carvalho Chehab <mchehab@kernel.org>

arch/arm/boot/dts/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -48,11 +48,13 @@ dtb-$(CONFIG_SOC_SAM_V7) += \ 
	at91-kizbox2.dtb \

	at91-sama5d2_xplained.dtb \

	at91-sama5d3_xplained.dtb \

	at91-tse850-3.dtb \

	sama5d31ek.dtb \

	sama5d33ek.dtb \

	sama5d34ek.dtb \

	sama5d35ek.dtb \

	sama5d36ek.dtb \

	sama5d36ek_cmp.dtb \

	at91-sama5d4_ma5d4evk.dtb \

	at91-sama5d4_xplained.dtb \

	at91-sama5d4ek.dtb \

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

0 → 100644
+49 −0
Original line number Diff line number Diff line 
/*

 * at91-linea.dtsi - Device Tree Include file for the Axentia Linea Module.

 *

 * Copyright (C) 2017 Axentia Technologies AB

 *

 * Author: Peter Rosin <peda@axentia.se>

 *

 * Licensed under GPLv2 or later.

 */



#include "sama5d31.dtsi"



/ {

	compatible = "axentia,linea",

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



	memory {

		reg = <0x20000000 0x4000000>;

	};

};



&slow_xtal {

	clock-frequency = <32768>;

};



&main_xtal {

	clock-frequency = <12000000>;

};



&i2c0 {

	status = "okay";



	eeprom@51 {

		compatible = "st,24c64";

		reg = <0x51>;

		pagesize = <32>;

	};

};



&nand0 {

	status = "okay";



	nand-bus-width = <8>;

	nand-ecc-mode = "hw";

	atmel,has-pmecc;

	atmel,pmecc-cap = <4>;

	atmel,pmecc-sector-size = <512>;

	nand-on-flash-bbt;

};

arch/arm/boot/dts/at91-sama5d2_xplained.dts

+2 −0
Original line number Diff line number Diff line
@@ -256,6 +256,8 @@ 
			};



			uart3: serial@fc008000 {

				atmel,use-dma-rx;

				atmel,use-dma-tx;

				pinctrl-names = "default";

				pinctrl-0 = <&pinctrl_uart3_default>;

				status = "okay";