mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-21 16:29:59 +00:00
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. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.15 (GNU/Linux) iQIcBAABAgAGBQJSonfpAAoJEIqAPN1PVmxKRJIQAIn5yl5xBiE07Fsme1edUYQK nbSjsbjlGn3/+P3OLpMTVVRJNbgXaDu5XSZBp7r+H3BqEGSiGWqdwLHgfHKrXLuI stqL8WdtA4GHoKl0PTc98KuGkajN6oFJJIA2Urv+wwIwICqDuC4AOQceKk313/gv 0jw315KJLxIjbitNjKBy4Rw6l0IYK2f6NnKXB9tF1Kls1wX6sfreppZiLXOX5Vm9 m30cUc6RWlyOZghjMpmavd8eAxkaIS9M9cfIWPyaJA30ZF9jw4giYL/UtA6q+/q7 1R8wJ6ryQSA+MnTFD8kzYir+c2B6hZxXjyBJGYOQpt+Eg/ogLTI7jezjWWEGNJQ7 HO3eN2It+btWKdS8/YpINMB3mmZmgFiUd2vWbkBph/DvhUBX2/CIq53nHcH+suvt d+C5vke1XMacXgMnXxuhKbk3RBBtBA18voF/7+Q5YmwnCi3QPMkboiTVjwEcpEqX T46ni04xPyyG8eviI6sgCL8XyHFEDvwNi1tA5XM75z4/ARZ+cGsGwVK5yFnSoGnU BS1X7X2e/Tw930rrvVcjATC4P2kz2RSGR5qCgVuEu640YjlFRsI3mfQLHPPwTR/g N+NJTA29CBo8Um/nvesE1wNVUZ1csO+++pySAAltkonOU/jtCqNqOt3orntRxiwC iEFY+z9GRvq221jXgb34 =SF0p -----END PGP SIGNATURE----- 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
This commit is contained in:
commit
32ac486967
3 changed files with 3 additions and 3 deletions
|
@ -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
|
||||
|
|
|
@ -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,
|
||||
},
|
||||
};
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Reference in a new issue