Commit 36d32ed9 authored by Kevin Hilman's avatar Kevin Hilman
Browse files

Merge tag 'at91-dt4' of... 

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

Fourth batch of DT changes for 4.2:
- rtc node for at91sam9rl/at91sam9rlek
- move to stdout-path for console on kizbox and all Atmel's boards
- Addition of the Acme Systems' Arietta G25
- two little fixes for Kizbox and sama5d4ek

* tag 'at91-dt4' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91:
  ARM: at91/dt: sama5d4ek: mci0 uses slot 0
  ARM: at91/dt: kizbox: fix mismatch LED PWM device
  ARM: at91/dt: Add Acme Arietta G25
  ARM: at91/dt: sama5d4 xplained: use stdout-path
  ARM: at91/dt: sama5d4ek: use stdout-path
  ARM: at91/dt: sama5d3 xplained: use stdout-path
  ARM: at91/dt: sama5d3xek: use stdout-path
  ARM: at91/dt: at91sam9x5ek: use stdout-path
  ARM: at91/dt: at91sam9rlek: use stdout-path
  ARM: at91/dt: at91sam9n12ek: use stdout-path
  ARM: at91/dt: at91sam9m10g45ek use stdout-path
  ARM: at91/dt: at91sam9g20ek: use stdout-path
  ARM: at91/dt: at91sam9263ek: use stdout-path
  ARM: at91/dt: at91sam9261ek: use stdout-path
  ARM: at91/dt: at91rm9200ek: use stdout-path
  ARM: at91/dt: kizbox: use stdout-path
  ARM: at91/dt: at91sam9rlek: add RTC
  ARM: at91/dt: at91sam9rl: fix rtc node
parents b3182ff6 ea25525c

arch/arm/boot/dts/Makefile

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

	at91sam9rlek.dtb \

	at91-ariag25.dtb \

	at91-ariettag25.dtb \

	at91-cosino_mega2560.dtb \

	at91-kizboxmini.dtb \

	at91sam9g15ek.dtb \

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

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

 * Device Tree file for Arietta G25

 * This device tree is minimal, to activate more peripherals, see:

 * http://dts.acmesystems.it/arietta/

 */

/dts-v1/;

#include "at91sam9g25.dtsi"

/ {

	model = "Acme Systems Arietta G25";

	compatible = "acme,ariettag25", "atmel,at91sam9x5", "atmel,at91sam9";



	aliases {

		serial0 = &dbgu;

	};



	chosen {

		stdout-path = "serial0:115200n8";

	};



	memory {

		reg = <0x20000000 0x8000000>;

	};



	clocks {

		slow_xtal {

			clock-frequency = <32768>;

		};



		main_xtal {

			clock-frequency = <12000000>;

		};

	};



	ahb {

		apb {

			mmc0: mmc@f0008000 {

				pinctrl-0 = <

				  &pinctrl_mmc0_slot0_clk_cmd_dat0

				  &pinctrl_mmc0_slot0_dat1_3>;

				status = "okay";



				slot@0 {

					reg = <0>;

					bus-width = <4>;

				};

			};



			usb2: gadget@f803c000 {

				status = "okay";

			};



			dbgu: serial@fffff200 {

				status = "okay";

			};



			rtc@fffffeb0 {

				status = "okay";

			};

		};



		usb0: ohci@00600000 {

			status = "okay";

			num-ports = <3>;

		};



		usb1: ehci@00700000 {

			status = "okay";

		};

	};



	leds {

		compatible = "gpio-leds";

		arietta_led {

			label = "arietta_led";

			gpios = <&pioB 8 GPIO_ACTIVE_HIGH>; /* PB8 */

			linux,default-trigger = "heartbeat";

		};

	};

};

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

+2 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


	chosen {

		bootargs = "ubi.mtd=ubi";

		linux,stdout-path = &dbgu;

		stdout-path = &dbgu;

	};



	memory {
@@ -126,7 +126,7 @@ 


		network_red {

			label = "pwm:red:network";

			pwms = <&tcb_pwm 3 10000000 PWM_POLARITY_INVERTED>;

			pwms = <&tcb_pwm 4 10000000 PWM_POLARITY_INVERTED>;

			max-brightness = <255>;

			linux,default-trigger = "default-on";

		};

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

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 


	chosen {

		bootargs = "ubi.mtd=ubi";

		linux,stdout-path = &dbgu;

		stdout-path = &dbgu;

	};



	memory {

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

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 


	chosen {

		bootargs = "ubi.mtd=ubi";

		linux,stdout-path = &dbgu;

		stdout-path = &dbgu;

	};



	memory {

CRA Git | Maintained and supported by SUSTech CRA and CCSE