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

Commit 059eab45 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'mxs/dt-for-3.6' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/dt 

From Shawn Guo <shawn.guo@linaro.org>:
* 'mxs/dt-for-3.6' of git://git.linaro.org/people/shawnguo/linux-2.6

: (26 commits)
  ARM: dts: imx28-evk: add flexan devices
  ARM: mx23: Add initial support for olinuxino board
  ARM: dts: mx23: add gpmi nand support
  ARM: dts: mxs: add lcd support for imx23-evk and imx28-evk
  ARM: dts: mxs: add pwm-backlight for imx23-evk and imx28-evk
  ARM: dts: mxs: enable rtc for imx23 and imx28
  ARM: dts: imx28-evk: add heartbeat gpio-leds
  ARM: dts: imx28-evk: add missing properties for fec
  ARM: dts: imx28-evk: add vmmc-supply for mmc device
  ARM: dts: imx23-evk: add auart device
  ARM: dts: imx23-evk: updates for mmc device
  ARM: dts: mxs: add hog-gpios for imx23-evk and imx28-evk
  ARM: dts: mxs: add comments for pinmux-ids
  ARM: mxs: use auxdata to attach mxsfb_platform_data
  video: mxsfb: add simple device tree probe
  video: mxsfb: move mxsfb.h into include/linux
  rtc: stmp3xxx: Add simple binding for the stmp3xxx-rtc
  ARM: mxs: enable flexcan on imx28
  ARM: dts: cfa10036: Add Power LED to the CFA-10036 board
  ARM: mxs: Add Crystalfontz CFA-10036 DTS
  ...

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 94a2597c 6ca44acf

Documentation/devicetree/bindings/arm/olimex.txt

0 → 100644
+6 −0
Original line number Diff line number Diff line 
Olimex i.MX Platforms Device Tree Bindings

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



i.MX23 Olinuxino Low Cost Board

Required root node properties:

    - compatible = "olimex,imx23-olinuxino", "fsl,imx23";

Documentation/devicetree/bindings/fb/mxsfb.txt

0 → 100644
+19 −0
Original line number Diff line number Diff line 
* Freescale MXS LCD Interface (LCDIF)



Required properties:

- compatible: Should be "fsl,<chip>-lcdif".  Supported chips include

  imx23 and imx28.

- reg: Address and length of the register set for lcdif

- interrupts: Should contain lcdif interrupts



Optional properties:

- panel-enable-gpios : Should specify the gpio for panel enable



Examples:



lcdif@80030000 {

	compatible = "fsl,imx28-lcdif";

	reg = <0x80030000 2000>;

	interrupts = <38 86>;

	panel-enable-gpios = <&gpio3 30 0>;

};

Documentation/devicetree/bindings/rtc/stmp3xxx-rtc.txt

0 → 100644
+16 −0
Original line number Diff line number Diff line 
* STMP3xxx/i.MX28 Time Clock controller



Required properties:

- compatible: should be one of the following.

    * "fsl,stmp3xxx-rtc"

- reg: physical base address of the controller and length of memory mapped

  region.

- interrupts: rtc alarm interrupt



Example:



rtc@80056000 {

	compatible = "fsl,imx28-rtc", "fsl,stmp3xxx-rtc";

	reg = <0x80056000 2000>;

	interrupts = <29>;

};

Documentation/devicetree/bindings/tty/serial/fsl-mxs-auart.txt

0 → 100644
+27 −0
Original line number Diff line number Diff line 
* Freescale MXS Application UART (AUART)



Required properties:

- compatible : Should be "fsl,<soc>-auart". The supported SoCs include

  imx23 and imx28.

- reg : Address and length of the register set for the device

- interrupts : Should contain the auart interrupt numbers



Example:

auart0: serial@8006a000 {

	compatible = "fsl,imx28-auart", "fsl,imx23-auart";

	reg = <0x8006a000 0x2000>;

	interrupts = <112 70 71>;

};



Note: Each auart port should have an alias correctly numbered in "aliases"

node.



Example:



aliases {

	serial0 = &auart0;

	serial1 = &auart1;

	serial2 = &auart2;

	serial3 = &auart3;

	serial4 = &auart4;

};

arch/arm/boot/dts/cfa10036.dts

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

 * Copyright 2012 Free Electrons

 *

 * 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/ "imx28.dtsi"



/ {

	model = "Crystalfontz CFA-10036 Board";

	compatible = "crystalfontz,cfa10036", "fsl,imx28";



	memory {

		reg = <0x40000000 0x08000000>;

	};



	apb@80000000 {

		apbh@80000000 {

			ssp0: ssp@80010000 {

				compatible = "fsl,imx28-mmc";

				pinctrl-names = "default";

				pinctrl-0 = <&mmc0_4bit_pins_a

					&mmc0_cd_cfg &mmc0_sck_cfg>;

				bus-width = <4>;

				status = "okay";

			};

		};



		apbx@80040000 {

			duart: serial@80074000 {

				pinctrl-names = "default";

				pinctrl-0 = <&duart_pins_b>;

				status = "okay";

			};

		};

	};



	leds {

		compatible = "gpio-leds";



		power {

			gpios = <&gpio3 4 1>;

			default-state = "on";

		};

	};

};