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

Commit 27c1e362 authored by Olof Johansson's avatar Olof Johansson
Browse files

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

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

DT Changes for 4.8:
 - New board: Olimex SAM9-L9260
 - Fix crystal definitions for Denx ma5d4
 - Remove leftover clock definitions
 - Add stdout-path for usb_a9260/a9g20

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

:
  ARM: dts: at91: calao: remove leftovers clock definition
  ARM: dts: at91: pm9g45: remove leftovers clock definition
  ARM: dts: at91: mpa1600: remove leftovers clock definition
  ARM: dts: at91: ge863-pro3: remove leftovers clock definition
  ARM: dts: at91: at91-foxg20: remove leftovers clock definition
  ARM: dts: at91: at91-cosino: remove leftovers clock definition
  ARM: dts: at91: at91-ariag25: remove leftovers clock definition
  ARM: dts: at91: animeo_ip: remove leftovers clock definition
  ARM: dts: at91: ma5d4: properly define crystals frequencies
  ARM: dts: at91: usb_a9g20: use stdout-path
  ARM: dts: at91: Add DT support for Olimex SAM9-L9260 board.
  ARM: dts: at91: at91sam9260: Remove leading zeros in OHCI node.

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 943bba78 64c0703e

Documentation/devicetree/bindings/arm/olimex.txt

+6 −2
Original line number Diff line number Diff line 
Olimex i.MX Platforms Device Tree Bindings

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

Olimex Device Tree Bindings

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



SAM9-L9260 Board

Required root node properties:

    - compatible = "olimex,sam9-l9260", "atmel,at91sam9260";



i.MX23 Olinuxino Low Cost Board

Required root node properties:

arch/arm/boot/dts/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ dtb-$(CONFIG_SOC_SAM_V4_V5) += \ 
	usb_a9260.dtb \

	at91sam9261ek.dtb \

	at91sam9263ek.dtb \

	at91-sam9_l9260.dtb \

	tny_a9263.dtb \

	usb_a9263.dtb \

	at91-foxg20.dtb \

arch/arm/boot/dts/aks-cdu.dts

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ 
			};

		};



		usb0: ohci@00500000 {

		usb0: ohci@500000 {

			num-ports = <2>;

			status = "okay";

		};

arch/arm/boot/dts/animeo_ip.dts

+1 −10
Original line number Diff line number Diff line
@@ -32,15 +32,6 @@ 
	};



	clocks {

		#address-cells = <1>;

		#size-cells = <1>;

		ranges;



		main_clock: clock@0 {

			compatible = "atmel,osc", "fixed-clock";

			clock-frequency = <18432000>;

		};



		slow_xtal {

			clock-frequency = <32768>;

		};
@@ -114,7 +105,7 @@ 
			};

		};



		usb0: ohci@00500000 {

		usb0: ohci@500000 {

			num-ports = <2>;

			atmel,vbus-gpio = <&pioB 15 GPIO_ACTIVE_LOW>;

			status = "okay";

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

+0 −9
Original line number Diff line number Diff line
@@ -34,15 +34,6 @@ 
	};



	clocks {

		#address-cells = <1>;

		#size-cells = <1>;

		ranges;



		main_clock: clock@0 {

			compatible = "atmel,osc", "fixed-clock";

			clock-frequency = <12000000>;

		};



		slow_xtal {

			clock-frequency = <32768>;

		};