Commit 6d50424a authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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



Pull "Second SoC batch for 3.18" from Nicolas Ferre:

- introduction of the new SAMA5D4 SoC and associated Evaluation Kit
- low level soc detection and early printk code
- taking advantage of this, documentation of all AT91 SoC DT strings

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

* tag 'at91-soc2' of git://github.com/at91linux/linux-at91:
  ARM: at91: document Atmel SMART compatibles
  ARM: at91: add sama5d4 support to sama5_defconfig
  ARM: at91: dt: add device tree file for SAMA5D4ek board
  ARM: at91: dt: add device tree file for SAMA5D4 SoC
  ARM: at91: SAMA5D4 SoC detection code and low level routines
  ARM: at91: introduce basic SAMA5D4 support
  clk: at91: add a driver for the h32mx clock
parents 0c18acc1 02037a97

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

+37 −0
Original line number Diff line number Diff line 
Atmel AT91 device tree bindings.

================================



Boards with a SoC of the Atmel AT91 or SMART family shall have the following

properties:



Required root node properties:

compatible: must be one of:

 * "atmel,at91rm9200"



 * "atmel,at91sam9" for SoCs using an ARM926EJ-S core, shall be extended with

   the specific SoC family or compatible:

    o "atmel,at91sam9260"

    o "atmel,at91sam9261"

    o "atmel,at91sam9263"

    o "atmel,at91sam9x5" for the 5 series, shall be extended with the specific

      SoC compatible:

       - "atmel,at91sam9g15"

       - "atmel,at91sam9g25"

       - "atmel,at91sam9g35"

       - "atmel,at91sam9x25"

       - "atmel,at91sam9x35"

    o "atmel,at91sam9g20"

    o "atmel,at91sam9g45"

    o "atmel,at91sam9n12"

    o "atmel,at91sam9rl"

 * "atmel,sama5" for SoCs using a Cortex-A5, shall be extended with the specific

   SoC family:

    o "atmel,sama5d3" shall be extended with the specific SoC compatible:

       - "atmel,sama5d31"

       - "atmel,sama5d33"

       - "atmel,sama5d34"

       - "atmel,sama5d35"

       - "atmel,sama5d36"

    o "atmel,sama5d4" shall be extended with the specific SoC compatible:

       - "atmel,sama5d41"

       - "atmel,sama5d42"

       - "atmel,sama5d43"

       - "atmel,sama5d44"



PIT Timer required properties:

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

- reg: Should contain registers location and length

Documentation/devicetree/bindings/clock/at91-clock.txt

+14 −0
Original line number Diff line number Diff line
@@ -74,6 +74,9 @@ Required properties: 
	"atmel,at91sam9x5-clk-utmi":

		at91 utmi clock



	"atmel,sama5d4-clk-h32mx":

		at91 h32mx clock



Required properties for SCKC node:

- reg : defines the IO memory reserved for the SCKC.

- #size-cells : shall be 0 (reg is used to encode clk id).
@@ -447,3 +450,14 @@ For example: 
		#clock-cells = <0>;

		clocks = <&main>;

	};



Required properties for 32 bits bus Matrix clock (h32mx clock):

- #clock-cells : from common clock binding; shall be set to 0.

- clocks : shall be the master clock source phandle.



For example:

	h32ck: h32mxck {

		#clock-cells = <0>;

		compatible = "atmel,sama5d4-clk-h32mx";

		clocks = <&mck>;

	};

arch/arm/Kconfig.debug

+4 −0
Original line number Diff line number Diff line
@@ -101,6 +101,10 @@ choice 
		bool "Kernel low-level debugging on 9263 and 9g45"

		depends on HAVE_AT91_DBGU1



	config AT91_DEBUG_LL_DBGU2

		bool "Kernel low-level debugging on sama5d4"

		depends on HAVE_AT91_DBGU2



	config DEBUG_BCM2835

		bool "Kernel low-level debugging on BCM2835 PL011 UART"

		depends on ARCH_BCM2835

arch/arm/boot/dts/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -48,6 +48,8 @@ dtb-$(CONFIG_ARCH_AT91) += sama5d33ek.dtb 
dtb-$(CONFIG_ARCH_AT91)	+= sama5d34ek.dtb

dtb-$(CONFIG_ARCH_AT91)	+= sama5d35ek.dtb

dtb-$(CONFIG_ARCH_AT91)	+= sama5d36ek.dtb

# sama5d4

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



dtb-$(CONFIG_ARCH_ATLAS6) += atlas6-evb.dtb

dtb-$(CONFIG_ARCH_AXXIA) += axm5516-amarillo.dtb

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

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

 * at91-sama5d4ek.dts - Device Tree file for SAMA5D4 Evaluation Kit

 *

 *  Copyright (C) 2014 Atmel,

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

 *

 * This file is dual-licensed: you can use it either under the terms

 * of the GPL or the X11 license, at your option. Note that this dual

 * licensing only applies to this file, and not this project as a

 * whole.

 *

 *  a) This library is free software; you can redistribute it and/or

 *     modify it under the terms of the GNU General Public License as

 *     published by the Free Software Foundation; either version 2 of the

 *     License, or (at your option) any later version.

 *

 *     This library is distributed in the hope that it will be useful,

 *     but WITHOUT ANY WARRANTY; without even the implied warranty of

 *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 *     GNU General Public License for more details.

 *

 * Or, alternatively,

 *

 *  b) Permission is hereby granted, free of charge, to any person

 *     obtaining a copy of this software and associated documentation

 *     files (the "Software"), to deal in the Software without

 *     restriction, including without limitation the rights to use,

 *     copy, modify, merge, publish, distribute, sublicense, and/or

 *     sell copies of the Software, and to permit persons to whom the

 *     Software is furnished to do so, subject to the following

 *     conditions:

 *

 *     The above copyright notice and this permission notice shall be

 *     included in all copies or substantial portions of the Software.

 *

 *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

 *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES

 *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

 *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT

 *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,

 *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

 *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

 *     OTHER DEALINGS IN THE SOFTWARE.

 */

/dts-v1/;

#include "sama5d4.dtsi"



/ {

	model = "Atmel SAMA5D4-EK";

	compatible = "atmel,sama5d4ek", "atmel,sama5d4", "atmel,sama5";



	chosen {

		bootargs = "console=ttyS0,115200 ignore_loglevel earlyprintk";

	};



	memory {

		reg = <0x20000000 0x20000000>;

	};



	clocks {

		#address-cells = <1>;

		#size-cells = <1>;

		ranges;



		main_clock: clock@0 {

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

			clock-frequency = <12000000>;

		};



		slow_xtal {

			clock-frequency = <32768>;

		};



		main_xtal {

			clock-frequency = <12000000>;

		};

	};



	ahb {

		apb {

			lcd_bus@f0000000 {

				status = "okay";



				lcd@f0000000 {

					status = "okay";

				};



				lcdovl1@f0000140 {

					status = "okay";

				};



				lcdovl2@f0000240 {

					status = "okay";

				};



				lcdheo1@f0000340 {

					status = "okay";

				};

			};



			adc0: adc@fc034000 {

				/* The vref depends on JP22 of EK. If connect 1-2 then use 3.3V. connect 2-3 use 3.0V */

				atmel,adc-vref = <3300>;

				/*atmel,adc-ts-wires = <4>;*/	/* Set up ADC touch screen */

				status = "okay";		/* Enable ADC IIO support */

			};



			mmc0: mmc@f8000000 {

				pinctrl-names = "default";

				pinctrl-0 = <&pinctrl_mmc0_clk_cmd_dat0 &pinctrl_mmc0_dat1_3 &pinctrl_mmc0_cd>;

				slot@1 {

					reg = <1>;

					bus-width = <4>;

					cd-gpios = <&pioE 5 0>;

				};

			};



			spi0: spi@f8010000 {

				cs-gpios = <&pioC 3 0>, <0>, <0>, <0>;

				status = "okay";

				m25p80@0 {

					compatible = "atmel,at25df321a";

					spi-max-frequency = <50000000>;

					reg = <0>;

				};

			};



			i2c0: i2c@f8014000 {

				status = "okay";

			};



			macb0: ethernet@f8020000 {

				phy-mode = "rmii";

				status = "okay";

			};



			mmc1: mmc@fc000000 {

				pinctrl-names = "default";

				pinctrl-0 = <&pinctrl_mmc1_clk_cmd_dat0 &pinctrl_mmc1_dat1_3 &pinctrl_mmc1_cd>;

				status = "okay";

				slot@0 {

					reg = <0>;

					bus-width = <4>;

					cd-gpios = <&pioE 6 0>;

				};

			};



			usart2: serial@fc008000 {

				status = "okay";

			};



			usart3: serial@fc00c000 {

				status = "okay";

			};



			usart4: serial@fc010000 {

				status = "okay";

			};



			watchdog@fc068640 {

				status = "okay";

			};



			pinctrl@fc06a000 {

				board {

					pinctrl_mmc0_cd: mmc0_cd {

						atmel,pins =

							<AT91_PIOE 5 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH>;

					};

					pinctrl_mmc1_cd: mmc1_cd {

						atmel,pins =

							<AT91_PIOE 6 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH>;

					};

					pinctrl_usba_vbus: usba_vbus {

						atmel,pins =

							<AT91_PIOE 31 AT91_PERIPH_GPIO AT91_PINCTRL_DEGLITCH>;

					};

					pinctrl_key_gpio: key_gpio_0 {

						atmel,pins =

							<AT91_PIOE 13 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH>; /* PE13 gpio */

					};

				};

			};

		};



		usb0: gadget@00400000 {

			atmel,vbus-gpio = <&pioE 31 GPIO_ACTIVE_HIGH>;

			pinctrl-names = "default";

			pinctrl-0 = <&pinctrl_usba_vbus>;

			status = "okay";

		};



		usb1: ohci@00500000 {

			num-ports = <3>;

			atmel,vbus-gpio = <0 /* &pioE 10 GPIO_ACTIVE_LOW */

					   &pioE 11 GPIO_ACTIVE_LOW

					   &pioE 12 GPIO_ACTIVE_LOW

					  >;

			status = "okay";

		};



		usb2: ehci@00600000 {

			status = "okay";

		};



		nand0: nand@80000000 {

			nand-bus-width = <8>;

			nand-ecc-mode = "hw";

			nand-on-flash-bbt;

			atmel,has-pmecc;

			status = "okay";



			at91bootstrap@0 {

				label = "at91bootstrap";

				reg = <0x0 0x40000>;

			};



			bootloader@40000 {

				label = "bootloader";

				reg = <0x40000 0x80000>;

			};



			bootloaderenv@c0000 {

				label = "bootloader env";

				reg = <0xc0000 0xc0000>;

			};



			dtb@180000 {

				label = "device tree";

				reg = <0x180000 0x80000>;

			};



			kernel@200000 {

				label = "kernel";

				reg = <0x200000 0x600000>;

			};



			rootfs@800000 {

				label = "rootfs";

				reg = <0x800000 0x0f800000>;

			};

		};

	};



	gpio_keys {

		compatible = "gpio-keys";

		#address-cells = <1>;

		#size-cells = <0>;



		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_key_gpio>;



		pb_user1 {

			label = "pb_user1";

			gpios = <&pioE 13 GPIO_ACTIVE_HIGH>;

			linux,code = <0x100>;

			gpio-key,wakeup;

		};

	};

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE