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

Commit 9f639269 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc 

Pull support for new arm SoCs from Olof Johansson:
 "Three new system-on-chip models are supported: the st-ericsson u9540
  in ux500, the sam9n12 in at91 and the emma ev2 in shmobile.

  Emma is a little bit special because it is completely unrelated to the
  classic shmobile models, but the new Renesas rmobile SoCs are a
  combination of things from both Emma and shmobile, so it was decided
  to have them all live in one directory.

  This also contains updates to existing shmobile soc code as well as
  some related board changes due to dependencies."

* tag 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (23 commits)
  mach-shmobile: Use DT_MACHINE for KZM9D V3
  mach-shmobile: Emma Mobile EV2 DT support V3
  mach-shmobile: KZM9D board Ethernet support V3
  mach-shmobile: Emma Mobile EV2 GPIO support V3
  mach-shmobile: Emma Mobile EV2 SMP support V3
  mach-shmobile: KZM9D board support V3
  mach-shmobile: Emma Mobile EV2 SoC base support V3
  gpio: Emma Mobile GPIO driver V2
  ARM: mach-shmobile: sh73a0: fixup PINT/IRQ16-IRQ31 irq number conflict
  ARM: mach-shmobile: clock-r8a7740: use followparent_recalc on usb24s
  ARM: mach-shmobile: clock-r8a7740: add MMCIF clock
  ARM: mach-shmobile: clock-r8a7740: add SDHI clock
  ARM: mach-shmobile: clock-r8a7740: add USB clock
  ARM: mach-shmobile: clock-r8a7740: add FSI clock
  ARM: mach-shmobile: r8a7740: cleanup I2C workaround method
  ARM: mach-shmobile: r8a7740: add gpio_irq support
  ARM: mach-shmobile: sh7372: Add FSI DMAEngine support
  ARM / mach-shmobile: Use preset_lpj with calibrate_delay()
  ARM: ux500: ioremap differences for DB9540
  ARM: ux500: core U9540 support
  ...
parents b324c67d 0804dcb2

arch/arm/boot/dts/at91sam9n12.dtsi

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

 * at91sam9n12.dtsi - Device Tree include file for AT91SAM9N12 SoC

 *

 *  Copyright (C) 2012 Atmel,

 *                2012 Hong Xu <hong.xu@atmel.com>

 *

 * Licensed under GPLv2 or later.

 */



/include/ "skeleton.dtsi"



/ {

	model = "Atmel AT91SAM9N12 SoC";

	compatible = "atmel,at91sam9n12";

	interrupt-parent = <&aic>;



	aliases {

		serial0 = &dbgu;

		serial1 = &usart0;

		serial2 = &usart1;

		serial3 = &usart2;

		serial4 = &usart3;

		gpio0 = &pioA;

		gpio1 = &pioB;

		gpio2 = &pioC;

		gpio3 = &pioD;

		tcb0 = &tcb0;

		tcb1 = &tcb1;

	};

	cpus {

		cpu@0 {

			compatible = "arm,arm926ejs";

		};

	};



	memory {

		reg = <0x20000000 0x10000000>;

	};



	ahb {

		compatible = "simple-bus";

		#address-cells = <1>;

		#size-cells = <1>;

		ranges;



		apb {

			compatible = "simple-bus";

			#address-cells = <1>;

			#size-cells = <1>;

			ranges;



			aic: interrupt-controller@fffff000 {

				#interrupt-cells = <2>;

				compatible = "atmel,at91rm9200-aic";

				interrupt-controller;

				reg = <0xfffff000 0x200>;

			};



			ramc0: ramc@ffffe800 {

				compatible = "atmel,at91sam9g45-ddramc";

				reg = <0xffffe800 0x200>;

			};



			pmc: pmc@fffffc00 {

				compatible = "atmel,at91rm9200-pmc";

				reg = <0xfffffc00 0x100>;

			};



			rstc@fffffe00 {

				compatible = "atmel,at91sam9g45-rstc";

				reg = <0xfffffe00 0x10>;

			};



			pit: timer@fffffe30 {

				compatible = "atmel,at91sam9260-pit";

				reg = <0xfffffe30 0xf>;

				interrupts = <1 4>;

			};



			shdwc@fffffe10 {

				compatible = "atmel,at91sam9x5-shdwc";

				reg = <0xfffffe10 0x10>;

			};



			tcb0: timer@f8008000 {

				compatible = "atmel,at91sam9x5-tcb";

				reg = <0xf8008000 0x100>;

				interrupts = <17 4>;

			};



			tcb1: timer@f800c000 {

				compatible = "atmel,at91sam9x5-tcb";

				reg = <0xf800c000 0x100>;

				interrupts = <17 4>;

			};



			dma: dma-controller@ffffec00 {

				compatible = "atmel,at91sam9g45-dma";

				reg = <0xffffec00 0x200>;

				interrupts = <20 4>;

			};



			pioA: gpio@fffff400 {

				compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio";

				reg = <0xfffff400 0x100>;

				interrupts = <2 4>;

				#gpio-cells = <2>;

				gpio-controller;

				interrupt-controller;

			};



			pioB: gpio@fffff600 {

				compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio";

				reg = <0xfffff600 0x100>;

				interrupts = <2 4>;

				#gpio-cells = <2>;

				gpio-controller;

				interrupt-controller;

			};



			pioC: gpio@fffff800 {

				compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio";

				reg = <0xfffff800 0x100>;

				interrupts = <3 4>;

				#gpio-cells = <2>;

				gpio-controller;

				interrupt-controller;

			};



			pioD: gpio@fffffa00 {

				compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio";

				reg = <0xfffffa00 0x100>;

				interrupts = <3 4>;

				#gpio-cells = <2>;

				gpio-controller;

				interrupt-controller;

			};



			dbgu: serial@fffff200 {

				compatible = "atmel,at91sam9260-usart";

				reg = <0xfffff200 0x200>;

				interrupts = <1 4>;

				status = "disabled";

			};



			usart0: serial@f801c000 {

				compatible = "atmel,at91sam9260-usart";

				reg = <0xf801c000 0x4000>;

				interrupts = <5 4>;

				atmel,use-dma-rx;

				atmel,use-dma-tx;

				status = "disabled";

			};



			usart1: serial@f8020000 {

				compatible = "atmel,at91sam9260-usart";

				reg = <0xf8020000 0x4000>;

				interrupts = <6 4>;

				atmel,use-dma-rx;

				atmel,use-dma-tx;

				status = "disabled";

			};



			usart2: serial@f8024000 {

				compatible = "atmel,at91sam9260-usart";

				reg = <0xf8024000 0x4000>;

				interrupts = <7 4>;

				atmel,use-dma-rx;

				atmel,use-dma-tx;

				status = "disabled";

			};



			usart3: serial@f8028000 {

				compatible = "atmel,at91sam9260-usart";

				reg = <0xf8028000 0x4000>;

				interrupts = <8 4>;

				atmel,use-dma-rx;

				atmel,use-dma-tx;

				status = "disabled";

			};

		};



		nand0: nand@40000000 {

			compatible = "atmel,at91rm9200-nand";

			#address-cells = <1>;

			#size-cells = <1>;

			reg = < 0x40000000 0x10000000

				0xffffe000 0x00000600

				0xffffe600 0x00000200

				0x00100000 0x00100000

			       >;

			atmel,nand-addr-offset = <21>;

			atmel,nand-cmd-offset = <22>;

			gpios = <&pioD 5 0

				 &pioD 4 0

				 0

				>;

			status = "disabled";

		};



		usb0: ohci@00500000 {

			compatible = "atmel,at91rm9200-ohci", "usb-ohci";

			reg = <0x00500000 0x00100000>;

			interrupts = <22 4>;

			status = "disabled";

		};

	};



	i2c@0 {

		compatible = "i2c-gpio";

		gpios = <&pioA 30 0 /* sda */

			 &pioA 31 0 /* scl */

			>;

		i2c-gpio,sda-open-drain;

		i2c-gpio,scl-open-drain;

		i2c-gpio,delay-us = <2>;	/* ~100 kHz */

		#address-cells = <1>;

		#size-cells = <0>;

		status = "disabled";

	};

};

arch/arm/boot/dts/at91sam9n12ek.dts

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

 * at91sam9n12ek.dts - Device Tree file for AT91SAM9N12-EK board

 *

 *  Copyright (C) 2012 Atmel,

 *                2012 Hong Xu <hong.xu@atmel.com>

 *

 * Licensed under GPLv2 or later.

 */

/dts-v1/;

/include/ "at91sam9n12.dtsi"



/ {

	model = "Atmel AT91SAM9N12-EK";

	compatible = "atmel,at91sam9n12ek", "atmel,at91sam9n12", "atmel,at91sam9";



	chosen {

		bootargs = "mem=128M console=ttyS0,115200 root=/dev/mtdblock1 rw rootfstype=jffs2";

	};



	memory {

		reg = <0x20000000 0x10000000>;

	};



	clocks {

		#address-cells = <1>;

		#size-cells = <1>;

		ranges;



		main_clock: clock@0 {

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

			clock-frequency = <16000000>;

		};

	};



	ahb {

		apb {

			dbgu: serial@fffff200 {

				status = "okay";

			};

		};



		nand0: nand@40000000 {

			nand-bus-width = <8>;

			nand-ecc-mode = "soft";

			nand-on-flash-bbt;

			status = "okay";

		};

	};



	leds {

		compatible = "gpio-leds";



		d8 {

			label = "d8";

			gpios = <&pioB 4 1>;

			linux,default-trigger = "mmc0";

		};



		d9 {

			label = "d6";

			gpios = <&pioB 5 1>;

			linux,default-trigger = "nand-disk";

		};



		d10 {

			label = "d7";

			gpios = <&pioB 6 0>;

			linux,default-trigger = "heartbeat";

		};

	};



	gpio_keys {

		compatible = "gpio-keys";

		#address-cells = <1>;

		#size-cells = <0>;



		enter {

			label = "Enter";

			gpios = <&pioB 4 1>;

			linux,code = <28>;

			gpio-key,wakeup;

		};

	};

};

arch/arm/boot/dts/emev2-kzm9d.dts

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

 * Device Tree Source for the KZM9D board

 *

 * Copyright (C) 2012 Renesas Solutions Corp.

 *

 * This file is licensed under the terms of the GNU General Public License

 * version 2.  This program is licensed "as is" without any warranty of any

 * kind, whether express or implied.

 */

/dts-v1/;



/include/ "emev2.dtsi"



/ {

	model = "EMEV2 KZM9D Board";

	compatible = "renesas,kzm9d", "renesas,emev2";



	memory {

		device_type = "memory";

		reg = <0x40000000 0x8000000>;

	};



	chosen {

		bootargs = "console=ttyS1,115200n81";

	};

};

arch/arm/boot/dts/emev2.dtsi

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

 * Device Tree Source for the EMEV2 SoC

 *

 * Copyright (C) 2012 Renesas Solutions Corp.

 *

 * This file is licensed under the terms of the GNU General Public License

 * version 2.  This program is licensed "as is" without any warranty of any

 * kind, whether express or implied.

 */



/include/ "skeleton.dtsi"



/ {

	compatible = "renesas,emev2";

	interrupt-parent = <&gic>;



	cpus {

		cpu@0 {

			compatible = "arm,cortex-a9";

		};

		cpu@1 {

			compatible = "arm,cortex-a9";

		};

	};



	gic: interrupt-controller@e0020000 {

		compatible = "arm,cortex-a9-gic";

		interrupt-controller;

		#interrupt-cells = <3>;

		reg = <0xe0028000 0x1000>,

		      <0xe0020000 0x0100>;

	};



	sti@e0180000 {

		compatible = "renesas,em-sti";

		reg = <0xe0180000 0x54>;

		interrupts = <0 125 0>;

	};



	uart@e1020000 {

		compatible = "renesas,em-uart";

		reg = <0xe1020000 0x38>;

		interrupts = <0 8 0>;

	};



	uart@e1030000 {

		compatible = "renesas,em-uart";

		reg = <0xe1030000 0x38>;

		interrupts = <0 9 0>;

	};



	uart@e1040000 {

		compatible = "renesas,em-uart";

		reg = <0xe1040000 0x38>;

		interrupts = <0 10 0>;

	};



	uart@e1050000 {

		compatible = "renesas,em-uart";

		reg = <0xe1050000 0x38>;

		interrupts = <0 11 0>;

	};

};

arch/arm/mach-at91/Kconfig

+8 −0
Original line number Diff line number Diff line
@@ -91,6 +91,14 @@ config SOC_AT91SAM9X5 
	  This support covers AT91SAM9G15, AT91SAM9G25, AT91SAM9X25, AT91SAM9G35

	  and AT91SAM9X35.



config SOC_AT91SAM9N12

	bool "AT91SAM9N12 family"

	select SOC_AT91SAM9

	select HAVE_AT91_DBGU0

	select HAVE_FB_ATMEL

	help

	  Select this if you are using Atmel's AT91SAM9N12 SoC.



choice

	prompt "Atmel AT91 Processor Devices for non DT boards"