diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-30 02:32:02 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-30 02:32:02 -0400 |
| commit | cb7dee8d22f3e9320424e769d860fbd9712a0666 (patch) | |
| tree | 58f33d70453e7cd26ec78e96f33ca7a9673df26e | |
| parent | 49267fc82ad2825132be3b016d8eb58a90cb0c36 (diff) | |
| parent | 6124a4e430b64d1577438c8648c59e996d02e73e (diff) | |
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
...
72 files changed, 1963 insertions, 281 deletions
diff --git a/Documentation/devicetree/bindings/arm/arm-boards b/Documentation/devicetree/bindings/arm/arm-boards new file mode 100644 index 000000000000..91f26148af79 --- /dev/null +++ b/Documentation/devicetree/bindings/arm/arm-boards | |||
| @@ -0,0 +1,20 @@ | |||
| 1 | ARM Versatile Application and Platform Baseboards | ||
| 2 | ------------------------------------------------- | ||
| 3 | ARM's development hardware platform with connectors for customizable | ||
| 4 | core tiles. The hardware configuration of the Versatile boards is | ||
| 5 | highly customizable. | ||
| 6 | |||
| 7 | Required properties (in root node): | ||
| 8 | compatible = "arm,versatile-ab"; /* Application baseboard */ | ||
| 9 | compatible = "arm,versatile-pb"; /* Platform baseboard */ | ||
| 10 | |||
| 11 | Interrupt controllers: | ||
| 12 | - VIC required properties: | ||
| 13 | compatible = "arm,versatile-vic"; | ||
| 14 | interrupt-controller; | ||
| 15 | #interrupt-cells = <1>; | ||
| 16 | |||
| 17 | - SIC required properties: | ||
| 18 | compatible = "arm,versatile-sic"; | ||
| 19 | interrupt-controller; | ||
| 20 | #interrupt-cells = <1>; | ||
diff --git a/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt b/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt new file mode 100644 index 000000000000..d1e3f443e205 --- /dev/null +++ b/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt | |||
| @@ -0,0 +1,17 @@ | |||
| 1 | * Freescale Smart Direct Memory Access (SDMA) Controller for i.MX | ||
| 2 | |||
| 3 | Required properties: | ||
| 4 | - compatible : Should be "fsl,<chip>-sdma" | ||
| 5 | - reg : Should contain SDMA registers location and length | ||
| 6 | - interrupts : Should contain SDMA interrupt | ||
| 7 | - fsl,sdma-ram-script-name : Should contain the full path of SDMA RAM | ||
| 8 | scripts firmware | ||
| 9 | |||
| 10 | Examples: | ||
| 11 | |||
| 12 | sdma@83fb0000 { | ||
| 13 | compatible = "fsl,imx51-sdma", "fsl,imx35-sdma"; | ||
| 14 | reg = <0x83fb0000 0x4000>; | ||
| 15 | interrupts = <6>; | ||
| 16 | fsl,sdma-ram-script-name = "sdma-imx51.bin"; | ||
| 17 | }; | ||
diff --git a/Documentation/devicetree/bindings/i2c/arm-versatile.txt b/Documentation/devicetree/bindings/i2c/arm-versatile.txt new file mode 100644 index 000000000000..361d31c51b6f --- /dev/null +++ b/Documentation/devicetree/bindings/i2c/arm-versatile.txt | |||
| @@ -0,0 +1,10 @@ | |||
| 1 | i2c Controller on ARM Versatile platform: | ||
| 2 | |||
| 3 | Required properties: | ||
| 4 | - compatible : Must be "arm,versatile-i2c"; | ||
| 5 | - reg | ||
| 6 | - #address-cells = <1>; | ||
| 7 | - #size-cells = <0>; | ||
| 8 | |||
| 9 | Optional properties: | ||
| 10 | - Child nodes conforming to i2c bus binding | ||
diff --git a/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt b/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt new file mode 100644 index 000000000000..ab22fe6e73ab --- /dev/null +++ b/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt | |||
| @@ -0,0 +1,34 @@ | |||
| 1 | * Freescale Enhanced Secure Digital Host Controller (eSDHC) for i.MX | ||
| 2 | |||
| 3 | The Enhanced Secure Digital Host Controller on Freescale i.MX family | ||
| 4 | provides an interface for MMC, SD, and SDIO types of memory cards. | ||
| 5 | |||
| 6 | Required properties: | ||
| 7 | - compatible : Should be "fsl,<chip>-esdhc" | ||
| 8 | - reg : Should contain eSDHC registers location and length | ||
| 9 | - interrupts : Should contain eSDHC interrupt | ||
| 10 | |||
| 11 | Optional properties: | ||
| 12 | - fsl,card-wired : Indicate the card is wired to host permanently | ||
| 13 | - fsl,cd-internal : Indicate to use controller internal card detection | ||