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

Commit 84a442b9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull arm-soc device tree conversions (part 2) from Olof Johansson:
 "These continue the device tree work from part 1, this set is for the
  tegra, mxs and imx platforms, all of which have dependencies on clock
  or pinctrl changes submitted earlier."

Fix up trivial conflicts due to nearby changes in
drivers/{gpio/gpio,i2c/busses/i2c}-mxs.c

* tag 'dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (73 commits)
  ARM: dt: tegra: invert status=disable vs status=okay
  ARM: dt: tegra: consistent basic property ordering
  ARM: dt: tegra: sort nodes based on bus order
  ARM: dt: tegra: remove duplicate device_type property
  ARM: dt: tegra: consistenly use lower-case for hex constants
  ARM: dt: tegra: format regs properties consistently
  ARM: dt: tegra: gpio comment cleanup
  ARM: dt: tegra: remove unnecessary unit addresses
  ARM: dt: tegra: whitespace cleanup
  ARM: dt: tegra cardhu: fix typo in SDHCI node name
  ARM: dt: tegra: cardhu: register core regulator tps62361
  ARM: dt: tegra30.dtsi: Add SMMU node
  ARM: dt: tegra20.dtsi: Add GART node
  ARM: dt: tegra30.dtsi: Add Memory Controller(MC) nodes
  ARM: dt: tegra20.dtsi: Add Memory Controller(MC) nodes
  ARM: dt: tegra: Add device tree support for AHB
  ARM: dts: enable audio support for imx28-evk
  ARM: dts: enable i2c device for imx28-evk
  i2c: mxs: add device tree probe support
  ARM: dts: enable mmc for imx28-evk
  ...
parents 39b6cc66 deb88cc3

Documentation/devicetree/bindings/arm/fsl.txt

+12 −0
Original line number Diff line number Diff line 
Freescale i.MX Platforms Device Tree Bindings

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



i.MX23 Evaluation Kit

Required root node properties:

    - compatible = "fsl,imx23-evk", "fsl,imx23";



i.MX28 Evaluation Kit

Required root node properties:

    - compatible = "fsl,imx28-evk", "fsl,imx28";



i.MX51 Babbage Board

Required root node properties:

    - compatible = "fsl,imx51-babbage", "fsl,imx51";
@@ -29,6 +37,10 @@ i.MX6 Quad SABRE Lite Board 
Required root node properties:

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



i.MX6 Quad SABRE Smart Device Board

Required root node properties:

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



Generic i.MX boards

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

Documentation/devicetree/bindings/dma/fsl-mxs-dma.txt

0 → 100644
+19 −0
Original line number Diff line number Diff line 
* Freescale MXS DMA



Required properties:

- compatible : Should be "fsl,<chip>-dma-apbh" or "fsl,<chip>-dma-apbx"

- reg : Should contain registers location and length



Supported chips:

imx23, imx28.



Examples:

dma-apbh@80004000 {

	compatible = "fsl,imx28-dma-apbh";

	reg = <0x80004000 2000>;

};



dma-apbx@80024000 {

	compatible = "fsl,imx28-dma-apbx";

	reg = <0x80024000 2000>;

};

Documentation/devicetree/bindings/gpio/gpio-mxs.txt

0 → 100644
+87 −0
Original line number Diff line number Diff line 
* Freescale MXS GPIO controller



The Freescale MXS GPIO controller is part of MXS PIN controller.  The

GPIOs are organized in port/bank.  Each port consists of 32 GPIOs.



As the GPIO controller is embedded in the PIN controller and all the

GPIO ports share the same IO space with PIN controller, the GPIO node

will be represented as sub-nodes of MXS pinctrl node.



Required properties for GPIO node:

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

  imx23 and imx28.

- interrupts : Should be the port interrupt shared by all 32 pins.

- gpio-controller : Marks the device node as a gpio controller.

- #gpio-cells : Should be two.  The first cell is the pin number and

  the second cell is used to specify optional parameters (currently

  unused).

- interrupt-controller: Marks the device node as an interrupt controller.

- #interrupt-cells : Should be 2.  The first cell is the GPIO number.

  The second cell bits[3:0] is used to specify trigger type and level flags:

      1 = low-to-high edge triggered.

      2 = high-to-low edge triggered.

      4 = active high level-sensitive.

      8 = active low level-sensitive.



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

node.



Examples:



aliases {

	gpio0 = &gpio0;

	gpio1 = &gpio1;

	gpio2 = &gpio2;

	gpio3 = &gpio3;

	gpio4 = &gpio4;

};



pinctrl@80018000 {

	compatible = "fsl,imx28-pinctrl", "simple-bus";

	reg = <0x80018000 2000>;



	gpio0: gpio@0 {

		compatible = "fsl,imx28-gpio";

		interrupts = <127>;

		gpio-controller;

		#gpio-cells = <2>;

		interrupt-controller;

		#interrupt-cells = <2>;

	};



	gpio1: gpio@1 {

		compatible = "fsl,imx28-gpio";

		interrupts = <126>;

		gpio-controller;

		#gpio-cells = <2>;

		interrupt-controller;

		#interrupt-cells = <2>;

	};



	gpio2: gpio@2 {

		compatible = "fsl,imx28-gpio";

		interrupts = <125>;

		gpio-controller;

		#gpio-cells = <2>;

		interrupt-controller;

		#interrupt-cells = <2>;

	};



	gpio3: gpio@3 {

		compatible = "fsl,imx28-gpio";

		interrupts = <124>;

		gpio-controller;

		#gpio-cells = <2>;

		interrupt-controller;

		#interrupt-cells = <2>;

	};



	gpio4: gpio@4 {

		compatible = "fsl,imx28-gpio";

		interrupts = <123>;

		gpio-controller;

		#gpio-cells = <2>;

		interrupt-controller;

		#interrupt-cells = <2>;

	};

};

Documentation/devicetree/bindings/i2c/i2c-mxs.txt

0 → 100644
+16 −0
Original line number Diff line number Diff line 
* Freescale MXS Inter IC (I2C) Controller



Required properties:

- compatible: Should be "fsl,<chip>-i2c"

- reg: Should contain registers location and length

- interrupts: Should contain ERROR and DMA interrupts



Examples:



i2c0: i2c@80058000 {

	#address-cells = <1>;

	#size-cells = <0>;

	compatible = "fsl,imx28-i2c";

	reg = <0x80058000 2000>;

	interrupts = <111 68>;

};

Documentation/devicetree/bindings/mmc/mxs-mmc.txt

0 → 100644
+25 −0
Original line number Diff line number Diff line 
* Freescale MXS MMC controller



The Freescale MXS Synchronous Serial Ports (SSP) can act as a MMC controller

to support MMC, SD, and SDIO types of memory cards.



Required properties:

- compatible: Should be "fsl,<chip>-mmc".  The supported chips include

  imx23 and imx28.

- reg: Should contain registers location and length

- interrupts: Should contain ERROR and DMA interrupts

- fsl,ssp-dma-channel: APBH DMA channel for the SSP

- bus-width: Number of data lines, can be <1>, <4>, or <8>



Optional properties:

- wp-gpios: Specify GPIOs for write protection



Examples:



ssp0: ssp@80010000 {

	compatible = "fsl,imx28-mmc";

	reg = <0x80010000 2000>;

	interrupts = <96 82>;

	fsl,ssp-dma-channel = <0>;

	bus-width = <8>;

};