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

Commit 9d05943e authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'spi/topic/atmel', 'spi/topic/bcm2835',... 

Merge remote-tracking branches 'spi/topic/atmel', 'spi/topic/bcm2835', 'spi/topic/bcm63xx-hsspi' and 'spi/topic/davinci' into spi-next
parents 8e42ac81 bdbbd381 ca861dd0 f4d86223 1b0838b5

Documentation/devicetree/bindings/spi/spi-davinci.txt

+2 −0
Original line number Diff line number Diff line
@@ -12,6 +12,8 @@ Required properties: 
- compatible:

	- "ti,dm6441-spi" for SPI used similar to that on DM644x SoC family

	- "ti,da830-spi" for SPI used similar to that on DA8xx SoC family

	- "ti,keystone-spi" for SPI used similar to that on Keystone2 SoC

		family

- reg: Offset and length of SPI controller register space

- num-cs: Number of chip selects. This includes internal as well as

	GPIO chip selects.

arch/arm/mach-davinci/devices-da8xx.c

+2 −0
Original line number Diff line number Diff line
@@ -1010,11 +1010,13 @@ static struct davinci_spi_platform_data da8xx_spi_pdata[] = { 
		.version	= SPI_VERSION_2,

		.intr_line	= 1,

		.dma_event_q	= EVENTQ_0,

		.prescaler_limit = 2,

	},

	[1] = {

		.version	= SPI_VERSION_2,

		.intr_line	= 1,

		.dma_event_q	= EVENTQ_0,

		.prescaler_limit = 2,

	},

};

arch/arm/mach-davinci/dm355.c

+1 −0
Original line number Diff line number Diff line
@@ -411,6 +411,7 @@ static struct davinci_spi_platform_data dm355_spi0_pdata = { 
	.num_chipselect = 2,

	.cshold_bug	= true,

	.dma_event_q	= EVENTQ_1,

	.prescaler_limit = 1,

};

static struct platform_device dm355_spi0_device = {

	.name = "spi_davinci",

arch/arm/mach-davinci/dm365.c

+1 −0
Original line number Diff line number Diff line
@@ -646,6 +646,7 @@ static struct davinci_spi_platform_data dm365_spi0_pdata = { 
	.version 	= SPI_VERSION_1,

	.num_chipselect = 2,

	.dma_event_q	= EVENTQ_3,

	.prescaler_limit = 1,

};



static struct resource dm365_spi0_resources[] = {

drivers/spi/spi-atmel.c

+0 −1
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 
#include <linux/interrupt.h>

#include <linux/spi/spi.h>

#include <linux/slab.h>

#include <linux/platform_data/atmel.h>

#include <linux/platform_data/dma-atmel.h>

#include <linux/of.h>