leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
411f5c7a50
linux/drivers/spi
History
Linus Torvalds 411f5c7a50 Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm 
* 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm: (289 commits)
  davinci: DM644x EVM: register MUSB device earlier
  davinci: add spi devices on tnetv107x evm
  davinci: add ssp config for tnetv107x evm board
  davinci: add tnetv107x ssp platform device
  spi: add ti-ssp spi master driver
  mfd: add driver for sequencer serial port
  ARM: EXYNOS4: Implement Clock gating for System MMU
  ARM: EXYNOS4: Enhancement of System MMU driver
  ARM: EXYNOS4: Add support for gpio interrupts
  ARM: S5P: Add function to register gpio interrupt bank data
  ARM: S5P: Cleanup S5P gpio interrupt code
  ARM: EXYNOS4: Add missing GPYx banks
  ARM: S3C64XX: Fix section mismatch from cpufreq init
  ARM: EXYNOS4: Add keypad device to the SMDKV310
  ARM: EXYNOS4: Update clocks for keypad
  ARM: EXYNOS4: Update keypad base address
  ARM: EXYNOS4: Add keypad device helpers
  ARM: EXYNOS4: Add support for SATA on ARMLEX4210
  plat-nomadik: make GPIO interrupts work with cpuidle ApSleep
  mach-u300: define a dummy filter function for coh901318
  ...

Fix up various conflicts in
 - arch/arm/mach-exynos4/cpufreq.c
 - arch/arm/mach-mxs/gpio.c
 - drivers/net/Kconfig
 - drivers/tty/serial/Kconfig
 - drivers/tty/serial/Makefile
 - drivers/usb/gadget/fsl_mxc_udc.c
 - drivers/video/Kconfig
2011-03-17 19:08:06 -07:00
..
amba-pl022.c ARM: amba: make probe() functions take const id tables 2011-02-23 16:24:14 +00:00
ath79_spi.c SPI: Add SPI controller driver for the Atheros AR71XX/AR724X/AR913X SoCs 2011-01-18 19:30:27 +01:00
atmel_spi.c Merge branch 'master' into for-next 2010-12-22 18:57:02 +01:00
atmel_spi.h
au1550_spi.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
coldfire_qspi.c spi/m68knommu: Coldfire QSPI platform support 2010-12-29 23:28:25 -07:00
davinci_spi.c davinci: spi: move event queue parameter to platform data 2011-02-28 14:53:29 -08:00
dw_spi_mid.c spi/dw_spi: add DMA support 2010-12-24 01:23:25 -07:00
dw_spi_mmio.c spi/dw_spi: don't treat NULL clk as an error 2011-01-11 08:20:07 -07:00
dw_spi_pci.c spi/dw_spi: add DMA support 2010-12-24 01:23:25 -07:00
dw_spi.c spi/dw_spi Typo change diable to disable. 2010-12-30 23:44:55 -07:00
ep93xx_spi.c spi/ep93xx: implemented driver for Cirrus EP93xx SPI controller 2010-05-25 00:23:16 -06:00
Kconfig Merge branch 'davinci-next-2' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci into devel-stable 2011-03-15 15:41:26 +00:00
Makefile spi: add ti-ssp spi master driver 2011-03-15 08:17:22 -07:00
mpc52xx_psc_spi.c dt/spi: Eliminate users of of_platform_{,un}register_driver 2011-02-28 13:22:44 -07:00
mpc52xx_spi.c dt/spi: Eliminate users of of_platform_{,un}register_driver 2011-02-28 13:22:44 -07:00
mpc512x_psc_spi.c dt/spi: Eliminate users of of_platform_{,un}register_driver 2011-02-28 13:22:44 -07:00
omap2_mcspi.c Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6 2011-01-07 17:08:46 -08:00
omap_spi_100k.c SPI100k: Fix 8-bit and RX-only transfers 2010-07-03 22:45:44 -06:00
omap_uwire.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
orion_spi.c spi/orion: Drop unnecessary null test 2010-09-29 17:31:29 +09:00
pxa2xx_spi_pci.c Merge commit 'v2.6.38-rc6' into devicetree/next 2011-02-28 01:36:21 -07:00
pxa2xx_spi.c driver-core: remove conditionals around devicetree pointers 2011-01-21 09:24:48 -07:00
spi_bfin5xx.c spi/bfin_spi: only request GPIO on first load 2010-10-22 01:26:46 -06:00
spi_bitbang_txrx.h spi/bitbang: add support for SPI_MASTER_NO_{TX, RX} modes 2010-07-03 22:45:44 -06:00
spi_bitbang.c spi/bitbang: reinitialize transfer parameters for every message 2010-07-03 22:59:18 -06:00
spi_butterfly.c spi/bitbang: add support for SPI_MASTER_NO_{TX, RX} modes 2010-07-03 22:45:44 -06:00
spi_fsl_espi.c dt/spi: Eliminate users of of_platform_{,un}register_driver 2011-02-28 13:22:44 -07:00
spi_fsl_lib.c dt/spi: Eliminate users of of_platform_{,un}register_driver 2011-02-28 13:22:44 -07:00
spi_fsl_lib.h dt/spi: Eliminate users of of_platform_{,un}register_driver 2011-02-28 13:22:44 -07:00
spi_fsl_spi.c dt/spi: Eliminate users of of_platform_{,un}register_driver 2011-02-28 13:22:44 -07:00
spi_gpio.c spi: spi-gpio.c tests SPI_MASTER_NO_RX bit twice, but not SPI_MASTER_NO_TX 2010-10-02 21:09:08 -06:00
spi_imx.c spi/imx: Add i.MX53 support 2011-01-12 22:50:54 -07:00
spi_lm70llp.c spi/bitbang: add support for SPI_MASTER_NO_{TX, RX} modes 2010-07-03 22:45:44 -06:00
spi_nuc900.c drivers/spi: Remove unnecessary semicolons 2010-11-14 20:57:20 -07:00
spi_ppc4xx.c dt/spi: Eliminate users of of_platform_{,un}register_driver 2011-02-28 13:22:44 -07:00
spi_s3c24xx_fiq.h spi_s3c24xx: add FIQ pseudo-DMA support 2009-12-17 08:57:01 -07:00
spi_s3c24xx_fiq.S spi_s3c24xx: add FIQ pseudo-DMA support 2009-12-17 08:57:01 -07:00
spi_s3c24xx_gpio.c spi/bitbang: add support for SPI_MASTER_NO_{TX, RX} modes 2010-07-03 22:45:44 -06:00
spi_s3c24xx.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
spi_s3c64xx.c spi/s3c64xx: Correction for 16,32 bits bus width 2010-09-29 17:31:33 +09:00
spi_sh_msiof.c spi/spi_sh_msiof: fix wrong address calculation, which leads to an Oops 2011-01-21 09:26:24 -07:00
spi_sh_sci.c spi/bitbang: add support for SPI_MASTER_NO_{TX, RX} modes 2010-07-03 22:45:44 -06:00
spi_stmp.c spi: Fix reversed args to time_before() in Freescale stmp driver. 2010-01-20 13:49:44 -07:00
spi_tegra.c spi: tegra: don't treat NULL clk as an error 2011-01-10 16:44:01 -07:00
spi_topcliff_pch.c spi/topcliff: Typo fix threhold to threshold 2010-12-31 17:49:30 -07:00
spi_txx9.c Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6 2009-12-17 15:59:05 -08:00
spi.c spi / PM: Support dev_pm_ops 2010-12-25 15:32:27 +01:00
spidev.c tree-wide: fix comment/printk typos 2010-11-01 15:38:34 -04:00
ti-ssp-spi.c spi: add ti-ssp spi master driver 2011-03-15 08:17:22 -07:00
tle62x0.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
xilinx_spi.c driver-core: remove conditionals around devicetree pointers 2011-01-21 09:24:48 -07:00