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

Commit 0082c16e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'spi-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc 

Pull spi updates from Mark Brown:
 "Since Grant is even more specacularly busy than usual for the time
  being I've been collecting SPI patches for him for this release -
  probably things will revert back to Grant before the next release.

  There's nothing too exciting here, mostly it's simple driver specific
  stuff:

   - Add spi: to the modaliases of SPI devices to provide namespacing.
   - A driver for AD-FMCOMMS1-EBZ.
   - DT binding for Orion.
   - Fixes and cleanups for i.MX, PL0022, OMAP and bitbang drivers.

   There may be a few more fixes I've missed, people keep sending me new
   things."

* tag 'spi-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc:
  spi/orion: remove uneeded spi_info
  spi/bcm63xx: fix clock configuration selection
  spi/orion: add device tree binding
  spi/omap2: mark omap2_mcspi_master_setup as __devinit
  spi: omap2-mcspi: Fix the below warning
  spi: Add AD-FMCOMMS1-EBZ I2C-SPI bridge driver
  spi/imx: use gpio_is_valid to determine if a gpio is valid
  spi/imx: remove redundant config.speed_hz setting
  spi/gpio: start with CS non-active
  spi: tegra: use dmaengine based dma driver
  spi/pl022: cleanup pl022 header documentation
  spi/pl022: enable runtime PM
  spi/pl022: delete DB5500 support
  spi/pl022: disable port when unused
  spi: Add "spi:" prefix to modalias attribute of spi devices
parents 1f03bf06 8ceffa7c

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

0 → 100644
+19 −0
Original line number Diff line number Diff line 
Marvell Orion SPI device



Required properties:

- compatible : should be "marvell,orion-spi".

- reg : offset and length of the register set for the device

- cell-index : Which of multiple SPI controllers is this.

Optional properties:

- interrupts : Is currently not used.



Example:

       spi@10600 {

	       compatible = "marvell,orion-spi";

	       #address-cells = <1>;

	       #size-cells = <0>;

	       cell-index = <0>;

	       reg = <0x10600 0x28>;

	       interrupts = <23>;

	       status = "disabled";

       };

drivers/spi/Kconfig

+8 −1
Original line number Diff line number Diff line
@@ -357,7 +357,7 @@ config SPI_STMP3XXX 


config SPI_TEGRA

	tristate "Nvidia Tegra SPI controller"

	depends on ARCH_TEGRA && TEGRA_SYSTEM_DMA

	depends on ARCH_TEGRA && (TEGRA_SYSTEM_DMA || TEGRA20_APB_DMA)

	help

	  SPI driver for NVidia Tegra SoCs
@@ -384,6 +384,13 @@ config SPI_TXX9 
	help

	  SPI driver for Toshiba TXx9 MIPS SoCs



config SPI_XCOMM

	tristate "Analog Devices AD-FMCOMMS1-EBZ SPI-I2C-bridge driver"

	depends on I2C

	help

	  Support for the SPI-I2C bridge found on the Analog Devices

	  AD-FMCOMMS1-EBZ board.



config SPI_XILINX

	tristate "Xilinx SPI controller common module"

	depends on HAS_IOMEM && EXPERIMENTAL

drivers/spi/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -61,5 +61,6 @@ obj-$(CONFIG_SPI_TI_SSP) += spi-ti-ssp.o 
obj-$(CONFIG_SPI_TLE62X0)		+= spi-tle62x0.o

obj-$(CONFIG_SPI_TOPCLIFF_PCH)		+= spi-topcliff-pch.o

obj-$(CONFIG_SPI_TXX9)			+= spi-txx9.o

obj-$(CONFIG_SPI_XCOMM)		+= spi-xcomm.o

obj-$(CONFIG_SPI_XILINX)		+= spi-xilinx.o

drivers/spi/spi-bcm63xx.c

+1 −1
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ static void bcm63xx_spi_setup_transfer(struct spi_device *spi, 


	/* Find the closest clock configuration */

	for (i = 0; i < SPI_CLK_MASK; i++) {

		if (hz <= bcm63xx_spi_freq_table[i][0]) {

		if (hz >= bcm63xx_spi_freq_table[i][0]) {

			clk_cfg = bcm63xx_spi_freq_table[i][1];

			break;

		}

drivers/spi/spi-gpio.c

+2 −1
Original line number Diff line number Diff line
@@ -235,7 +235,8 @@ static int spi_gpio_setup(struct spi_device *spi) 
			status = gpio_request(cs, dev_name(&spi->dev));

			if (status)

				return status;

			status = gpio_direction_output(cs, spi->mode & SPI_CS_HIGH);

			status = gpio_direction_output(cs,

					!(spi->mode & SPI_CS_HIGH));

		}

	}

	if (!status)