Merge tags 'devicetree-for-linus' and 'spi-for-linus' of git://git.secretlab.ca/git...

2nd set of device tree changes and SPI bug fixes for v3.3

* tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux-2.6:
  of/irq: Add interrupts-names property to name an irq resource
  of/address: Add reg-names property to name an iomem resource

* tag 'spi-for-linus' of git://git.secretlab.ca/git/linux-2.6:
  spi/tegra: depend instead of select TEGRA_SYSTEM_DMA

diff --combined drivers/spi/Kconfig
index 561a832,8ba4510,a1c468e..3f9a47e
--- 1/drivers/spi/Kconfig
--- 2/drivers/spi/Kconfig
--- 3/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@@@ -87,12 -87,12 -87,12 +87,12 @@@@ config SPI_BFIN_SPOR
          Enable support for a SPI bus via the Blackfin SPORT peripheral.
   
   config SPI_AU1550
 --     tristate "Au1550/Au12x0 SPI Controller"
  -     depends on (SOC_AU1550 || SOC_AU1200) && EXPERIMENTAL
 ++     tristate "Au1550/Au1200/Au1300 SPI Controller"
  +     depends on MIPS_ALCHEMY && EXPERIMENTAL
        select SPI_BITBANG
        help
          If you say yes to this option, support will be included for the
 --       Au1550 SPI controller (may also work with Au1200,Au1210,Au1250).
 ++       PSC SPI controller found on Au1550, Au1200 and Au1300 series.
   
   config SPI_BITBANG
        tristate "Utilities for Bitbanging SPI masters"
@@@@ -174,7 -174,8 -174,8 +174,7 @@@@ config SPI_LM70_LL
   
   config SPI_MPC52xx
        tristate "Freescale MPC52xx SPI (non-PSC) controller support"
 --     depends on PPC_MPC52xx && SPI
 --     select SPI_MASTER_OF
 ++     depends on PPC_MPC52xx
        help
          This drivers supports the MPC52xx SPI controller in master SPI
          mode.
@@@@ -198,7 -199,7 -199,7 +198,7 @@@@ config SPI_FSL_LI
        depends on FSL_SOC
   
   config SPI_FSL_SPI
  -     tristate "Freescale SPI controller"
  +     bool "Freescale SPI controller"
        depends on FSL_SOC
        select SPI_FSL_LIB
        help
@@@@ -207,7 -208,7 -208,7 +207,7 @@@@
          MPC8569 uses the controller in QE mode, MPC8610 in cpu mode.
   
   config SPI_FSL_ESPI
  -     tristate "Freescale eSPI controller"
  +     bool "Freescale eSPI controller"
        depends on FSL_SOC
        select SPI_FSL_LIB
        help
@@@@ -332,8 -333,8 -333,7 +332,7 @@@@ config SPI_STMP3XX
   
   config SPI_TEGRA
        tristate "Nvidia Tegra SPI controller"
--      depends on ARCH_TEGRA
--      select TEGRA_SYSTEM_DMA
++      depends on ARCH_TEGRA && TEGRA_SYSTEM_DMA
        help
          SPI driver for NVidia Tegra SoCs
   
@@@@ -345,14 -346,14 -345,14 +344,14 @@@@ config SPI_TI_SS
          serial port.
   
   config SPI_TOPCLIFF_PCH
 -      tristate "Intel EG20T PCH/OKI SEMICONDUCTOR ML7213 IOH SPI controller"
 +      tristate "Intel EG20T PCH/LAPIS Semicon IOH(ML7213/ML7223/ML7831) SPI"
        depends on PCI
        help
          SPI driver for the Topcliff PCH (Platform Controller Hub) SPI bus
          used in some x86 embedded processors.
   
 -        This driver also supports the ML7213, a companion chip for the
 -        Atom E6xx series and compatible with the Intel EG20T PCH.
 +        This driver also supports the ML7213/ML7223/ML7831, a companion chip
 +        for the Atom E6xx series and compatible with the Intel EG20T PCH.
   
   config SPI_TXX9
        tristate "Toshiba TXx9 SPI controller"