Commit 0f6b9ee4 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'at91-dt' of git://github.com/at91linux/linux-at91 into next/dt 

From Nicolas Ferre <nicolas.ferre@atmel.com>:

One macb DT node move for 9x5 family: 9g15 doesn't
have an Ethernet interface.
Little fixes mainly related to at91sam9x5 DT, IIO ADC bindings,
pinctrl for at91sam9260/g20 DT and the RTC addition.
Addition of the Acme Systems Aria G25 board.

* tag 'at91-dt' of git://github.com/at91linux/linux-at91

:
  ARM: at91/at91sam9260.dtsi: fix u(s)art pinctrl encoding
  ARM: at91: dts: add adc resolution stuff
  ARM: at91: add Acme Systems Aria G25 board
  ARM: at91/dt: fix macb node declaration
  ARM: at91: remove partial parameter in bootargs for at91sam9x5ek.dtsi
  ARM: at91/trivial: fix model name for SAM9G15-EK
  ARM: at91/trivial: typos in compatible property
  ARM: at91/at91sam9x5: add RTC node

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents b26cd30c f10491ff

arch/arm/boot/dts/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ dtb-$(CONFIG_ARCH_AT91) += pm9g45.dtb 
# sam9n12

dtb-$(CONFIG_ARCH_AT91) += at91sam9n12ek.dtb

# sam9x5

dtb-$(CONFIG_ARCH_AT91) += at91-ariag25.dtb

dtb-$(CONFIG_ARCH_AT91) += at91sam9g15ek.dtb

dtb-$(CONFIG_ARCH_AT91) += at91sam9g25ek.dtb

dtb-$(CONFIG_ARCH_AT91) += at91sam9g35ek.dtb

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

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

 * at91-ariag25.dts - Device Tree file for Acme Systems Aria G25 (AT91SAM9G25 based)

 *

 * Copyright (C) 2013 Douglas Gilbert <dgilbert@interlog.com>,

 *                    Robert Nelson <robertcnelson@gmail.com>

 *

 * Licensed under GPLv2 or later.

 */

/dts-v1/;

/include/ "at91sam9g25.dtsi"



/ {

	model = "Acme Systems Aria G25";

	compatible = "acme,ariag25", "atmel,at91sam9x5ek",

		     "atmel,at91sam9x5", "atmel,at91sam9";



	aliases {

		serial0 = &dbgu;

		serial1 = &usart0;

		serial2 = &usart1;

		serial3 = &usart2;

		serial4 = &usart3;

		serial5 = &uart0;

	};



	chosen {

		bootargs = "console=ttyS0,115200 root=/dev/mmcblk0p2 rw rootwait";

	};



	memory {

		/* 128 MB, change this for 256 MB revision */

		reg = <0x20000000 0x8000000>;

	};



	clocks {

		#address-cells = <1>;

		#size-cells = <1>;

		ranges;



		main_clock: clock@0 {

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

			clock-frequency = <12000000>;

		};

	};



	ahb {

		apb {

			mmc0: mmc@f0008000 {

				/* N.B. Aria has no SD card detect (CD), assumed present */



				pinctrl-0 = <

					&pinctrl_mmc0_slot0_clk_cmd_dat0

					&pinctrl_mmc0_slot0_dat1_3>;

				status = "okay";

				slot@0 {

					reg = <0>;

					bus-width = <4>;

				};

			};



			i2c0: i2c@f8010000 {

				status = "okay";

			};



			i2c1: i2c@f8014000 {

				status = "okay";

			};



			/* TWD2+TCLK2 hidden behind ethernet, so no i2c2 */



			usart0: serial@f801c000 {

				pinctrl-0 = <&pinctrl_usart0

					     &pinctrl_usart0_rts

					     &pinctrl_usart0_cts>;

				status = "okay";

			};



			usart1: serial@f8020000 {

				pinctrl-0 = <&pinctrl_usart1

					     /* &pinctrl_usart1_rts */

					     /* &pinctrl_usart1_cts */

					    >;

				status = "okay";

			};



			usart2: serial@f8024000 {

				/* cannot activate RTS2+CTS2, clash with

				 * ethernet on PB0 and PB1 */

				pinctrl-0 = <&pinctrl_usart2>;

				status = "okay";

			};



			usart3: serial@f8028000 {

				compatible = "atmel,at91sam9260-usart";

				reg = <0xf8028000 0x200>;

				interrupts = <8 4 5>;

				pinctrl-names = "default";

				pinctrl-0 = <&pinctrl_usart3

					     /* &pinctrl_usart3_rts */

					     /* &pinctrl_usart3_cts */

					    >;

				status = "okay";

			};



			macb0: ethernet@f802c000 {

				phy-mode = "rmii";

				/*

				 * following can be overwritten by bootloader:

				 * for example u-boot 'ftd set' command

				 */

				local-mac-address = [00 00 00 00 00 00];

				status = "okay";

			};



			uart0: serial@f8040000 {

				compatible = "atmel,at91sam9260-usart";

				reg = <0xf8040000 0x200>;

				interrupts = <15 4 5>;

				pinctrl-names = "default";

				pinctrl-0 = <&pinctrl_uart0>;

				status = "okay";

			};



			adc0: adc@f804c000 {

				status = "okay";

				atmel,adc-channels-used = <0xf>;

				atmel,adc-num-channels = <4>;

			};



			dbgu: serial@fffff200 {

				status = "okay";

			};



			pinctrl@fffff400 {

				w1_0 {

					pinctrl_w1_0: w1_0-0 {

						atmel,pins = <0 21 0x0 0x1>; /* PA21 PIO, pull-up */

					};

				};

			};

		};



		usb0: ohci@00600000 {

			status = "okay";

			num-ports = <3>;

		};



		usb1: ehci@00700000 {

			status = "okay";

		};

	};



	leds {

		compatible = "gpio-leds";



		/* little green LED in middle of Aria G25 module */

		aria_led {

			label = "aria_led";

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

			linux,default-trigger = "heartbeat";

		};



	};



	onewire@0 {

		compatible = "w1-gpio";

		gpios = <&pioA 21 1>;

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_w1_0>;

	};

};

arch/arm/boot/dts/at91sam9260.dtsi

+11 −8
Original line number Diff line number Diff line
@@ -158,8 +158,8 @@ 
				usart1 {

					pinctrl_usart1: usart1-0 {

						atmel,pins =

							<2 6 0x1 0x1	/* PB6 periph A with pullup */

							 2 7 0x1 0x0>;	/* PB7 periph A */

							<1 6 0x1 0x1	/* PB6 periph A with pullup */

							 1 7 0x1 0x0>;	/* PB7 periph A */

					};



					pinctrl_usart1_rts: usart1_rts-0 {
@@ -194,18 +194,18 @@ 
				usart3 {

					pinctrl_usart3: usart3-0 {

						atmel,pins =

							<2 10 0x1 0x1	/* PB10 periph A with pullup */

							 2 11 0x1 0x0>;	/* PB11 periph A */

							<1 10 0x1 0x1	/* PB10 periph A with pullup */

							 1 11 0x1 0x0>;	/* PB11 periph A */

					};



					pinctrl_usart3_rts: usart3_rts-0 {

						atmel,pins =

							<3 8 0x2 0x0>;	/* PB8 periph B */

							<2 8 0x2 0x0>;	/* PC8 periph B */

					};



					pinctrl_usart3_cts: usart3_cts-0 {

						atmel,pins =

							<3 10 0x2 0x0>;	/* PB10 periph B */

							<2 10 0x2 0x0>;	/* PC10 periph B */

					};

				};
@@ -220,8 +220,8 @@ 
				uart1 {

					pinctrl_uart1: uart1-0 {

						atmel,pins =

							<2 12 0x1 0x1	/* PB12 periph A with pullup */

							 2 13 0x1 0x0>;	/* PB13 periph A */

							<1 12 0x1 0x1	/* PB12 periph A with pullup */

							 1 13 0x1 0x0>;	/* PB13 periph A */

					};

				};
@@ -484,6 +484,9 @@ 
				atmel,adc-drdy-mask = <0x10000>;

				atmel,adc-status-register = <0x1c>;

				atmel,adc-trigger-register = <0x04>;

				atmel,adc-res = <8 10>;

				atmel,adc-res-names = "lowres", "highres";

				atmel,adc-use-res = "highres";



				trigger@0 {

					trigger-name = "timer-counter-0";

arch/arm/boot/dts/at91sam9g15.dtsi

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


/ {

	model = "Atmel AT91SAM9G15 SoC";

	compatible = "atmel, at91sam9g15, atmel,at91sam9x5";

	compatible = "atmel,at91sam9g15", "atmel,at91sam9x5";



	ahb {

		apb {

arch/arm/boot/dts/at91sam9g15ek.dts

+1 −1
Original line number Diff line number Diff line
@@ -11,6 +11,6 @@ 
/include/ "at91sam9x5ek.dtsi"



/ {

	model = "Atmel AT91SAM9G25-EK";

	model = "Atmel AT91SAM9G15-EK";

	compatible = "atmel,at91sam9g15ek", "atmel,at91sam9x5ek", "atmel,at91sam9x5", "atmel,at91sam9";

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE