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

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

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

* 'features/imx27-dt' of git://git.pengutronix.de/git/imx/linux-2.6:
  devicetree-bindings: Add documentation for i.MX generic boards
  ARM i.MX: Add phytec phycore-i.MX27 (aka pcm038) devicetree support
  ARM i.MX27: Add devicetree support
parents 48b3b08e 6ad109fa

Documentation/devicetree/bindings/arm/fsl.txt

+22 −0
Original line number Diff line number Diff line
@@ -28,3 +28,25 @@ Required root node properties: 
i.MX6 Quad SABRE Lite Board

Required root node properties:

    - compatible = "fsl,imx6q-sabrelite", "fsl,imx6q";



Generic i.MX boards

-------------------



No iomux setup is done for these boards, so this must have been configured

by the bootloader for boards to work with the generic bindings.



i.MX27 generic board

Required root node properties:

    - compatible = "fsl,imx27";



i.MX51 generic board

Required root node properties:

    - compatible = "fsl,imx51";



i.MX53 generic board

Required root node properties:

    - compatible = "fsl,imx53";



i.MX6q generic board

Required root node properties:

    - compatible = "fsl,imx6q";

arch/arm/boot/dts/imx27-phytec-phycore.dts

0 → 100644
+76 −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 = "Phytec pcm038";

	compatible = "phytec,imx27-pcm038", "fsl,imx27";



	memory {

		reg = <0x0 0x0>;

	};



	soc {

		aipi@10000000 { /* aipi */



			wdog@10002000 {

				status = "okay";

			};



			uart@1000a000 {

				fsl,uart-has-rtscts;

				status = "okay";

			};



			uart@1000b000 {

				fsl,uart-has-rtscts;

				status = "okay";

			};



			uart@1000c000 {

				fsl,uart-has-rtscts;

				status = "okay";

			};



			fec@1002b000 {

				status = "okay";

			};



			i2c@1001d000 {

				clock-frequency = <400000>;

				status = "okay";

				at24@4c {

					compatible = "at,24c32";

					pagesize = <32>;

					reg = <0x52>;

				};

				pcf8563@51 {

					compatible = "nxp,pcf8563";

					reg = <0x51>;

				};

				lm75@4a {

					compatible = "national,lm75";

					reg = <0x4a>;

				};

			};

		};

	};



	nor_flash@c0000000 {

		compatible = "cfi-flash";

		bank-width = <2>;

		reg = <0xc0000000 0x02000000>;

		#address-cells = <1>;

		#size-cells = <1>;

	};

};

arch/arm/boot/dts/imx27.dtsi

0 → 100644
+217 −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

 */



/include/ "skeleton.dtsi"



/ {

	aliases {

		serial0 = &uart1;

		serial1 = &uart2;

		serial2 = &uart3;

		serial3 = &uart4;

		serial4 = &uart5;

		serial5 = &uart6;

	};



	avic: avic-interrupt-controller@e0000000 {

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

		interrupt-controller;

		#interrupt-cells = <1>;

		reg = <0x10040000 0x1000>;

	};



	clocks {

		#address-cells = <1>;

		#size-cells = <0>;



		osc26m {

			compatible = "fsl,imx-osc26m", "fixed-clock";

			clock-frequency = <26000000>;

		};

	};



	soc {

		#address-cells = <1>;

		#size-cells = <1>;

		compatible = "simple-bus";

		interrupt-parent = <&avic>;

		ranges;



		aipi@10000000 { /* AIPI1 */

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

			#address-cells = <1>;

			#size-cells = <1>;

			reg = <0x10000000 0x10000000>;

			ranges;



			wdog@10002000 {

				compatible = "fsl,imx27-wdt", "fsl,imx21-wdt";

				reg = <0x10002000 0x4000>;

				interrupts = <27>;

				status = "disabled";

			};



			uart1: uart@1000a000 {

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

				reg = <0x1000a000 0x1000>;

				interrupts = <20>;

				status = "disabled";

			};



			uart2: uart@1000b000 {

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

				reg = <0x1000b000 0x1000>;

				interrupts = <19>;

				status = "disabled";

			};



			uart3: uart@1000c000 {

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

				reg = <0x1000c000 0x1000>;

				interrupts = <18>;

				status = "disabled";

			};



			uart4: uart@1000d000 {

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

				reg = <0x1000d000 0x1000>;

				interrupts = <17>;

				status = "disabled";

			};



			cspi1: cspi@1000e000 {

				#address-cells = <1>;

				#size-cells = <0>;

				compatible = "fsl,imx27-cspi";

				reg = <0x1000e000 0x1000>;

				interrupts = <16>;

				status = "disabled";

			};



			cspi2: cspi@1000f000 {

				#address-cells = <1>;

				#size-cells = <0>;

				compatible = "fsl,imx27-cspi";

				reg = <0x1000f000 0x1000>;

				interrupts = <15>;

				status = "disabled";

			};



			i2c1: i2c@10012000 {

				#address-cells = <1>;

				#size-cells = <0>;

				compatible = "fsl,imx27-i2c", "fsl,imx1-i2c";

				reg = <0x10012000 0x1000>;

				interrupts = <12>;

				status = "disabled";

			};



			gpio1: gpio@10015000 {

				compatible = "fsl,imx27-gpio", "fsl,imx21-gpio";

				reg = <0x10015000 0x100>;

				interrupts = <8>;

				gpio-controller;

				#gpio-cells = <2>;

				interrupt-controller;

				#interrupt-cells = <1>;

			};



			gpio2: gpio@10015100 {

				compatible = "fsl,imx27-gpio", "fsl,imx21-gpio";

				reg = <0x10015100 0x100>;

				interrupts = <8>;

				gpio-controller;

				#gpio-cells = <2>;

				interrupt-controller;

				#interrupt-cells = <1>;

			};



			gpio3: gpio@10015200 {

				compatible = "fsl,imx27-gpio", "fsl,imx21-gpio";

				reg = <0x10015200 0x100>;

				interrupts = <8>;

				gpio-controller;

				#gpio-cells = <2>;

				interrupt-controller;

				#interrupt-cells = <1>;

			};



			gpio4: gpio@10015300 {

				compatible = "fsl,imx27-gpio", "fsl,imx21-gpio";

				reg = <0x10015300 0x100>;

				interrupts = <8>;

				gpio-controller;

				#gpio-cells = <2>;

				interrupt-controller;

				#interrupt-cells = <1>;

			};



			gpio5: gpio@10015400 {

				compatible = "fsl,imx27-gpio", "fsl,imx21-gpio";

				reg = <0x10015400 0x100>;

				interrupts = <8>;

				gpio-controller;

				#gpio-cells = <2>;

				interrupt-controller;

				#interrupt-cells = <1>;

			};



			gpio6: gpio@10015500 {

				compatible = "fsl,imx27-gpio", "fsl,imx21-gpio";

				reg = <0x10015500 0x100>;

				interrupts = <8>;

				gpio-controller;

				#gpio-cells = <2>;

				interrupt-controller;

				#interrupt-cells = <1>;

			};



			cspi3: cspi@10017000 {

				#address-cells = <1>;

				#size-cells = <0>;

				compatible = "fsl,imx27-cspi";

				reg = <0x10017000 0x1000>;

				interrupts = <6>;

				status = "disabled";

			};



			uart5: uart@1001b000 {

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

				reg = <0x1001b000 0x1000>;

				interrupts = <49>;

				status = "disabled";

			};



			uart6: uart@1001c000 {

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

				reg = <0x1001c000 0x1000>;

				interrupts = <48>;

				status = "disabled";

			};



			i2c2: i2c@1001d000 {

				#address-cells = <1>;

				#size-cells = <0>;

				compatible = "fsl,imx27-i2c", "fsl,imx1-i2c";

				reg = <0x1001d000 0x1000>;

				interrupts = <1>;

				status = "disabled";

			};



			fec: fec@1002b000 {

				compatible = "fsl,imx27-fec";

				reg = <0x1002b000 0x4000>;

				interrupts = <50>;

				status = "disabled";

			};

		};

	};

};

arch/arm/mach-imx/Kconfig

+8 −0
Original line number Diff line number Diff line
@@ -376,6 +376,14 @@ config MACH_IMX27IPCAM 
	  Include support for IMX27 IPCAM platform. This includes specific

	  configurations for the board and its peripherals.



config MACH_IMX27_DT

	bool "Support i.MX27 platforms from device tree"

	select SOC_IMX27

	select USE_OF

	help

	  Include support for Freescale i.MX27 based platforms

	  using the device tree for discovery



endif



if ARCH_IMX_V6_V7

arch/arm/mach-imx/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ obj-$(CONFIG_MACH_EUKREA_MBIMX27_BASEBOARD) += eukrea_mbimx27-baseboard.o 
obj-$(CONFIG_MACH_PCA100) += mach-pca100.o

obj-$(CONFIG_MACH_MXT_TD60) += mach-mxt_td60.o

obj-$(CONFIG_MACH_IMX27IPCAM) += mach-imx27ipcam.o

obj-$(CONFIG_MACH_IMX27_DT) += imx27-dt.o



# i.MX31 based machines

obj-$(CONFIG_MACH_MX31ADS) += mach-mx31ads.o