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

Commit 30304e5a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mfd_3.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6 

Pull MFD changes from Samuel Ortiz:
 - 4 new drivers: Freescale i.MX on-chip Anatop, Ricoh's RC5T583 and
   TI's TPS65090 and TPS65217.
 - New variants support (8420, 8520 ab9540), cleanups and bug fixes for
   the abx500 and db8500 ST-E chipsets.
 - Some minor fixes and update for the wm8994 from Mark.
 - The beginning of a long term TWL cleanup effort coming from the TI
   folks.
 - Various fixes and cleanups for the s5m, TPS659xx, pm860x, and MAX8997
   drivers.

Fix up trivial conflicts due to duplicate patches and header file
cleanups (<linux/device.h> removal etc).

* tag 'mfd_3.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6: (97 commits)
  gpio/twl: Add DT support to gpio-twl4030 driver
  gpio/twl: Allocate irq_desc dynamically for SPARSE_IRQ support
  mfd: Detach twl6040 from the pmic mfd driver
  mfd: Replace twl-* pr_ macros by the dev_ equivalent and do various cleanups
  mfd: Micro-optimization on twl4030 IRQ handler
  mfd: Make twl4030 SIH SPARSE_IRQ capable
  mfd: Move twl-core IRQ allocation into twl[4030|6030]-irq files
  mfd: Remove references already defineid in header file from twl-core
  mfd: Remove unneeded header from twl-core
  mfd: Make twl-core not depend on pdata->irq_base/end
  ARM: OMAP2+: board-omap4-*: Do not use anymore TWL6030_IRQ_BASE in board files
  mfd: Return twl6030_mmc_card_detect IRQ for board setup
  Revert "mfd: Add platform data for MAX8997 haptic driver"
  mfd: Add support for TPS65090
  mfd: Add some da9052-i2c section annotations
  mfd: Build rtc5t583 only if I2C config is selected to y.
  mfd: Add anatop mfd driver
  mfd: Fix compilation error in tps65910.h
  mfd: Add 8420 variant to db8500-prcmu
  mfd: Add 8520 PRCMU variant to db8500-prcmu
  ...
parents 750f7706 b8589e2a

Documentation/devicetree/bindings/gpio/gpio-twl4030.txt

0 → 100644
+23 −0
Original line number Diff line number Diff line 
twl4030 GPIO controller bindings



Required properties:

- compatible:

  - "ti,twl4030-gpio" for twl4030 GPIO controller

- #gpio-cells : Should be two.

  - first cell is the pin number

  - second cell is used to specify optional parameters (unused)

- gpio-controller : Marks the device node as a GPIO controller.

- #interrupt-cells : Should be 2.

- interrupt-controller: Mark the device node as an interrupt controller

  The first cell is the GPIO number.

  The second cell is not used.



Example:



twl_gpio: gpio {

    compatible = "ti,twl4030-gpio";

    #gpio-cells = <2>;

    gpio-controller;

    #interrupt-cells = <2>;

    interrupt-controller;

};

arch/arm/mach-omap2/board-4430sdp.c

+7 −6
Original line number Diff line number Diff line
@@ -490,21 +490,22 @@ static struct platform_device omap_vwlan_device = { 


static int omap4_twl6030_hsmmc_late_init(struct device *dev)

{

	int ret = 0;

	int irq = 0;

	struct platform_device *pdev = container_of(dev,

				struct platform_device, dev);

	struct omap_mmc_platform_data *pdata = dev->platform_data;



	/* Setting MMC1 Card detect Irq */

	if (pdev->id == 0) {

		ret = twl6030_mmc_card_detect_config();

		if (ret)

		irq = twl6030_mmc_card_detect_config();

		if (irq < 0) {

			pr_err("Failed configuring MMC1 card detect\n");

		pdata->slots[0].card_detect_irq = TWL6030_IRQ_BASE +

						MMCDETECT_INTR_OFFSET;

			return irq;

		}

		pdata->slots[0].card_detect_irq = irq;

		pdata->slots[0].card_detect = twl6030_mmc_card_detect;

	}

	return ret;

	return 0;

}



static __init void omap4_twl6030_hsmmc_set_late_init(struct device *dev)

arch/arm/mach-omap2/board-omap4panda.c

+8 −7
Original line number Diff line number Diff line
@@ -238,7 +238,7 @@ struct wl12xx_platform_data omap_panda_wlan_data __initdata = { 


static int omap4_twl6030_hsmmc_late_init(struct device *dev)

{

	int ret = 0;

	int irq = 0;

	struct platform_device *pdev = container_of(dev,

				struct platform_device, dev);

	struct omap_mmc_platform_data *pdata = dev->platform_data;
@@ -249,14 +249,15 @@ static int omap4_twl6030_hsmmc_late_init(struct device *dev) 
	}

	/* Setting MMC1 Card detect Irq */

	if (pdev->id == 0) {

		ret = twl6030_mmc_card_detect_config();

		 if (ret)

		irq = twl6030_mmc_card_detect_config();

		if (irq < 0) {

			dev_err(dev, "%s: Error card detect config(%d)\n",

				__func__, ret);

		 else

				__func__, irq);

			return irq;

		}

		pdata->slots[0].card_detect = twl6030_mmc_card_detect;

	}

	return ret;

	return 0;

}



static __init void omap4_twl6030_hsmmc_set_late_init(struct device *dev)

arch/arm/mach-s3c64xx/mach-crag6410-module.c

+12 −2
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ 
#include <linux/mfd/wm831x/gpio.h>

#include <linux/mfd/wm8994/pdata.h>



#include <linux/regulator/machine.h>



#include <sound/wm5100.h>

#include <sound/wm8996.h>

#include <sound/wm8962.h>
@@ -153,6 +155,14 @@ static const struct i2c_board_info wm1259_devs[] = { 
	},

};



static struct regulator_init_data wm8994_ldo1 = {

	.supply_regulator = "WALLVDD",

};



static struct regulator_init_data wm8994_ldo2 = {

	.supply_regulator = "WALLVDD",

};



static struct wm8994_pdata wm8994_pdata = {

	.gpio_base = CODEC_GPIO_BASE,

	.gpio_defaults = {
@@ -160,8 +170,8 @@ static struct wm8994_pdata wm8994_pdata = { 
	},

	.irq_base = CODEC_IRQ_BASE,

	.ldo = {

		{ .supply = "WALLVDD" },

		{ .supply = "WALLVDD" },

		 { .init_data = &wm8994_ldo1, },

		 { .init_data = &wm8994_ldo2, },

	},

};

arch/arm/mach-ux500/include/mach/irqs-board-mop500.h

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


#define MOP500_AB8500_IRQ_BASE		IRQ_BOARD_START

#define MOP500_AB8500_IRQ_END		(MOP500_AB8500_IRQ_BASE \

					 + AB8500_NR_IRQS)

					 + AB8500_MAX_NR_IRQS)



/* TC35892 */

#define TC35892_NR_INTERNAL_IRQS	8