Merge remote-tracking branches 'spi/topic/armada', 'spi/topic/ath79',...

* Marvell Armada 3700 SPI Controller

Required Properties:

- compatible: should be "marvell,armada-3700-spi"

- reg: physical base address of the controller and length of memory mapped

       region.

- interrupts: The interrupt number. The interrupt specifier format depends on

	      the interrupt controller and of its driver.

- clocks: Must contain the clock source, usually from the North Bridge clocks.

- num-cs: The number of chip selects that is supported by this SPI Controller

- #address-cells: should be 1.

- #size-cells: should be 0.

Example:

	spi0: spi@10600 {

		compatible = "marvell,armada-3700-spi";

		#address-cells = <1>;

		#size-cells = <0>;

		reg = <0x10600 0x5d>;

		clocks = <&nb_perih_clk 7>;

		interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>;

		num-cs = <4>;

	};

	  This enables support for the SPI controller present on the

	  Atheros AR71XX/AR724X/AR913X SoCs.

config SPI_ARMADA_3700

	tristate "Marvell Armada 3700 SPI Controller"

	depends on (ARCH_MVEBU && OF) || COMPILE_TEST

	help

	  This enables support for the SPI controller present on the

	  Marvell Armada 3700 SoCs.

config SPI_ATMEL

	tristate "Atmel SPI Controller"

	depends on HAS_DMA

# SPI master controller drivers (bus)

obj-$(CONFIG_SPI_ALTERA)		+= spi-altera.o

obj-$(CONFIG_SPI_ARMADA_3700)		+= spi-armada-3700.o

obj-$(CONFIG_SPI_ATMEL)			+= spi-atmel.o

obj-$(CONFIG_SPI_ATH79)			+= spi-ath79.o

obj-$(CONFIG_SPI_AU1550)		+= spi-au1550.o