linux/drivers/spi
Linus Torvalds 30b842889e arm-soc: soc specific changes, part 2
This adds support for the spear13xx platform, which has first been under
 review a long time ago and finally been completed after generic spear
 work has gone into the clock, dt and pinctrl branches.
 
 Also a number of updates for the samsung socs are part of this branch.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQIcBAABAgAGBQJPuezDAAoJEIwa5zzehBx3mooP/iTHd1wRjr2MzKNx4+LpLWgl
 aAXH002xe9Lvu7m75BRvEYWWdRLkyEy9ARM4s2wJCnxU41KmbF65ED1erxK8xaSe
 Ako34vzH+HiUCM2DLzIP6FXyJMM7OcfrdGaY/GxOv+U+MzGUHeu3Q+8b0B/yfBnm
 M3HdDrpyZHKZP9UM3wVQ4/ilDck6vEjYSV2jC11IaHiDMRD2nSpfRKh8H3+gv65S
 gtj9EZpWM8CZg/fCe5lsm3PZnBnqHHW3WVafVnDQfGWeJYqZxMB5QKLU6qf/ntpx
 LU2WjXoGaMmGBVZWynrwNEY6GVp3fZrDV30/q8Htf0/fBpEjUncrLHXtw0DxkpnK
 UuyoRgn7zxOc3kDzohFNIexp1K3q+PNzXklR9hg7OSVji+9bPd2LIOEnpBeghBGj
 WzZIebz5dIdddHlnOl4fRdmxZva2UTuI4bFAJ0izi10Mup7A9lrENnFHG/iVA0rQ
 QlqJZoyeDCvbXQqZCgHirYRPhIxXdQj4G5IivfRxQ7Jgjy76Kt9uDp1egwezF/3a
 2jVtcK42XokVv3Dhsvq9UNFn9GWdVImZ7eh70XLv+q834zAVxSzjWLtlS8I1Q5WO
 7BGIJaICtugNwgYr44Dif6nsoVUmMnSwU5hVw1pApKZspN6EhMhMdp2hw8JPHFUs
 mrZdHi1NAWuYSbObc3UB
 =W2Ri
 -----END PGP SIGNATURE-----

Merge tag 'soc2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull arm-soc: soc specific changes (part 2) from Olof Johansson:
 "This adds support for the spear13xx platform, which has first been
  under review a long time ago and finally been completed after generic
  spear work has gone into the clock, dt and pinctrl branches.

  Also a number of updates for the samsung socs are part of this branch."

Fix up trivial conflicts in drivers/gpio/gpio-samsung.c that look much
worse than they are: the exonys5 init code was refactored in commit
fd454997d6 ("gpio: samsung: refactor gpiolib init for exynos4/5"), and
then commit f10590c983 ("ARM: EXYNOS: add GPC4 bank instance") added a
new gpio chip define and did tiny updates to the init code.

So the conflict diff looks like hell, but it's actually a fairly simple
change.

* tag 'soc2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (34 commits)
  ARM: exynos: fix building with CONFIG_OF disabled
  ARM: EXYNOS: Add AUXDATA for i2c controllers
  ARM: dts: Update device tree source files for EXYNOS5250
  ARM: EXYNOS: Add device tree support for interrupt combiner
  ARM: EXYNOS: Add irq_domain support for interrupt combiner
  ARM: EXYNOS: Remove a new bus_type instance for EXYNOS5
  ARM: EXYNOS: update irqs for EXYNOS5250 SoC
  ARM: EXYNOS: Add pre-divider and fout mux clocks for bpll and mpll
  ARM: EXYNOS: add GPC4 bank instance
  ARM: EXYNOS: Redefine IRQ_MCT_L0,1 definition
  ARM: EXYNOS: Modify the GIC physical address for static io-mapping
  ARM: EXYNOS: Add watchdog timer clock instance
  pinctrl: SPEAr1310: Fix pin numbers for clcd_high_res
  SPEAr: Update MAINTAINERS and Documentation
  SPEAr13xx: Add defconfig
  SPEAr13xx: Add compilation support
  SPEAr13xx: Add dts and dtsi files
  pinctrl: Add SPEAr13xx pinctrl drivers
  pinctrl: SPEAr: Create macro for declaring GPIO PINS
  SPEAr13xx: Add common clock framework support
  ...
2012-05-26 13:05:55 -07:00
..
Kconfig Merge branch 'next/devel-s3c24xx-hsspi' into next/devel-samsung 2012-05-14 18:22:46 +09:00
Makefile spi/bfin5xx: rename config macro name for bfin5xx spi controller driver 2012-04-27 12:15:45 -06:00
spi-altera.c spi: Add module.h to implicit users in drivers/spi 2011-10-31 19:32:17 -04:00
spi-ath79.c spi: By default setup spi_masters with 1 chipselect and dynamics bus number 2012-05-19 23:42:08 -06:00
spi-atmel.c atmel/spi: fix missing probe 2011-11-09 23:02:12 +08:00
spi-au1550.c spi: Add module.h to implicit users in drivers/spi 2011-10-31 19:32:17 -04:00
spi-bcm63xx.c spi/bcm63xx: set master driver mode_bits. 2012-04-27 11:19:15 -06:00
spi-bfin-sport.c spi/spi_bfin_sport: drop bits_per_word from client data 2012-04-27 12:17:25 -06:00
spi-bfin5xx.c spi/spi-bfin5xx: Fix flush of last bit after each spi transfer 2012-04-27 12:20:39 -06:00
spi-bitbang-txrx.h spi: reorganize drivers 2011-06-06 01:16:30 -06:00
spi-bitbang.c spi: Add module.h to implicit users in drivers/spi 2011-10-31 19:32:17 -04:00
spi-butterfly.c spi: Add module.h to implicit users in drivers/spi 2011-10-31 19:32:17 -04:00
spi-coldfire-qspi.c spi: refactor spi-coldfire-qspi to use SPI queue framework. 2012-05-19 22:57:27 -06:00
spi-davinci.c spi/davinci: Fix DMA API usage in davinci 2012-03-30 16:46:22 -06:00
spi-dw-mid.c dmaengine/dma_slave: introduce inline wrappers 2012-03-21 19:20:22 +05:30
spi-dw-mmio.c spi: Add module.h to implicit users in drivers/spi 2011-10-31 19:32:17 -04:00
spi-dw-pci.c spi: use module_pci_driver 2012-04-10 14:11:34 -06:00
spi-dw.c simple_open: automatically convert to simple_open() 2012-04-05 15:25:50 -07:00
spi-dw.h spi: spi-dw: fix all sparse warnings 2011-09-21 09:41:48 -06:00
spi-ep93xx.c spi/ep93xx: clean probe/remove routines 2012-05-09 18:37:42 -06:00
spi-fsl-espi.c spi/devicetree: Move devicetree support code into spi directory 2012-04-13 10:21:39 -06:00
spi-fsl-lib.c spi/devicetree: Move devicetree support code into spi directory 2012-04-13 10:21:39 -06:00
spi-fsl-lib.h spi: reorganize drivers 2011-06-06 01:16:30 -06:00
spi-fsl-spi.c spi/spi-fsl-spi: reference correct pdata in fsl_spi_cs_control 2012-05-19 23:12:06 -06:00
spi-gpio.c spi/gpio: fix section mismatch warning 2011-12-07 22:17:39 +01:00
spi-imx.c Merge branch 'imx/pinctrl' into imx/clock 2012-05-14 15:30:52 +02:00
spi-lm70llp.c spi: By default setup spi_masters with 1 chipselect and dynamics bus number 2012-05-19 23:42:08 -06:00
spi-mpc52xx-psc.c drivercore: Add helper macro for platform_driver boilerplate 2011-10-25 00:35:47 +02:00
spi-mpc52xx.c spi: By default setup spi_masters with 1 chipselect and dynamics bus number 2012-05-19 23:42:08 -06:00
spi-mpc512x-psc.c drivercore: Add helper macro for platform_driver boilerplate 2011-10-25 00:35:47 +02:00
spi-nuc900.c spi/nuc900: Remove unnecessary memset of struct nuc900_spi 2012-02-01 17:10:52 -07:00
spi-oc-tiny.c spi: Add module.h to implicit users in drivers/spi 2011-10-31 19:32:17 -04:00
spi-omap-100k.c spi: reorganize drivers 2011-06-06 01:16:30 -06:00
spi-omap-uwire.c Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
spi-omap2-mcspi.c spi/omap2-mcspi: convert to the pump message infrastructure 2012-05-19 22:54:19 -06:00
spi-orion.c ARM: Orion: SPI: Add clk/clkdev support. 2012-05-08 16:33:55 -07:00
spi-pl022.c spi/pl022: Allow request for higher frequency than maximum possible 2012-04-27 12:07:40 -06:00
spi-ppc4xx.c spi: By default setup spi_masters with 1 chipselect and dynamics bus number 2012-05-19 23:42:08 -06:00
spi-pxa2xx-pci.c spi: use module_pci_driver 2012-04-10 14:11:34 -06:00
spi-pxa2xx.c spi: reorganize drivers 2011-06-06 01:16:30 -06:00
spi-rspi.c spi/rspi: add dmaengine support 2012-05-19 22:37:16 -06:00
spi-s3c24xx-fiq.h spi: reorganize drivers 2011-06-06 01:16:30 -06:00
spi-s3c24xx-fiq.S spi: reorganize drivers 2011-06-06 01:16:30 -06:00
spi-s3c24xx.c ARM: S3C24XX: move spi-s3c24xx platdata out of mach 2012-01-31 20:06:27 +09:00
spi-s3c64xx.c spi: s3c64xx: Fix build 2012-03-15 03:32:17 -06:00
spi-sh-hspi.c spi: sh-hspi: modify write/read method 2012-03-15 03:41:50 -06:00
spi-sh-msiof.c spi: Add module.h to implicit users in drivers/spi 2011-10-31 19:32:17 -04:00
spi-sh-sci.c spi: Add module.h to implicit users in drivers/spi 2011-10-31 19:32:17 -04:00
spi-sh.c spi/spi-sh: add IORESOURCE_MEM_TYPE_MASK decoding for access size 2012-03-07 19:18:45 -07:00
spi-sirf.c SPI: PRIMA2: use the newest APIs of PINCTRL to fix compiling errors 2012-05-19 23:17:31 -06:00
spi-stmp.c drivercore: Add helper macro for platform_driver boilerplate 2011-10-25 00:35:47 +02:00
spi-tegra.c drivercore: Add helper macro for platform_driver boilerplate 2011-10-25 00:35:47 +02:00
spi-ti-ssp.c spi: Add module.h to implicit users in drivers/spi 2011-10-31 19:32:17 -04:00
spi-tle62x0.c spi: Add module.h to implicit users in drivers/spi 2011-10-31 19:32:17 -04:00
spi-topcliff-pch.c spi: By default setup spi_masters with 1 chipselect and dynamics bus number 2012-05-19 23:42:08 -06:00
spi-txx9.c spi: Add module.h to implicit users in drivers/spi 2011-10-31 19:32:17 -04:00
spi-xilinx.c drivercore: Add helper macro for platform_driver boilerplate 2011-10-25 00:35:47 +02:00
spi.c spi: By default setup spi_masters with 1 chipselect and dynamics bus number 2012-05-19 23:42:08 -06:00
spidev.c spi: reorganize drivers 2011-06-06 01:16:30 -06:00