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

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6 

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6: (73 commits)
  power: Revert "power_supply: Mark twl4030_charger as broken"
  mfd: Fix a memory leak when unload mc13xxx-core module
  mfd: Fix resource reclaim for max8998
  mfd: Remove unneeded ret value checking for max8998 register updates
  mfd: Add free max8998->ono irq in max8998_irq_exit()
  mfd: Fix resource reclaim in pcf50633_remove()
  omap4: pandaboard: fix up mmc card detect logic
  mfd: Fix ezx_pcap_probe error path
  mfd: Fix off-by-one value range checking for tps6507x
  mfd: Remove __devinitdata from tc6393xb_mmc_resources
  mfd: Add WM831x SPI support
  mfd: Factor out WM831x I2C I/O from the core driver
  mfd: Remove DEBUG defines from mc13xxx-core
  mfd: Fix jz4740_adc_set_enabled
  mfd: Add TPS658621C device ID
  mfd: Fix twl-irq function declaration warnings
  regulator: max8998 BUCK1/2 voltage change with use of GPIOs
  mfd: Voltages and GPIOs platform_data definitions for max8998
  regulator: max8998 BUCK1/2 internal voltages and indexes defined
  mfd: Support for ICs compliant with max8998
  ...
parents a0cadc27 0f482857

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

+6 −1
Original line number Diff line number Diff line
@@ -269,9 +269,14 @@ static int omap4_twl6030_hsmmc_late_init(struct device *dev) 
	struct omap_mmc_platform_data *pdata = dev->platform_data;



	/* Setting MMC1 Card detect Irq */

	if (pdev->id == 0)

	if (pdev->id == 0) {

		ret = twl6030_mmc_card_detect_config();

		if (ret)

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

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

						MMCDETECT_INTR_OFFSET;

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

	}

	return ret;

}

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

+12 −3
Original line number Diff line number Diff line
@@ -160,10 +160,19 @@ static int omap4_twl6030_hsmmc_late_init(struct device *dev) 
				struct platform_device, dev);

	struct omap_mmc_platform_data *pdata = dev->platform_data;



	if (!pdata) {

		dev_err(dev, "%s: NULL platform data\n", __func__);

		return -EINVAL;

	}

	/* Setting MMC1 Card detect Irq */

	if (pdev->id == 0)

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

						MMCDETECT_INTR_OFFSET;

	if (pdev->id == 0) {

		ret = twl6030_mmc_card_detect_config();

		 if (ret)

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

				__func__, ret);

		 else

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

	}

	return ret;

}

arch/arm/mach-s3c64xx/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -185,6 +185,7 @@ config SMDK6410_WM1192_EV1 
	select REGULATOR_WM831X

	select S3C24XX_GPIO_EXTRA64

	select MFD_WM831X

	select MFD_WM831X_I2C

	help

	  The Wolfson Microelectronics 1192-EV1 is a WM831x based PMIC

	  daughtercard for the Samsung SMDK6410 reference platform.

arch/arm/mach-shmobile/board-ap4evb.c

+19 −0
Original line number Diff line number Diff line
@@ -235,6 +235,18 @@ static struct platform_device smc911x_device = { 
	},

};



/*

 * The card detect pin of the top SD/MMC slot (CN7) is active low and is

 * connected to GPIO A22 of SH7372 (GPIO_PORT41).

 */

static int slot_cn7_get_cd(struct platform_device *pdev)

{

	if (gpio_is_valid(GPIO_PORT41))

		return !gpio_get_value(GPIO_PORT41);

	else

		return -ENXIO;

}



/* SH_MMCIF */

static struct resource sh_mmcif_resources[] = {

	[0] = {
@@ -261,6 +273,7 @@ static struct sh_mmcif_plat_data sh_mmcif_plat = { 
	.caps		= MMC_CAP_4_BIT_DATA |

			  MMC_CAP_8_BIT_DATA |

			  MMC_CAP_NEEDS_POLL,

	.get_cd		= slot_cn7_get_cd,

};



static struct platform_device sh_mmcif_device = {
@@ -310,6 +323,8 @@ static struct sh_mobile_sdhi_info sdhi1_info = { 
	.dma_slave_rx	= SHDMA_SLAVE_SDHI1_RX,

	.tmio_ocr_mask	= MMC_VDD_165_195,

	.tmio_flags	= TMIO_MMC_WRPROTECT_DISABLE,

	.tmio_caps	= MMC_CAP_NEEDS_POLL,

	.get_cd		= slot_cn7_get_cd,

};



static struct resource sdhi1_resources[] = {
@@ -948,6 +963,10 @@ static void __init ap4evb_init(void) 
	gpio_no_direction(GPIO_PORT9CR);  /* FSIAOBT needs no direction */

	gpio_no_direction(GPIO_PORT10CR); /* FSIAOLR needs no direction */



	/* card detect pin for MMC slot (CN7) */

	gpio_request(GPIO_PORT41, NULL);

	gpio_direction_input(GPIO_PORT41);



	/* set SPU2 clock to 119.6 MHz */

	clk = clk_get(NULL, "spu_clk");

	if (!IS_ERR(clk)) {

drivers/gpio/Kconfig

+12 −0
Original line number Diff line number Diff line
@@ -116,6 +116,18 @@ config GPIO_SCH 
	  This driver can also be built as a module. If so, the module

	  will be called sch-gpio.



config GPIO_VX855

	tristate "VIA VX855/VX875 GPIO"

	depends on GPIOLIB

	select MFD_CORE

	select MFD_VX855

	help

	  Support access to the VX855/VX875 GPIO lines through the gpio library.



	  This driver provides common support for accessing the device,

	  additional drivers must be enabled in order to use the

	  functionality of the device.



comment "I2C GPIO expanders:"



config GPIO_MAX7300

CRA Git | Maintained and supported by SUSTech CRA and CCSE