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

Commit 03e86b3a authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'mxs-dt-3.10' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/dt2 

From Shawn Guo <shawn.guo@linaro.org>:

The mxs device tree changes for 3.10:

* Move enet_out clk into device tree and have fec driver handle it.
* Convert mxsfb driver to generic display timings bindings, and remove
  the mxsfb auxdata from platform code.
* Add generic DMA device tree binding for mxs-dma, and convert the most
  of client device drivers to it.
* Change mxsfb driver to use regulator for controlling power of panel.
* A few device tree source updates

* tag 'mxs-dt-3.10' of git://git.linaro.org/people/shawnguo/linux-2.6

: (23 commits)
  video: mxsfb: Introduce regulator support
  ARM: dts: cfa10036: Add touchscreen support to the CFA-10049
  ARM: dts: imx23-olinuxino: mark sdcard cd as broken
  serial: mxs-auart: move to use generic DMA helper
  mtd: gpmi: move to use generic DMA helper
  i2c: i2c-mxs: move to use generic DMA helper
  spi: mxs-spi: move to use generic DMA helper
  mmc: mxs-mmc: move to use generic DMA helper
  dma: mxs-dma: move to generic device tree binding
  dma: mxs-dma: use devm_* managed functions
  ARM: dts: add generic DMA device tree binding for mxs-dma
  pinctrl: pinctrl-mxs: document the missing pull-ups
  ARM: cfa10036: add one wire bitbanging to the cfa10049
  video: mxsfb: remove mxsfb_platform_data
  ARM: mxs: move display timing configurations into device tree
  video: mxsfb: get display timings from device tree
  video: mxsfb: remove dotclk_delay from platform_data
  video: mxsfb: remove fb_phys/fb_size from platform_data
  video: mxsfb: use devm_* managed functions
  ARM: mxs: remove unneeded enet_out clk initialization
  ...

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 42d96abb 4344429d

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

+45 −4
Original line number Diff line number Diff line
@@ -3,17 +3,58 @@ 
Required properties:

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

- reg : Should contain registers location and length

- interrupts : Should contain the interrupt numbers of DMA channels.

  If a channel is empty/reserved, 0 should be filled in place.

- #dma-cells : Must be <1>.  The number cell specifies the channel ID.

- dma-channels : Number of channels supported by the DMA controller



Optional properties:

- interrupt-names : Name of DMA channel interrupts



Supported chips:

imx23, imx28.



Examples:

dma-apbh@80004000 {



dma_apbh: dma-apbh@80004000 {

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

	reg = <0x80004000 2000>;

	reg = <0x80004000 0x2000>;

	interrupts = <82 83 84 85

		      88 88 88 88

		      88 88 88 88

		      87 86 0 0>;

	interrupt-names = "ssp0", "ssp1", "ssp2", "ssp3",

			  "gpmi0", "gmpi1", "gpmi2", "gmpi3",

			  "gpmi4", "gmpi5", "gpmi6", "gmpi7",

			  "hsadc", "lcdif", "empty", "empty";

	#dma-cells = <1>;

	dma-channels = <16>;

};



dma-apbx@80024000 {

dma_apbx: dma-apbx@80024000 {

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

	reg = <0x80024000 2000>;

	reg = <0x80024000 0x2000>;

	interrupts = <78 79 66 0

		      80 81 68 69

		      70 71 72 73

		      74 75 76 77>;

	interrupt-names = "auart4-rx", "aurat4-tx", "spdif-tx", "empty",

			  "saif0", "saif1", "i2c0", "i2c1",

			  "auart0-rx", "auart0-tx", "auart1-rx", "auart1-tx",

			  "auart2-rx", "auart2-tx", "auart3-rx", "auart3-tx";

	#dma-cells = <1>;

	dma-channels = <16>;

};



DMA clients connected to the MXS DMA controller must use the format

described in the dma.txt file.



Examples:



auart0: serial@8006a000 {

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

	reg = <0x8006a000 0x2000>;

	interrupts = <112>;

	dmas = <&dma_apbx 8>, <&dma_apbx 9>;

	dma-names = "rx", "tx";

};

Documentation/devicetree/bindings/fb/mxsfb.txt

+33 −3
Original line number Diff line number Diff line
@@ -5,9 +5,16 @@ Required properties: 
  imx23 and imx28.

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

- interrupts: Should contain lcdif interrupts

- display : phandle to display node (see below for details)



Optional properties:

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

* display node



Required properties:

- bits-per-pixel : <16> for RGB565, <32> for RGB888/666.

- bus-width : number of data lines.  Could be <8>, <16>, <18> or <24>.



Required sub-node:

- display-timings : Refer to binding doc display-timing.txt for details.



Examples:
@@ -15,5 +22,28 @@ lcdif@80030000 { 
	compatible = "fsl,imx28-lcdif";

	reg = <0x80030000 2000>;

	interrupts = <38 86>;

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



	display: display {

		bits-per-pixel = <32>;

		bus-width = <24>;



		display-timings {

			native-mode = <&timing0>;

			timing0: timing0 {

				clock-frequency = <33500000>;

				hactive = <800>;

				vactive = <480>;

				hfront-porch = <164>;

				hback-porch = <89>;

				hsync-len = <10>;

				vback-porch = <23>;

				vfront-porch = <10>;

				vsync-len = <10>;

				hsync-active = <0>;

				vsync-active = <0>;

				de-active = <1>;

				pixelclk-active = <0>;

			};

		};

	};

};

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

+8 −4
Original line number Diff line number Diff line
@@ -3,10 +3,13 @@ 
Required properties:

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

- reg: Should contain registers location and length

- interrupts: Should contain ERROR and DMA interrupts

- interrupts: Should contain ERROR interrupt number

- clock-frequency: Desired I2C bus clock frequency in Hz.

                   Only 100000Hz and 400000Hz modes are supported.

- fsl,i2c-dma-channel: APBX DMA channel for the I2C

- dmas: DMA specifier, consisting of a phandle to DMA controller node

  and I2C DMA channel ID.

  Refer to dma.txt and fsl-mxs-dma.txt for details.

- dma-names: Must be "rx-tx".



Examples:
@@ -15,7 +18,8 @@ i2c0: i2c@80058000 { 
	#size-cells = <0>;

	compatible = "fsl,imx28-i2c";

	reg = <0x80058000 2000>;

	interrupts = <111 68>;

	interrupts = <111>;

	clock-frequency = <100000>;

	fsl,i2c-dma-channel = <6>;

	dmas = <&dma_apbx 6>;

	dma-names = "rx-tx";

};

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

+8 −4
Original line number Diff line number Diff line
@@ -9,15 +9,19 @@ and the properties used by the mxsmmc driver. 
Required properties:

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

  imx23 and imx28.

- interrupts: Should contain ERROR and DMA interrupts

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

- interrupts: Should contain ERROR interrupt number

- dmas: DMA specifier, consisting of a phandle to DMA controller node

  and SSP DMA channel ID.

  Refer to dma.txt and fsl-mxs-dma.txt for details.

- dma-names: Must be "rx-tx".



Examples:



ssp0: ssp@80010000 {

	compatible = "fsl,imx28-mmc";

	reg = <0x80010000 2000>;

	interrupts = <96 82>;

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

	interrupts = <96>;

	dmas = <&dma_apbh 0>;

	dma-names = "rx-tx";

	bus-width = <8>;

};

Documentation/devicetree/bindings/mtd/gpmi-nand.txt

+10 −7
Original line number Diff line number Diff line
@@ -7,10 +7,12 @@ Required properties: 
  - compatible : should be "fsl,<chip>-gpmi-nand"

  - reg : should contain registers location and length for gpmi and bch.

  - reg-names: Should contain the reg names "gpmi-nand" and "bch"

  - interrupts : The first is the DMA interrupt number for GPMI.

                 The second is the BCH interrupt number.

  - interrupt-names : The interrupt names "gpmi-dma", "bch";

  - fsl,gpmi-dma-channel : Should contain the dma channel it uses.

  - interrupts : BCH interrupt number.

  - interrupt-names : Should be "bch".

  - dmas: DMA specifier, consisting of a phandle to DMA controller node

    and GPMI DMA channel ID.

    Refer to dma.txt and fsl-mxs-dma.txt for details.

  - dma-names: Must be "rx-tx".



Optional properties:

  - nand-on-flash-bbt: boolean to enable on flash bbt option if not
@@ -27,9 +29,10 @@ gpmi-nand@8000c000 { 
	#size-cells = <1>;

	reg = <0x8000c000 2000>, <0x8000a000 2000>;

	reg-names = "gpmi-nand", "bch";

	interrupts = <88>, <41>;

	interrupt-names = "gpmi-dma", "bch";

	fsl,gpmi-dma-channel = <4>;

	interrupts = <41>;

	interrupt-names = "bch";

	dmas = <&dma_apbh 4>;

	dma-names = "rx-tx";



	partition@0 {

	...