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

Commit eae10c68 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

Two new boards described with device tree

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

:
  ARM: at91: Add support for board aks-cdu
  ARM: at91: add support for Telit EVK-PRO3 with Telit GE863-PRO3

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 14d597b7 3c68bb48

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

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

 * aks-cdu.dts - Device Tree file for AK signal CDU

 *

 * Copyright (C) 2012 AK signal Brno a.s.

 *               2012 Jiri Prchal <jiri.prchal@aksignal.cz>

 *

 * Licensed under GPLv2 or later.

 */



/dts-v1/;



/include/ "ge863-pro3.dtsi"



/ {

	chosen {

		bootargs = "console=ttyS0,115200 ubi.mtd=4 root=ubi0:rootfs rootfstype=ubifs";

	};



	ahb {

		apb {

			usart0: serial@fffb0000 {

				status = "okay";

			};



			usart1: serial@fffb4000 {

				status = "okay";

				linux,rs485-enabled-at-boot-time;

				rs485-rts-delay = <0 0>;

				};



			usart2: serial@fffb8000 {

				status = "okay";

				linux,rs485-enabled-at-boot-time;

				rs485-rts-delay = <0 0>;

			};



			usart3: serial@fffd0000 {

				status = "okay";

				linux,rs485-enabled-at-boot-time;

				rs485-rts-delay = <0 0>;

			};



			macb0: ethernet@fffc4000 {

				phy-mode = "rmii";

				status = "okay";

			};



			usb1: gadget@fffa4000 {

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

				status = "okay";

			};

		};



		usb0: ohci@00500000 {

			num-ports = <2>;

			status = "okay";

		};



		nand0: nand@40000000 {

			nand-bus-width = <8>;

			nand-ecc-mode = "soft";

			nand-on-flash-bbt;

			status = "okay";



			bootstrap@0 {

				label = "bootstrap";

				reg = <0x0 0x40000>;

			};



			uboot@40000 {

				label = "uboot";

				reg = <0x40000 0x80000>;

			};

			ubootenv@c0000 {

				label = "ubootenv";

				reg = <0xc0000 0x40000>;

			};

			kernel@100000 {

				label = "kernel";

				reg = <0x100000 0x400000>;

			};

			rootfs@500000 {

				label = "rootfs";

				reg = <0x500000 0x7b00000>;

			};

		};

	};



	leds {

		compatible = "gpio-leds";



		red {

			gpios = <&pioC 10 0>;

			linux,default-trigger = "none";

		};



		green {

			gpios = <&pioA 5 1>;

			linux,default-trigger = "none";

			default-state = "on";

		};



		yellow {

			gpios = <&pioB 20 1>;

			linux,default-trigger = "none";

		};



		blue {

			gpios = <&pioB 21 1>;

			linux,default-trigger = "none";

		};

	};

};

arch/arm/boot/dts/evk-pro3.dts

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

 * evk-pro3.dts - Device Tree file for Telit EVK-PRO3 with Telit GE863-PRO3

 *

 * Copyright (C) 2012 Telit,

 *               2012 Fabio Porcedda <fabio.porcedda@gmail.com>

 *

 * Licensed under GPLv2 or later.

 */



/dts-v1/;



/include/ "ge863-pro3.dtsi"



/ {

	model = "Telit EVK-PRO3 for Telit GE863-PRO3";

	compatible = "telit,evk-pro3", "atmel,at91sam9260", "atmel,at91sam9";



	ahb {

		apb {

			macb0: ethernet@fffc4000 {

				phy-mode = "rmii";

				status = "okay";

			};



			usb1: gadget@fffa4000 {

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

				status = "okay";

			};

		};



		usb0: ohci@00500000 {

			num-ports = <2>;

			status = "okay";

		};

	};



	i2c@0 {

		status = "okay";

	};



};
 
 No newline at end of file

arch/arm/boot/dts/ge863-pro3.dtsi

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

 * ge863_pro3.dtsi - Device Tree file for Telit GE863-PRO3

 *

 * Copyright (C) 2012 Telit,

 *               2012 Fabio Porcedda <fabio.porcedda@gmail.com>

 *

 * Licensed under GPLv2 or later.

 */



/include/ "at91sam9260.dtsi"



/ {

	clocks {

		#address-cells = <1>;

		#size-cells = <1>;

		ranges;



		main_clock: clock@0 {

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

			clock-frequency = <6000000>;

		};

	};



	ahb {

		apb {

			dbgu: serial@fffff200 {

				status = "okay";

			};

		};



		nand0: nand@40000000 {

			nand-bus-width = <8>;

			nand-ecc-mode = "soft";

			nand-on-flash-bbt;

			status = "okay";



			boot@0 {

				label = "boot";

				reg = <0x0 0x7c0000>;

			};



			root@07c0000 {

				label = "root";

				reg = <0x7c0000 0x7840000>;

			};

		};

	};



	chosen {

		bootargs = "console=ttyS0,115200 root=ubi0:rootfs ubi.mtd=1 rootfstype=ubifs";

	};

};

arch/arm/mach-at91/Makefile.boot

+2 −0
Original line number Diff line number Diff line
@@ -15,7 +15,9 @@ endif 


# Keep dtb files sorted alphabetically for each SoC

# sam9260

dtb-$(CONFIG_MACH_AT91SAM_DT) += aks-cdu.dtb

dtb-$(CONFIG_MACH_AT91SAM_DT) += ethernut5.dtb

dtb-$(CONFIG_MACH_AT91SAM_DT) += evk-pro3.dtb

dtb-$(CONFIG_MACH_AT91SAM_DT) += tny_a9260.dtb

dtb-$(CONFIG_MACH_AT91SAM_DT) += usb_a9260.dtb

# sam9263