Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0afa0724 authored by Mark Brown's avatar Mark Brown
Browse files

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

Merge remote-tracking branches 'spi/topic/armada', 'spi/topic/ath79', 'spi/topic/atmel' and 'spi/topic/axi' into spi-next
parents 9b12be63 5762ab71 d7a32394 768f3d9d 01affe23

Documentation/devicetree/bindings/spi/spi-armada-3700.txt

0 → 100644
+25 −0
Original line number Diff line number Diff line 
* 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>;

	};

drivers/spi/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -67,6 +67,13 @@ config SPI_ATH79 
	  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

drivers/spi/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ obj-$(CONFIG_SPI_LOOPBACK_TEST) += spi-loopback-test.o 


# 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

drivers/spi/spi-armada-3700.c

0 → 100644
+923 −0

File added.

Preview size limit exceeded, changes collapsed.

drivers/spi/spi-ath79.c

+1 −0
Original line number Diff line number Diff line
@@ -304,6 +304,7 @@ static const struct of_device_id ath79_spi_of_match[] = { 
	{ .compatible = "qca,ar7100-spi", },

	{ },

};

MODULE_DEVICE_TABLE(of, ath79_spi_of_match);



static struct platform_driver ath79_spi_driver = {

	.probe		= ath79_spi_probe,