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

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

From Nicolas Ferre:

Big DT-centric update for AT91:
- Calao boards update, removal of one board C file and
  associated defconfig, Kconfig Makefile lines
- several Acme boards updates
- addition of watchdog, uart and pinctrl descriptions for
  several products
- modification of RTC compatible string for 9x5 family

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

: (21 commits)
  ARM: at91/dt: add pinctrl definition for at91 tc blocks
  ARM: at91/dts: add the watchdog nodes for at91 boards
  ARM: at91/dtsi: add the watchdog nodes for at91 SoC
  ARM: at91: drop non DT: Calao USB-A96x
  ARM: at91: dt: add Calao USB-A9G20 low power version
  ARM: at91: dt: usb-a9263: add dataflash support
  ARM: at91: dt: usb-a9263: update shutdown controller
  ARM: at91: dt: usb-a9260: update shutdown controller
  ARM: at91: dt: sam9260: add i2c gpio pinctrl
  ARM: at91: switch Fox G20 board .dts to pre-processor defines
  ARM: at91: add Acme Systems Fox G20 board
  ARM: at91/at91-ariag25.dts: UART0/1 nodes are disabled
  ARM: at91/at91sam9x5.dtsi: add UART0/1 nodes
  ARM: at91/at91-ariag25.dts: add RTC node
  ARM: at91: at91sam9x5 RTC is not compatible with at91rm9200 one
  ARM: at91: udpate defconfigs
  ARM: at91: dt: switch to standard IRQ flag defines
  ARM: at91: dt: switch to pinctrl to pre-processor
  ARM: at91: dt: add pinctrl pre-processor define
  ARM: at91: dt: switch to standard GPIO flag defines.
  ...

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 3c09f4da 028633c2

arch/arm/boot/dts/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -16,11 +16,13 @@ dtb-$(CONFIG_ARCH_AT91) += at91sam9263ek.dtb 
dtb-$(CONFIG_ARCH_AT91) += tny_a9263.dtb

dtb-$(CONFIG_ARCH_AT91) += usb_a9263.dtb

# sam9g20

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

dtb-$(CONFIG_ARCH_AT91) += at91sam9g20ek.dtb

dtb-$(CONFIG_ARCH_AT91) += at91sam9g20ek_2mmc.dtb

dtb-$(CONFIG_ARCH_AT91) += kizbox.dtb

dtb-$(CONFIG_ARCH_AT91) += tny_a9g20.dtb

dtb-$(CONFIG_ARCH_AT91) += usb_a9g20.dtb

dtb-$(CONFIG_ARCH_AT91) += usb_a9g20_lpw.dtb

# sam9g45

dtb-$(CONFIG_ARCH_AT91) += at91sam9m10g45ek.dtb

dtb-$(CONFIG_ARCH_AT91) += pm9g45.dtb

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

+6 −6
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 


/dts-v1/;



/include/ "ge863-pro3.dtsi"

#include "ge863-pro3.dtsi"



/ {

	chosen {
@@ -46,7 +46,7 @@ 
			};



			usb1: gadget@fffa4000 {

				atmel,vbus-gpio = <&pioC 15 0>;

				atmel,vbus-gpio = <&pioC 15 GPIO_ACTIVE_HIGH>;

				status = "okay";

			};

		};
@@ -90,23 +90,23 @@ 
		compatible = "gpio-leds";



		red {

			gpios = <&pioC 10 0>;

			gpios = <&pioC 10 GPIO_ACTIVE_HIGH>;

			linux,default-trigger = "none";

		};



		green {

			gpios = <&pioA 5 1>;

			gpios = <&pioA 5 GPIO_ACTIVE_LOW>;

			linux,default-trigger = "none";

			default-state = "on";

		};



		yellow {

			gpios = <&pioB 20 1>;

			gpios = <&pioB 20 GPIO_ACTIVE_LOW>;

			linux,default-trigger = "none";

		};



		blue {

			gpios = <&pioB 21 1>;

			gpios = <&pioB 21 GPIO_ACTIVE_LOW>;

			linux,default-trigger = "none";

		};

	};

arch/arm/boot/dts/animeo_ip.dts

+9 −9
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
 */



/dts-v1/;

/include/ "at91sam9260.dtsi"

#include "at91sam9260.dtsi"



/ {

	model = "Somfy Animeo IP";
@@ -123,7 +123,7 @@ 


		usb0: ohci@00500000 {

			num-ports = <2>;

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

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

			status = "okay";

		};

	};
@@ -133,23 +133,23 @@ 


		power_green {

			label = "power_green";

			gpios = <&pioC 17 0>;

			gpios = <&pioC 17 GPIO_ACTIVE_HIGH>;

			linux,default-trigger = "heartbeat";

		};



		power_red {

			label = "power_red";

			gpios = <&pioA 2 0>;

			gpios = <&pioA 2 GPIO_ACTIVE_HIGH>;

		};



		tx_green {

			label = "tx_green";

			gpios = <&pioC 19 0>;

			gpios = <&pioC 19 GPIO_ACTIVE_HIGH>;

		};



		tx_red {

			label = "tx_red";

			gpios = <&pioC 18 0>;

			gpios = <&pioC 18 GPIO_ACTIVE_HIGH>;

		};

	};
@@ -160,21 +160,21 @@ 


		keyswitch_in {

			label = "keyswitch_in";

			gpios = <&pioB 1 0>;

			gpios = <&pioB 1 GPIO_ACTIVE_HIGH>;

			linux,code = <28>;

			gpio-key,wakeup;

		};



		error_in {

			label = "error_in";

			gpios = <&pioB 2 0>;

			gpios = <&pioB 2 GPIO_ACTIVE_HIGH>;

			linux,code = <29>;

			gpio-key,wakeup;

		};



		btn {

			label = "btn";

			gpios = <&pioC 23 0>;

			gpios = <&pioC 23 GPIO_ACTIVE_HIGH>;

			linux,code = <31>;

			gpio-key,wakeup;

		};

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

+18 −9
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
 * Licensed under GPLv2 or later.

 */

/dts-v1/;

/include/ "at91sam9g25.dtsi"

#include "at91sam9g25.dtsi"



/ {

	model = "Acme Systems Aria G25";
@@ -21,6 +21,7 @@ 
		serial3 = &usart2;

		serial4 = &usart3;

		serial5 = &uart0;

		serial6 = &uart1;

	};



	chosen {
@@ -112,13 +113,17 @@ 
				status = "okay";

			};



			/*

			 * UART0/1 pins are marked as GPIO on

			 * Aria documentation.

			 * Change to "okay" if you need additional serial ports

			 */

			uart0: serial@f8040000 {

				compatible = "atmel,at91sam9260-usart";

				reg = <0xf8040000 0x200>;

				interrupts = <15 4 5>;

				pinctrl-names = "default";

				pinctrl-0 = <&pinctrl_uart0>;

				status = "okay";

				status = "disabled";

			};



			uart1: serial@f8044000 {

				status = "disabled";

			};



			adc0: adc@f804c000 {
@@ -138,6 +143,10 @@ 
					};

				};

			};



			rtc@fffffeb0 {

				status = "okay";

			};

		};



		usb0: ohci@00600000 {
@@ -156,7 +165,7 @@ 
		/* little green LED in middle of Aria G25 module */

		aria_led {

			label = "aria_led";

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

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

			linux,default-trigger = "heartbeat";

		};
@@ -164,7 +173,7 @@ 


	onewire@0 {

		compatible = "w1-gpio";

		gpios = <&pioA 21 1>;

		gpios = <&pioA 21 GPIO_ACTIVE_LOW>;

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_w1_0>;

	};

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

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

 * at91-foxg20.dts - Device Tree file for Acme Systems FoxG20 board

 *

 * Based on DT files for at91sam9g20ek evaluation board (AT91SAM9G20 SoC)

 *

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

 *

 * Licensed under GPLv2 or later.

 */

/dts-v1/;

#include "at91sam9g20.dtsi"



/ {

	model = "Acme Systems FoxG20";

	compatible = "acme,foxg20", "atmel,at91sam9g20", "atmel,at91sam9";



	chosen {

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

	};



	memory {

		reg = <0x20000000 0x4000000>;

	};



	clocks {

		#address-cells = <1>;

		#size-cells = <1>;

		ranges;



		main_clock: clock@0 {

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

			clock-frequency = <18432000>;

		};

	};



	ahb {

		apb {

			usb1: gadget@fffa4000 {

				atmel,vbus-gpio = <&pioC 6 GPIO_ACTIVE_HIGH>;

				status = "okay";

			};



			mmc0: mmc@fffa8000 {

				pinctrl-0 = <

					&pinctrl_mmc0_clk

					&pinctrl_mmc0_slot1_cmd_dat0

					&pinctrl_mmc0_slot1_dat1_3>;

				status = "okay";



				slot@1 {

					reg = <1>;

					bus-width = <4>;

				};

			};



			usart0: serial@fffb0000 {

				pinctrl-0 =

					<&pinctrl_usart0

					 &pinctrl_usart0_rts

					 &pinctrl_usart0_cts

					>;

				status = "okay";

			};



			usart1: serial@fffb4000 {

				status = "okay";

			};



			usart2: serial@fffb8000 {

				status = "okay";

			};



			macb0: ethernet@fffc4000 {

				phy-mode = "rmii";

				status = "okay";

			};



			usart3: serial@fffd0000 {

				status = "okay";

			};



			uart0: serial@fffd4000 {

				status = "okay";

			};



			uart1: serial@fffd8000 {

				status = "okay";

			};



			dbgu: serial@fffff200 {

				status = "okay";

			};



			pinctrl@fffff400 {

				board {

					pinctrl_pck0_as_mck: pck0_as_mck {

						atmel,pins =

							<AT91_PIOC 1 AT91_PERIPH_B AT91_PINCTRL_NONE>;

					};

				};



				mmc0_slot1 {

					pinctrl_board_mmc0_slot1: mmc0_slot1-board {

						atmel,pins =

							<AT91_PIOC 9 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH>;	/* CD pin */

					};

				};



				i2c0 {

					pinctrl_i2c0: i2c0-0 {

						atmel,pins =

							<AT91_PIOA 23 AT91_PERIPH_A AT91_PINCTRL_MULTI_DRIVE	/* TWD (SDA), open drain */

							 AT91_PIOA 24 AT91_PERIPH_A AT91_PINCTRL_MULTI_DRIVE>;	/* TWCK (SCL), open drain */

					};

				};

			};



			watchdog@fffffd40 {

				status = "okay";

			};

		};



		usb0: ohci@00500000 {

			num-ports = <2>;

			status = "okay";

		};

	};



	i2c@0 {

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_i2c0>;

		i2c-gpio,delay-us = <5>;	/* ~85 kHz */

		status = "okay";

	};



	leds {

		compatible = "gpio-leds";



		/* red LED marked "PC7" near mini USB (device) receptacle */

		user_led {

			label = "user_led";

			gpios = <&pioC 7 GPIO_ACTIVE_HIGH>;	/* PC7 */

			linux,default-trigger = "heartbeat";

		};

	};



	gpio_keys {

		compatible = "gpio-keys";



		btn {

			label = "Button";

			gpios = <&pioC 4 GPIO_ACTIVE_LOW>;

			linux,code = <0x103>;

			gpio-key,wakeup;

		};

	};

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE