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

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

Merge tag 'at91-ab-4.10-dt1' of... 

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

DT changes for 4.10:

 - Many additions for sama5d2
 - few non urgent fixes for sam9260ek, sama5d4 and sama5d2

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

:
  ARM: dts: at91: replace gpio-key,wakeup with wakeup-source for sam9260ek
  ARM: dts: at91: sama5d2: Add securam node
  ARM: dts: at91: sama5d2: Add secumod node
  ARM: dts: at91: sama5d2: use correct sckc compatible
  ARM: dts: at91: sama5d4: use proper sckc compatible
  ARM: dts: at91: fixes dbgu pinctrl, set pullup on rx, clear pullup on tx
  dt-bindings: usb: atmel: fix a couple of copy-paste style typos
  ARM: dts: at91: sama5d2: enable FIFOs for high-speed i2c controllers
  ARM: dts: at91: sama5d4: Add new MA5D4EVK manufacturer compat

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 964971c8 b662a9dd

Documentation/devicetree/bindings/usb/atmel-usb.txt

+5 −5
Original line number Diff line number Diff line
@@ -6,9 +6,9 @@ Required properties: 
 - compatible: Should be "atmel,at91rm9200-ohci" for USB controllers

   used in host mode.

 - reg: Address and length of the register set for the device

 - interrupts: Should contain ehci interrupt

 - interrupts: Should contain ohci interrupt

 - clocks: Should reference the peripheral, host and system clocks

 - clock-names: Should contains two strings

 - clock-names: Should contain three strings

		"ohci_clk" for the peripheral clock

		"hclk" for the host clock

		"uhpck" for the system clock
@@ -35,7 +35,7 @@ Required properties: 
 - reg: Address and length of the register set for the device

 - interrupts: Should contain ehci interrupt

 - clocks: Should reference the peripheral and the UTMI clocks

 - clock-names: Should contains two strings

 - clock-names: Should contain two strings

		"ehci_clk" for the peripheral clock

		"usb_clk" for the UTMI clock
@@ -58,7 +58,7 @@ Required properties: 
 - reg: Address and length of the register set for the device

 - interrupts: Should contain macb interrupt

 - clocks: Should reference the peripheral and the AHB clocks

 - clock-names: Should contains two strings

 - clock-names: Should contain two strings

		"pclk" for the peripheral clock

		"hclk" for the AHB clock
@@ -85,7 +85,7 @@ Required properties: 
 - reg: Address and length of the register set for the device

 - interrupts: Should contain usba interrupt

 - clocks: Should reference the peripheral and host clocks

 - clock-names: Should contains two strings

 - clock-names: Should contain two strings

		"pclk" for the peripheral clock

		"hclk" for the host clock

 - ep childnode: To specify the number of endpoints and their properties.

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

+2 −2
Original line number Diff line number Diff line
@@ -12,8 +12,8 @@ 
#include "sama5d4.dtsi"



/ {

	model = "DENX MA5D4";

	compatible = "denx,ma5d4", "atmel,sama5d4", "atmel,sama5";

	model = "Aries/DENX MA5D4";

	compatible = "aries,ma5d4", "denx,ma5d4", "atmel,sama5d4", "atmel,sama5";



	memory {

		reg = <0x20000000 0x10000000>;

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

+2 −2
Original line number Diff line number Diff line
@@ -13,8 +13,8 @@ 
#include "at91-sama5d4_ma5d4.dtsi"



/ {

	model = "DENX MA5D4EVK";

	compatible = "denx,ma5d4evk", "atmel,sama5d4", "atmel,sama5";

	model = "Aries/DENX MA5D4EVK";

	compatible = "aries,ma5d4evk", "denx,ma5d4evk", "atmel,sama5d4", "atmel,sama5";



	chosen {

		stdout-path = "serial3:115200n8";

arch/arm/boot/dts/at91rm9200.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -481,8 +481,8 @@ 
				dbgu {

					pinctrl_dbgu: dbgu-0 {

						atmel,pins =

							<AT91_PIOA 30 AT91_PERIPH_A AT91_PINCTRL_NONE	/* PA30 periph A */

							 AT91_PIOA 31 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;	/* PA31 periph with pullup */

							<AT91_PIOA 30 AT91_PERIPH_A AT91_PINCTRL_PULL_UP

							 AT91_PIOA 31 AT91_PERIPH_A AT91_PINCTRL_NONE>;

					};

				};

arch/arm/boot/dts/at91sam9260.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -412,8 +412,8 @@ 
				dbgu {

					pinctrl_dbgu: dbgu-0 {

						atmel,pins =

							<AT91_PIOB 14 AT91_PERIPH_A AT91_PINCTRL_NONE	/* PB14 periph A */

							 AT91_PIOB 15 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;	/* PB15 periph with pullup */

							<AT91_PIOB 14 AT91_PERIPH_A AT91_PINCTRL_PULL_UP

							 AT91_PIOB 15 AT91_PERIPH_A AT91_PINCTRL_NONE>;

					};

				};