Commit cb7dee8d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'next/dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc 

* 'next/dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc: (21 commits)
  arm/dt: tegra devicetree support
  arm/versatile: Add device tree support
  dt/irq: add irq_domain_generate_simple() helper
  irq: add irq_domain translation infrastructure
  dmaengine: imx-sdma: add device tree probe support
  dmaengine: imx-sdma: sdma_get_firmware does not need to copy fw_name
  dmaengine: imx-sdma: use platform_device_id to identify sdma version
  mmc: sdhci-esdhc-imx: add device tree probe support
  mmc: sdhci-pltfm: dt device does not pass parent to sdhci_alloc_host
  mmc: sdhci-esdhc-imx: get rid of the uses of cpu_is_mx()
  mmc: sdhci-esdhc-imx: do not reference platform data after probe
  mmc: sdhci-esdhc-imx: extend card_detect and write_protect support for mx5
  net/fec: add device tree probe support
  net: ibm_newemac: convert it to use of_get_phy_mode
  dt/net: add helper function of_get_phy_mode
  net/fec: gasket needs to be enabled for some i.mx
  serial/imx: add device tree probe support
  serial/imx: get rid of the uses of cpu_is_mx1()
  arm/dt: Add dtb make rule
  arm/dt: Add skeleton dtsi file
  ...
parents 49267fc8 6124a4e4

Documentation/devicetree/bindings/arm/arm-boards

0 → 100644
+20 −0
Original line number Diff line number Diff line 
ARM Versatile Application and Platform Baseboards

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

ARM's development hardware platform with connectors for customizable

core tiles.  The hardware configuration of the Versatile boards is

highly customizable.



Required properties (in root node):

	compatible = "arm,versatile-ab";  /* Application baseboard */

	compatible = "arm,versatile-pb";  /* Platform baseboard */



Interrupt controllers:

- VIC required properties:

	compatible = "arm,versatile-vic";

	interrupt-controller;

	#interrupt-cells = <1>;



- SIC required properties:

	compatible = "arm,versatile-sic";

	interrupt-controller;

	#interrupt-cells = <1>;

Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt

0 → 100644
+17 −0
Original line number Diff line number Diff line 
* Freescale Smart Direct Memory Access (SDMA) Controller for i.MX



Required properties:

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

- reg : Should contain SDMA registers location and length

- interrupts : Should contain SDMA interrupt

- fsl,sdma-ram-script-name : Should contain the full path of SDMA RAM

  scripts firmware



Examples:



sdma@83fb0000 {

	compatible = "fsl,imx51-sdma", "fsl,imx35-sdma";

	reg = <0x83fb0000 0x4000>;

	interrupts = <6>;

	fsl,sdma-ram-script-name = "sdma-imx51.bin";

};

Documentation/devicetree/bindings/i2c/arm-versatile.txt

0 → 100644
+10 −0
Original line number Diff line number Diff line 
i2c Controller on ARM Versatile platform:



Required properties:

- compatible : Must be "arm,versatile-i2c";

- reg

- #address-cells = <1>;

- #size-cells = <0>;



Optional properties:

- Child nodes conforming to i2c bus binding

Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt

0 → 100644
+34 −0
Original line number Diff line number Diff line 
* Freescale Enhanced Secure Digital Host Controller (eSDHC) for i.MX



The Enhanced Secure Digital Host Controller on Freescale i.MX family

provides an interface for MMC, SD, and SDIO types of memory cards.



Required properties:

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

- reg : Should contain eSDHC registers location and length

- interrupts : Should contain eSDHC interrupt



Optional properties:

- fsl,card-wired : Indicate the card is wired to host permanently

- fsl,cd-internal : Indicate to use controller internal card detection

- fsl,wp-internal : Indicate to use controller internal write protection

- cd-gpios : Specify GPIOs for card detection

- wp-gpios : Specify GPIOs for write protection



Examples:



esdhc@70004000 {

	compatible = "fsl,imx51-esdhc";

	reg = <0x70004000 0x4000>;

	interrupts = <1>;

	fsl,cd-internal;

	fsl,wp-internal;

};



esdhc@70008000 {

	compatible = "fsl,imx51-esdhc";

	reg = <0x70008000 0x4000>;

	interrupts = <2>;

	cd-gpios = <&gpio0 6 0>; /* GPIO1_6 */

	wp-gpios = <&gpio0 5 0>; /* GPIO1_5 */

};

Documentation/devicetree/bindings/mtd/arm-versatile.txt

0 → 100644
+8 −0
Original line number Diff line number Diff line 
Flash device on ARM Versatile board



Required properties:

- compatible : must be "arm,versatile-flash";

- bank-width : width in bytes of flash interface.



Optional properties:

- Subnode partition map from mtd flash binding

CRA Git | Maintained and supported by SUSTech CRA and CCSE