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

Commit 32ac4869 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mfd-fixes-3.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-fixes 

Pull mfd fixes from Samuel Ortiz:
 "This is the first 3.13 pull request for MFD fixes.  We have:

   - A ti-ssp build failure fix
   - An as3722 build failure fix
   - An lpc_ich copy paste error fix"

* tag 'mfd-fixes-3.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-fixes:
  mfd: lpc_ich: Fix Wildcat Point info name field
  mfd: ti-ssp: Fix build
  mfd: Make MFD_AS3722 depend on I2C=y
parents 77bd2adb 88ec6a4d

drivers/mfd/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ config MFD_AS3722 
	select MFD_CORE

	select REGMAP_I2C

	select REGMAP_IRQ

	depends on I2C && OF

	depends on I2C=y && OF

	help

	  The ams AS3722 is a compact system PMU suitable for mobile phones,

	  tablets etc. It has 4 DC/DC step-down regulators, 3 DC/DC step-down

drivers/mfd/lpc_ich.c

+1 −1
Original line number Diff line number Diff line
@@ -506,7 +506,7 @@ static struct lpc_ich_info lpc_chipset_info[] = { 
		.iTCO_version = 2,

	},

	[LPC_WPT_LP] = {

		.name = "Lynx Point_LP",

		.name = "Wildcat Point_LP",

		.iTCO_version = 2,

	},

};

drivers/mfd/ti-ssp.c

+1 −1
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
#include <linux/platform_device.h>

#include <linux/delay.h>

#include <linux/io.h>

#include <linux/sched.h>

#include <linux/mfd/core.h>

#include <linux/mfd/ti_ssp.h>
@@ -409,7 +410,6 @@ static int ti_ssp_probe(struct platform_device *pdev) 
		cells[id].id		= id;

		cells[id].name		= data->dev_name;

		cells[id].platform_data	= data->pdata;

		cells[id].data_size	= data->pdata_size;

	}



	error = mfd_add_devices(dev, 0, cells, 2, NULL, 0, NULL);