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

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

Merge tag 'imx-dt' of git://git.pengutronix.de/git/imx/linux-2.6 into next/dt 

From Sascha Hauer <s.hauer@pengutronix.de>:
ARM i.MX dt updates for v3.6

* tag 'imx-dt' of git://git.pengutronix.de/git/imx/linux-2.6

:
  arm/dts: Add support for i.MX31 bug 1.x board from buglabs.
  ARM i.MX31: Add devicetree support
  ARM: dts: Add basic support for mx27_3ds board

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 6de7351c 0767211b

arch/arm/boot/dts/imx27-3ds.dts

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

 * Copyright 2012 Sascha Hauer, Pengutronix

 *

 * The code contained herein is licensed under the GNU General Public

 * License. You may obtain a copy of the GNU General Public License

 * Version 2 or later at the following locations:

 *

 * http://www.opensource.org/licenses/gpl-license.html

 * http://www.gnu.org/copyleft/gpl.html

 */



/dts-v1/;

/include/ "imx27.dtsi"



/ {

	model = "mx27_3ds";

	compatible = "freescale,imx27-3ds", "fsl,imx27";



	memory {

		reg = <0x0 0x0>;

	};



	soc {

		aipi@10000000 { /* aipi */



			wdog@10002000 {

				status = "okay";

			};



			uart@1000a000 {

				fsl,uart-has-rtscts;

				status = "okay";

			};



			fec@1002b000 {

				status = "okay";

			};

		};

	};



};

arch/arm/boot/dts/imx31-bug.dts

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

 * Copyright 2012 Denis 'GNUtoo' Carikli <GNUtoo@no-log.org>

 *

 * The code contained herein is licensed under the GNU General Public

 * License. You may obtain a copy of the GNU General Public License

 * Version 2 or later at the following locations:

 *

 * http://www.opensource.org/licenses/gpl-license.html

 * http://www.gnu.org/copyleft/gpl.html

 */



/dts-v1/;

/include/ "imx31.dtsi"



/ {

	model = "Buglabs i.MX31 Bug 1.x";

	compatible = "fsl,imx31-bug", "fsl,imx31";



	memory {

		reg = <0x80000000 0x8000000>; /* 128M */

	};



	soc {

		aips@43f00000 { /* AIPS1 */

			uart5: serial@43fb4000 {

				fsl,uart-has-rtscts;

				status = "okay";

			};

		};

	};

};

arch/arm/boot/dts/imx31.dtsi

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

 * Copyright 2012 Denis 'GNUtoo' Carikli <GNUtoo@no-log.org>

 *

 * The code contained herein is licensed under the GNU General Public

 * License. You may obtain a copy of the GNU General Public License

 * Version 2 or later at the following locations:

 *

 * http://www.opensource.org/licenses/gpl-license.html

 * http://www.gnu.org/copyleft/gpl.html

 */



/include/ "skeleton.dtsi"



/ {

	aliases {

		serial0 = &uart1;

		serial1 = &uart2;

		serial2 = &uart3;

		serial3 = &uart4;

		serial4 = &uart5;

	};



	avic: avic-interrupt-controller@60000000 {

		compatible = "fsl,imx31-avic", "fsl,avic";

		interrupt-controller;

		#interrupt-cells = <1>;

		reg = <0x60000000 0x100000>;

	};



	soc {

		#address-cells = <1>;

		#size-cells = <1>;

		compatible = "simple-bus";

		interrupt-parent = <&avic>;

		ranges;



		aips@43f00000 { /* AIPS1 */

			compatible = "fsl,aips-bus", "simple-bus";

			#address-cells = <1>;

			#size-cells = <1>;

			reg = <0x43f00000 0x100000>;

			ranges;



			uart1: serial@43f90000 {

				compatible = "fsl,imx31-uart", "fsl,imx21-uart";

				reg = <0x43f90000 0x4000>;

				interrupts = <45>;

				status = "disabled";

			};



			uart2: serial@43f94000 {

				compatible = "fsl,imx31-uart", "fsl,imx21-uart";

				reg = <0x43f94000 0x4000>;

				interrupts = <32>;

				status = "disabled";

			};



			uart4: serial@43fb0000 {

				compatible = "fsl,imx31-uart", "fsl,imx21-uart";

				reg = <0x43fb0000 0x4000>;

				interrupts = <46>;

				status = "disabled";

			};



			uart5: serial@43fb4000 {

				compatible = "fsl,imx31-uart", "fsl,imx21-uart";

				reg = <0x43fb4000 0x4000>;

				interrupts = <47>;

				status = "disabled";

			};

		};



		spba@50000000 {

			compatible = "fsl,spba-bus", "simple-bus";

			#address-cells = <1>;

			#size-cells = <1>;

			reg = <0x50000000 0x100000>;

			ranges;



			uart3: serial@5000c000 {

				compatible = "fsl,imx31-uart", "fsl,imx21-uart";

				reg = <0x5000c000 0x4000>;

				interrupts = <18>;

				status = "disabled";

			};

		};

	};

};

arch/arm/mach-imx/Kconfig

+8 −0
Original line number Diff line number Diff line
@@ -560,6 +560,14 @@ config MACH_BUG 
	  Include support for BUGBase 1.3 platform. This includes specific

	  configurations for the board and its peripherals.



config MACH_IMX31_DT

	bool "Support i.MX31 platforms from device tree"

	select SOC_IMX31

	select USE_OF

	help

	  Include support for Freescale i.MX31 based platforms

	  using the device tree for discovery.



comment "MX35 platforms:"



config MACH_PCM043

arch/arm/mach-imx/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ obj-$(CONFIG_MACH_QONG) += mach-qong.o 
obj-$(CONFIG_MACH_ARMADILLO5X0) += mach-armadillo5x0.o

obj-$(CONFIG_MACH_KZM_ARM11_01) += mach-kzm_arm11_01.o

obj-$(CONFIG_MACH_BUG) += mach-bug.o

obj-$(CONFIG_MACH_IMX31_DT) += imx31-dt.o



# i.MX35 based machines

obj-$(CONFIG_MACH_PCM043) += mach-pcm043.o