From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 30 Jul 2011 06:32:02 +0000 (-0700)
Subject: Merge branch 'next/dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux... 
X-Git-Url: https://git.openfabrics.org/?p=~shefty%2Frdma-dev.git;a=commitdiff_plain;h=cb7dee8d22f3e9320424e769d860fbd9712a0666;hp=-c

Merge branch 'next/dt' of git://git./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
  ...
---

cb7dee8d22f3e9320424e769d860fbd9712a0666
diff --combined arch/arm/mach-tegra/Kconfig
index fec64f3aa68,4b8abf93bd9..d82ebab50e1
--- a/arch/arm/mach-tegra/Kconfig
+++ b/arch/arm/mach-tegra/Kconfig
@@@ -27,14 -27,14 +27,14 @@@ comment "Tegra board type
  
  config MACH_HARMONY
         bool "Harmony board"
 -       select MACH_HAS_SND_SOC_TEGRA_WM8903
 +       select MACH_HAS_SND_SOC_TEGRA_WM8903 if SND_SOC
         help
           Support for nVidia Harmony development platform
  
  config MACH_KAEN
         bool "Kaen board"
         select MACH_SEABOARD
 -       select MACH_HAS_SND_SOC_TEGRA_WM8903
 +       select MACH_HAS_SND_SOC_TEGRA_WM8903 if SND_SOC
         help
           Support for the Kaen version of Seaboard
  
@@@ -45,12 -45,18 +45,18 @@@ config MACH_PAZ0
  
  config MACH_SEABOARD
         bool "Seaboard board"
 -       select MACH_HAS_SND_SOC_TEGRA_WM8903
 +       select MACH_HAS_SND_SOC_TEGRA_WM8903 if SND_SOC
         help
           Support for nVidia Seaboard development platform. It will
  	 also be included for some of the derivative boards that
  	 have large similarities with the seaboard design.
  
+ config MACH_TEGRA_DT
+ 	bool "Generic Tegra board (FDT support)"
+ 	select USE_OF
+ 	help
+ 	  Support for generic nVidia Tegra boards using Flattened Device Tree
+ 
  config MACH_TRIMSLICE
         bool "TrimSlice board"
         select TEGRA_PCI