Commit 374dc56b authored by Kevin Hilman's avatar Kevin Hilman
Browse files

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

From Nicolas Ferre:
First DT pull-request for 3.14
- many little corrections and documentation updates
- LCD FB Device Tree for at91sam9263 and at91sam9g45 boards
- crypto peripherals DT entries + DMA specification
- new Cosino board

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

: (21 commits)
  ARM: at91/at91rm9200ek.dts: rearrange nodes in address ascending order
  ARM: at91: dt: at91rm9200ek: add emac and nor flash support
  ARM: at91: add uart aliases to sama5d3 dtsi
  ARM: at91: add i2c2 pinctrl speficifation to sama5d3 DT
  ARM: at91: Animeo IP: fix mtd partition table
  ARM: at91: at91sam9g45: add i2c pinctrl
  ARM: at91: at91sam9g45: set default mmc pinctrl-names
  ARM: at91: sama5d3: enable qt1070 as a wakeup source
  ARM: at91: add support for Cosino board series by HCE Engineering
  ARM: at91/dt/sama5d3: add DMA information to SHA/AES/TDES nodes
  ARM: at91/dt/trivial: before sama5d3, Atmel MPU were using at91 prefix
  ARM: at91/dt/trivial: use macro for AES irq type
  ARM: at91: sam9263ek: add dt lcd support
  ARM: at91: at9sam9m10g45ek: add dt lcd support
  ARM: at91: sam9263: add fb dt support
  ARM: at91: sam9g45: add fb dt support
  ARM: at91/dt: binding: add missing compatibility string in SDRAM/DDR documentation
  ARM: at91/dt: binding: add precision to AIC documentation
  ARM: at91/dt: add atmel,pullup-gpio to at91rm9200ek usb1 definition
  ARM: at91/dt: add ethernet phy to at91rm9200ek board
  ...

Signed-off-by: default avatarKevin Hilman <khilman@linaro.org>
parents b32313c6 ca594844

Documentation/devicetree/bindings/arm/atmel-aic.txt

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 


Required properties:

- compatible: Should be "atmel,<chip>-aic"

  <chip> can be "at91rm9200" or "sama5d3"

- interrupt-controller: Identifies the node as an interrupt controller.

- interrupt-parent: For single AIC system, it is an empty property.

- #interrupt-cells: The number of cells to define the interrupts. It should be 3.

Documentation/devicetree/bindings/arm/atmel-at91.txt

+2 −1
Original line number Diff line number Diff line
@@ -50,7 +50,8 @@ Example: 
	};



RAMC SDRAM/DDR Controller required properties:

- compatible: Should be "atmel,at91sam9260-sdramc",

- compatible: Should be "atmel,at91rm9200-sdramc",

			"atmel,at91sam9260-sdramc",

			"atmel,at91sam9g45-ddramc",

- reg: Should contain registers location and length

  For at91sam9263 and at91sam9g45 you must specify 2 entries.

arch/arm/boot/dts/Makefile

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

# sam9x5

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

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

dtb-$(CONFIG_ARCH_AT91) += at91sam9g15ek.dtb

dtb-$(CONFIG_ARCH_AT91) += at91sam9g25ek.dtb

dtb-$(CONFIG_ARCH_AT91) += at91sam9g35ek.dtb

arch/arm/boot/dts/animeo_ip.dts

+8 −23
Original line number Diff line number Diff line
@@ -90,34 +90,19 @@ 
			nand-on-flash-bbt;

			status = "okay";



			at91bootstrap@0 {

				label = "at91bootstrap";

				reg = <0x0 0x8000>;

			};



			barebox@8000 {

			barebox@0 {

				label = "barebox";

				reg = <0x8000 0x40000>;

			};



			bareboxenv@48000 {

				label = "bareboxenv";

				reg = <0x48000 0x8000>;

			};



			user_block@0x50000 {

				label = "user_block";

				reg = <0x50000 0xb0000>;

				reg = <0x0 0x58000>;

			};



			kernel@100000 {

				label = "kernel";

				reg = <0x100000 0x1b0000>;

			u_boot_env@58000 {

				label = "u_boot_env";

				reg = <0x58000 0x8000>;

			};



			root@2b0000 {

				label = "root";

				reg = <0x2b0000 0x1D50000>;

			ubi@60000 {

				label = "ubi";

				reg = <0x60000 0x1FA0000>;

			};

		};

arch/arm/boot/dts/at91-cosino.dtsi

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

 * at91-cosino.dtsi - Device Tree file for Cosino core module

 *

 * Copyright (C) 2013 - Rodolfo Giometti <giometti@linux.it>

 *			HCE Engineering

 *

 * Derived from at91sam9x5ek.dtsi by:

 *	Copyright (C) 2012 Atmel,

 *	2012 Nicolas Ferre <nicolas.ferre@atmel.com>

 *

 * Licensed under GPLv2 or later.

 */



#include "at91sam9g35.dtsi"



/ {

	model = "HCE Cosino core module";

	compatible = "hce,cosino", "atmel,at91sam9x5", "atmel,at91sam9";



	chosen {

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

	};



	memory {

		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 {

				pinctrl-0 = <

					&pinctrl_board_mmc0

					&pinctrl_mmc0_slot0_clk_cmd_dat0

					&pinctrl_mmc0_slot0_dat1_3>;

				status = "okay";

				slot@0 {

					reg = <0>;

					bus-width = <4>;

					cd-gpios = <&pioD 15 GPIO_ACTIVE_HIGH>;

				};

			};



			dbgu: serial@fffff200 {

				status = "okay";

			};



			usart0: serial@f801c000 {

				status = "okay";

			};



			i2c0: i2c@f8010000 {

				status = "okay";

			};



			adc0: adc@f804c000 {

				atmel,adc-clock-rate = <1000000>;

				atmel,adc-ts-wires = <4>;

				atmel,adc-ts-pressure-threshold = <10000>;

				status = "okay";

			};



			pinctrl@fffff400 {

				mmc0 {

					pinctrl_board_mmc0: mmc0-board {

						atmel,pins =

							<AT91_PIOD 15 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH>;	/* PD15 gpio CD pin pull up and deglitch */

					};

				};

			};



			watchdog@fffffe40 {

				status = "okay";

			};

		};



		nand0: nand@40000000 {

			nand-bus-width = <8>;

			nand-ecc-mode = "hw";

			atmel,has-pmecc;	/* Enable PMECC */

			atmel,pmecc-cap = <4>;

			atmel,pmecc-sector-size = <512>;

			nand-on-flash-bbt;

			status = "okay";



			at91bootstrap@0 {

				label = "at91bootstrap";

				reg = <0x0 0x40000>;

			};



			uboot@40000 {

				label = "u-boot";

				reg = <0x40000 0x80000>;

			};



			ubootenv@c0000 {

				label = "U-Boot Env";

				reg = <0xc0000 0x140000>;

			};



			kernel@200000 {

				label = "kernel";

				reg = <0x200000 0x600000>;

			};



			rootfs@800000 {

				label = "rootfs";

				reg = <0x800000 0x0f800000>;

			};

		};

	};

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE