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

Commit b061c59c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'spi/next' of git://git.secretlab.ca/git/linux-2.6 

* 'spi/next' of git://git.secretlab.ca/git/linux-2.6: (34 commits)
  spi/dw_spi: move dw_spi.h into drivers/spi
  spi/dw_spi: Fix missing header
  gpio/langwell: Clear edge bit before handling
  gpio/langwell: Simplify demux loop
  gpio/langwell: Convert irq name space
  gpio/langwell: Fix broken irq_eoi change.
  gpio; Make Intel chipset gpio drivers depend on x86
  gpio/cs5535-gpio: Fix section mismatch
  spi/rtc-{ds1390,ds3234,m41t94}: Use spi_get_drvdata() for SPI devices
  spi/davinci: Support DMA transfers larger than 65535 words
  spi/davinci: Use correct length parameter to dma_map_single calls
  gpio: Use __devexit at necessary places
  gpio: add MODULE_DEVICE_TABLE to pch_gpio and ml_ioh_gpio
  gpio/mcp23s08: support mcp23s17 variant
  of_mmc_spi: add card detect irq support
  spi/omap_mcspi: catch xfers of non-multiple SPI word size
  spi/omap_mcspi: Off-by-one error in finding the right divisor
  gpio/pca953x: Fix wrong pointer type
  spi/pl022: rid dangling labels
  spi: add support for SuperH SPI
  ...
parents 99f4065b 568a60ed

Documentation/devicetree/bindings/mmc/mmc-spi-slot.txt

+8 −1
Original line number Original line Diff line number Diff line
@@ -7,8 +7,13 @@ Required properties: 
- voltage-ranges : two cells are required, first cell specifies minimum

- voltage-ranges : two cells are required, first cell specifies minimum

  slot voltage (mV), second cell specifies maximum slot voltage (mV).

  slot voltage (mV), second cell specifies maximum slot voltage (mV).

  Several ranges could be specified.

  Several ranges could be specified.

- gpios : (optional) may specify GPIOs in this order: Card-Detect GPIO,



Optional properties:

- gpios : may specify GPIOs in this order: Card-Detect GPIO,

  Write-Protect GPIO.

  Write-Protect GPIO.

- interrupts : the interrupt of a card detect interrupt.

- interrupt-parent : the phandle for the interrupt controller that

  services interrupts for this device.





Example:

Example:
@@ -20,4 +25,6 @@ Example: 
			 &qe_pio_d 15 0>;

			 &qe_pio_d 15 0>;

		voltage-ranges = <3300 3300>;

		voltage-ranges = <3300 3300>;

		spi-max-frequency = <50000000>;

		spi-max-frequency = <50000000>;

		interrupts = <42>;

		interrupt-parent = <&PIC>;

	};
 
	};

Documentation/devicetree/bindings/spi/spi_altera.txt

0 → 100644
+4 −0
Original line number Original line Diff line number Diff line 
Altera SPI



Required properties:

- compatible : should be "ALTR,spi-1.0".

Documentation/devicetree/bindings/spi/spi_oc_tiny.txt

0 → 100644
+12 −0
Original line number Original line Diff line number Diff line 
OpenCores tiny SPI



Required properties:

- compatible : should be "opencores,tiny-spi-rtlsvn2".

- gpios : should specify GPIOs used for chipselect.

Optional properties:

- clock-frequency : input clock frequency to the core.

- baud-width: width, in bits, of the programmable divider used to scale

	the input clock to SCLK.



The clock-frequency and baud-width properties are needed only if the divider

is programmable. They are not needed if the divider is fixed.

drivers/gpio/74x164.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -133,7 +133,7 @@ static int __devinit gen_74x164_probe(struct spi_device *spi) 
	return ret;

	return ret;

}

}





static int gen_74x164_remove(struct spi_device *spi)

static int __devexit gen_74x164_remove(struct spi_device *spi)

{

{

	struct gen_74x164_chip *chip;

	struct gen_74x164_chip *chip;

	int ret;

	int ret;

drivers/gpio/Kconfig

+6 −6
Original line number Original line Diff line number Diff line
@@ -101,7 +101,7 @@ config GPIO_VR41XX 




config GPIO_SCH

config GPIO_SCH

	tristate "Intel SCH GPIO"

	tristate "Intel SCH GPIO"

	depends on GPIOLIB && PCI

	depends on GPIOLIB && PCI && X86

	select MFD_CORE

	select MFD_CORE

	select LPC_SCH

	select LPC_SCH

	help

	help
@@ -321,13 +321,13 @@ config GPIO_BT8XX 




config GPIO_LANGWELL

config GPIO_LANGWELL

	bool "Intel Langwell/Penwell GPIO support"

	bool "Intel Langwell/Penwell GPIO support"

	depends on PCI

	depends on PCI && X86

	help

	help

	  Say Y here to support Intel Langwell/Penwell GPIO.

	  Say Y here to support Intel Langwell/Penwell GPIO.





config GPIO_PCH

config GPIO_PCH

	tristate "PCH GPIO of Intel Topcliff"

	tristate "PCH GPIO of Intel Topcliff"

	depends on PCI

	depends on PCI && X86

	help

	help

	  This driver is for PCH(Platform controller Hub) GPIO of Intel Topcliff

	  This driver is for PCH(Platform controller Hub) GPIO of Intel Topcliff

	  which is an IOH(Input/Output Hub) for x86 embedded processor.

	  which is an IOH(Input/Output Hub) for x86 embedded processor.
@@ -368,11 +368,11 @@ config GPIO_MAX7301 
	  GPIO driver for Maxim MAX7301 SPI-based GPIO expander.

	  GPIO driver for Maxim MAX7301 SPI-based GPIO expander.





config GPIO_MCP23S08

config GPIO_MCP23S08

	tristate "Microchip MCP23S08 I/O expander"

	tristate "Microchip MCP23Sxx I/O expander"

	depends on SPI_MASTER

	depends on SPI_MASTER

	help

	help

	  SPI driver for Microchip MCP23S08 I/O expander.  This provides

	  SPI driver for Microchip MCP23S08/MPC23S17 I/O expanders.

	  a GPIO interface supporting inputs and outputs.

	  This provides a GPIO interface supporting inputs and outputs.





config GPIO_MC33880

config GPIO_MC33880

	tristate "Freescale MC33880 high-side/low-side switch"

	tristate "Freescale MC33880 high-side/low-side switch"