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

Commit 8aeab58e authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'spi/topic/pxa2xx', 'spi/topic/qspi',... 

Merge remote-tracking branches 'spi/topic/pxa2xx', 'spi/topic/qspi', 'spi/topic/s3c24xx', 'spi/topic/s3c64xx', 'spi/topic/sh', 'spi/topic/tegra114', 'spi/topic/tegra20-sflash', 'spi/topic/tegra20-slink', 'spi/topic/txx9' and 'spi/topic/xcomm' into spi-linus
parents 907e26b6 382cebb0 5a33d30f 85a90124 3e83c194 909e709c 48c3fc93 a553a31d 5fd38677 bdf0290a 4cc16085

Documentation/devicetree/bindings/spi/ti_qspi.txt

+7 −1
Original line number Diff line number Diff line
@@ -3,6 +3,11 @@ TI QSPI controller. 
Required properties:

- compatible : should be "ti,dra7xxx-qspi" or "ti,am4372-qspi".

- reg: Should contain QSPI registers location and length.

- reg-names: Should contain the resource reg names.

	- qspi_base: Qspi configuration register Address space

	- qspi_mmap: Memory mapped Address space

	- (optional) qspi_ctrlmod: Control module Address space

- interrupts: should contain the qspi interrupt number.

- #address-cells, #size-cells : Must be present if the device has sub-nodes

- ti,hwmods: Name of the hwmod associated to the QSPI
@@ -14,7 +19,8 @@ Example: 


qspi: qspi@4b300000 {

	compatible = "ti,dra7xxx-qspi";

	reg = <0x4b300000 0x100>;

	reg = <0x47900000 0x100>, <0x30000000 0x3ffffff>;

	reg-names = "qspi_base", "qspi_mmap";

	#address-cells = <1>;

	#size-cells = <0>;

	spi-max-frequency = <25000000>;

arch/arm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -723,6 +723,7 @@ config ARCH_S3C64XX 
	bool "Samsung S3C64XX"

	select ARCH_HAS_CPUFREQ

	select ARCH_REQUIRE_GPIOLIB

	select ARM_AMBA

	select ARM_VIC

	select CLKDEV_LOOKUP

	select CLKSRC_SAMSUNG_PWM

arch/arm/mach-s3c64xx/Kconfig

+4 −3
Original line number Diff line number Diff line
@@ -17,9 +17,10 @@ config CPU_S3C6410 
	help

	  Enable S3C6410 CPU support



config S3C64XX_DMA

	bool "S3C64XX DMA"

	select S3C_DMA

config S3C64XX_PL080

	bool "S3C64XX DMA using generic PL08x driver"

	select AMBA_PL08X

	select SAMSUNG_DMADEV



config S3C64XX_SETUP_SDHCI

	bool

arch/arm/mach-s3c64xx/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ obj-$(CONFIG_CPU_IDLE) += cpuidle.o 


# DMA support



obj-$(CONFIG_S3C64XX_DMA)	+= dma.o

obj-$(CONFIG_S3C64XX_PL080)	+= pl080.o



# Device support

arch/arm/mach-s3c64xx/common.h

+5 −0
Original line number Diff line number Diff line
@@ -58,4 +58,9 @@ int __init s3c64xx_pm_late_initcall(void); 
static inline int s3c64xx_pm_late_initcall(void) { return 0; }

#endif



#ifdef CONFIG_S3C64XX_PL080

extern struct pl08x_platform_data s3c64xx_dma0_plat_data;

extern struct pl08x_platform_data s3c64xx_dma1_plat_data;

#endif



#endif /* __ARCH_ARM_MACH_S3C64XX_COMMON_H */