Merge remote-tracking branches 'spi/topic/overlay', 'spi/topic/pxa2xx',... (4f953070) · Commits · e / devices / android_kernel_xiaomi_nabu

Documentation/Makefile

+1 −1

Original line number	Original line	Diff line number	Diff line
	subdir-y := accounting auxdisplay blackfin connector \		subdir-y := accounting auxdisplay blackfin connector \
	filesystems filesystems ia64 laptops mic misc-devices \		filesystems filesystems ia64 laptops mic misc-devices \
	networking pcmcia prctl ptp spi timers vDSO video4linux \		networking pcmcia prctl ptp timers vDSO video4linux \
	watchdog		watchdog

Documentation/devicetree/bindings/spi/sh-msiof.txt

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -10,6 +10,7 @@ Required properties:
	"renesas,msiof-r8a7792" (R-Car V2H)		"renesas,msiof-r8a7792" (R-Car V2H)
	"renesas,msiof-r8a7793" (R-Car M2-N)		"renesas,msiof-r8a7793" (R-Car M2-N)
	"renesas,msiof-r8a7794" (R-Car E2)		"renesas,msiof-r8a7794" (R-Car E2)
			"renesas,msiof-sh73a0" (SH-Mobile AG5)
	- reg : A list of offsets and lengths of the register sets for		- reg : A list of offsets and lengths of the register sets for
	the device.		the device.
	If only one register set is present, it is to be used		If only one register set is present, it is to be used

Documentation/spi/00-INDEX

+0 −4

Original line number	Original line	Diff line number	Diff line
	@@ -10,13 +10,9 @@ pxa2xx
	- PXA2xx SPI master controller build by spi_message fifo wq		- PXA2xx SPI master controller build by spi_message fifo wq
	spidev		spidev
	- Intro to the userspace API for spi devices		- Intro to the userspace API for spi devices
	spidev_fdx.c
	- spidev example file
	spi-lm70llp		spi-lm70llp
	- Connecting an LM70-LLP sensor to the kernel via the SPI subsys.		- Connecting an LM70-LLP sensor to the kernel via the SPI subsys.
	spi-sc18is602		spi-sc18is602
	- NXP SC18IS602/603 I2C-bus to SPI bridge		- NXP SC18IS602/603 I2C-bus to SPI bridge
	spi-summary		spi-summary
	- (Linux) SPI overview. If unsure about SPI or SPI in Linux, start here.		- (Linux) SPI overview. If unsure about SPI or SPI in Linux, start here.
	spidev_test.c
	- SPI testing utility.

Documentation/spi/Makefile

deleted100644 → 0

+0 −8

Original line number	Original line	Diff line number	Diff line
	# List of programs to build
	hostprogs-y := spidev_test spidev_fdx

	# Tell kbuild to always build the programs
	always := $(hostprogs-y)

	HOSTCFLAGS_spidev_test.o += -I$(objtree)/usr/include
	HOSTCFLAGS_spidev_fdx.o += -I$(objtree)/usr/include

arch/arm/plat-samsung/devs.c

+10 −9

Original line number	Original line	Diff line number	Diff line
	@@ -1100,9 +1100,7 @@ struct platform_device s3c_device_wdt = {
	#ifdef CONFIG_S3C64XX_DEV_SPI0		#ifdef CONFIG_S3C64XX_DEV_SPI0
	static struct resource s3c64xx_spi0_resource[] = {		static struct resource s3c64xx_spi0_resource[] = {
	[0] = DEFINE_RES_MEM(S3C_PA_SPI0, SZ_256),		[0] = DEFINE_RES_MEM(S3C_PA_SPI0, SZ_256),
	[1] = DEFINE_RES_DMA(DMACH_SPI0_TX),		[1] = DEFINE_RES_IRQ(IRQ_SPI0),
	[2] = DEFINE_RES_DMA(DMACH_SPI0_RX),
	[3] = DEFINE_RES_IRQ(IRQ_SPI0),
	};		};

	struct platform_device s3c64xx_device_spi0 = {		struct platform_device s3c64xx_device_spi0 = {
	@@ -1130,6 +1128,8 @@ void __init s3c64xx_spi0_set_platdata(int (*cfg_gpio)(void), int src_clk_nr,
	pd.num_cs = num_cs;		pd.num_cs = num_cs;
	pd.src_clk_nr = src_clk_nr;		pd.src_clk_nr = src_clk_nr;
	pd.cfg_gpio = (cfg_gpio) ? cfg_gpio : s3c64xx_spi0_cfg_gpio;		pd.cfg_gpio = (cfg_gpio) ? cfg_gpio : s3c64xx_spi0_cfg_gpio;
			pd.dma_tx = (void *)DMACH_SPI0_TX;
			pd.dma_rx = (void *)DMACH_SPI0_RX;
	#if defined(CONFIG_PL330_DMA)		#if defined(CONFIG_PL330_DMA)
	pd.filter = pl330_filter;		pd.filter = pl330_filter;
	#elif defined(CONFIG_S3C64XX_PL080)		#elif defined(CONFIG_S3C64XX_PL080)
	@@ -1145,9 +1145,7 @@ void __init s3c64xx_spi0_set_platdata(int (*cfg_gpio)(void), int src_clk_nr,
	#ifdef CONFIG_S3C64XX_DEV_SPI1		#ifdef CONFIG_S3C64XX_DEV_SPI1
	static struct resource s3c64xx_spi1_resource[] = {		static struct resource s3c64xx_spi1_resource[] = {
	[0] = DEFINE_RES_MEM(S3C_PA_SPI1, SZ_256),		[0] = DEFINE_RES_MEM(S3C_PA_SPI1, SZ_256),
	[1] = DEFINE_RES_DMA(DMACH_SPI1_TX),		[1] = DEFINE_RES_IRQ(IRQ_SPI1),
	[2] = DEFINE_RES_DMA(DMACH_SPI1_RX),
	[3] = DEFINE_RES_IRQ(IRQ_SPI1),
	};		};

	struct platform_device s3c64xx_device_spi1 = {		struct platform_device s3c64xx_device_spi1 = {
	@@ -1175,12 +1173,15 @@ void __init s3c64xx_spi1_set_platdata(int (*cfg_gpio)(void), int src_clk_nr,
	pd.num_cs = num_cs;		pd.num_cs = num_cs;
	pd.src_clk_nr = src_clk_nr;		pd.src_clk_nr = src_clk_nr;
	pd.cfg_gpio = (cfg_gpio) ? cfg_gpio : s3c64xx_spi1_cfg_gpio;		pd.cfg_gpio = (cfg_gpio) ? cfg_gpio : s3c64xx_spi1_cfg_gpio;
			pd.dma_tx = (void *)DMACH_SPI1_TX;
			pd.dma_rx = (void *)DMACH_SPI1_RX;
	#if defined(CONFIG_PL330_DMA)		#if defined(CONFIG_PL330_DMA)
	pd.filter = pl330_filter;		pd.filter = pl330_filter;
	#elif defined(CONFIG_S3C64XX_PL080)		#elif defined(CONFIG_S3C64XX_PL080)
	pd.filter = pl08x_filter_id;		pd.filter = pl08x_filter_id;
	#endif		#endif


	s3c_set_platdata(&pd, sizeof(pd), &s3c64xx_device_spi1);		s3c_set_platdata(&pd, sizeof(pd), &s3c64xx_device_spi1);
	}		}
	#endif /* CONFIG_S3C64XX_DEV_SPI1 */		#endif /* CONFIG_S3C64XX_DEV_SPI1 */
	@@ -1188,9 +1189,7 @@ void __init s3c64xx_spi1_set_platdata(int (*cfg_gpio)(void), int src_clk_nr,
	#ifdef CONFIG_S3C64XX_DEV_SPI2		#ifdef CONFIG_S3C64XX_DEV_SPI2
	static struct resource s3c64xx_spi2_resource[] = {		static struct resource s3c64xx_spi2_resource[] = {
	[0] = DEFINE_RES_MEM(S3C_PA_SPI2, SZ_256),		[0] = DEFINE_RES_MEM(S3C_PA_SPI2, SZ_256),
	[1] = DEFINE_RES_DMA(DMACH_SPI2_TX),		[1] = DEFINE_RES_IRQ(IRQ_SPI2),
	[2] = DEFINE_RES_DMA(DMACH_SPI2_RX),
	[3] = DEFINE_RES_IRQ(IRQ_SPI2),
	};		};

	struct platform_device s3c64xx_device_spi2 = {		struct platform_device s3c64xx_device_spi2 = {
	@@ -1218,6 +1217,8 @@ void __init s3c64xx_spi2_set_platdata(int (*cfg_gpio)(void), int src_clk_nr,
	pd.num_cs = num_cs;		pd.num_cs = num_cs;
	pd.src_clk_nr = src_clk_nr;		pd.src_clk_nr = src_clk_nr;
	pd.cfg_gpio = (cfg_gpio) ? cfg_gpio : s3c64xx_spi2_cfg_gpio;		pd.cfg_gpio = (cfg_gpio) ? cfg_gpio : s3c64xx_spi2_cfg_gpio;
			pd.dma_tx = (void *)DMACH_SPI2_TX;
			pd.dma_rx = (void *)DMACH_SPI2_RX;
	#if defined(CONFIG_PL330_DMA)		#if defined(CONFIG_PL330_DMA)
	pd.filter = pl330_filter;		pd.filter = pl330_filter;
	#elif defined(CONFIG_S3C64XX_PL080)		#elif defined(CONFIG_S3C64XX_PL080)