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

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

Merge tags 'dt-for-linus', 'gpio-for-linus' and 'spi-for-linus' of... 

Merge tags 'dt-for-linus', 'gpio-for-linus' and 'spi-for-linus' of git://git.secretlab.ca/git/linux-2.6

Pull devicetree, gpio and spi bugfixes from Grant Likely:
 "Device tree v3.8 bug fix:
   - Fixes an undefined struct device build error and a missing symbol
     export.

  GPIO device driver bug fixes:
   - gpio/mvebu-gpio: Make mvebu-gpio depend on OF_CONFIG
   - gpio/ich: Add missing spinlock init

  SPI device driver bug fixes:
   - Most of this is bug fixes to the core code and the sh-hspi and
     s3c64xx device drivers.

   - There is also a patch here to add DT support to the Atmel driver.
     This one should have been in the first round, but I missed it.
     It's a low risk change contained within a single driver and the
     Atmel maintainer has requested it."

* tag 'dt-for-linus' of git://git.secretlab.ca/git/linux-2.6:
  of: define struct device in of_platform.h if !OF_DEVICE and !OF_ADDRESS
  of: Fix export of of_find_matching_node_and_match()

* tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux-2.6:
  gpio/mvebu-gpio: Make mvebu-gpio depend on OF_CONFIG
  gpio/ich: Add missing spinlock init

* tag 'spi-for-linus' of git://git.secretlab.ca/git/linux-2.6:
  spi/sh-hspi: fix return value check in hspi_probe().
  spi: fix tegra SPI binding examples
  spi/atmel: add DT support
  of/spi: Fix SPI module loading by using proper "spi:" modalias prefixes.
  spi: Change FIFO flush operation and spi channel off
  spi: Keep chipselect assertion during one message
parents dcd6a97d ab28698d bc1008cf d3601e56

Documentation/devicetree/bindings/spi/nvidia,tegra20-sflash.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -13,7 +13,7 @@ Recommended properties: 




Example:

Example:





spi@7000d600 {

spi@7000c380 {

	compatible = "nvidia,tegra20-sflash";

	compatible = "nvidia,tegra20-sflash";

	reg = <0x7000c380 0x80>;

	reg = <0x7000c380 0x80>;

	interrupts = <0 39 0x04>;

	interrupts = <0 39 0x04>;

Documentation/devicetree/bindings/spi/nvidia,tegra20-slink.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -13,7 +13,7 @@ Recommended properties: 




Example:

Example:





slink@7000d600 {

spi@7000d600 {

	compatible = "nvidia,tegra20-slink";

	compatible = "nvidia,tegra20-slink";

	reg = <0x7000d600 0x200>;

	reg = <0x7000d600 0x200>;

	interrupts = <0 82 0x04>;

	interrupts = <0 82 0x04>;

Documentation/devicetree/bindings/spi/spi_atmel.txt

0 → 100644
+26 −0
Original line number Original line Diff line number Diff line 
Atmel SPI device



Required properties:

- compatible : should be "atmel,at91rm9200-spi".

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

- interrupts: Should contain spi interrupt

- cs-gpios: chipselects



Example:



spi1: spi@fffcc000 {

	compatible = "atmel,at91rm9200-spi";

	reg = <0xfffcc000 0x4000>;

	interrupts = <13 4 5>;

	#address-cells = <1>;

	#size-cells = <0>;

	cs-gpios = <&pioB 3 0>;

	status = "okay";



	mmc-slot@0 {

		compatible = "mmc-spi-slot";

		reg = <0>;

		gpios = <&pioC 4 0>;	/* CD */

		spi-max-frequency = <25000000>;

	};

};

drivers/gpio/Kconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -172,6 +172,7 @@ config GPIO_MSM_V2 
config GPIO_MVEBU

config GPIO_MVEBU

	def_bool y

	def_bool y

	depends on PLAT_ORION

	depends on PLAT_ORION

	depends on OF

	select GPIO_GENERIC

	select GPIO_GENERIC

	select GENERIC_IRQ_CHIP

	select GENERIC_IRQ_CHIP

drivers/gpio/gpio-ich.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -390,6 +390,7 @@ static int ichx_gpio_probe(struct platform_device *pdev) 
		return -ENODEV;

		return -ENODEV;

	}

	}





	spin_lock_init(&ichx_priv.lock);

	res_base = platform_get_resource(pdev, IORESOURCE_IO, ICH_RES_GPIO);

	res_base = platform_get_resource(pdev, IORESOURCE_IO, ICH_RES_GPIO);

	ichx_priv.use_gpio = ich_info->use_gpio;

	ichx_priv.use_gpio = ich_info->use_gpio;

	err = ichx_gpio_request_regions(res_base, pdev->name,

	err = ichx_gpio_request_regions(res_base, pdev->name,