mirror of
https://github.com/torvalds/linux.git
synced 2024-12-15 15:41:58 +00:00
e6b5be2be4
Here's the set of driver core patches for 3.19-rc1. They are dominated by the removal of the .owner field in platform drivers. They touch a lot of files, but they are "simple" changes, just removing a line in a structure. Other than that, a few minor driver core and debugfs changes. There are some ath9k patches coming in through this tree that have been acked by the wireless maintainers as they relied on the debugfs changes. Everything has been in linux-next for a while. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iEYEABECAAYFAlSOD20ACgkQMUfUDdst+ylLPACg2QrW1oHhdTMT9WI8jihlHVRM 53kAoLeteByQ3iVwWurwwseRPiWa8+MI =OVRS -----END PGP SIGNATURE----- Merge tag 'driver-core-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core Pull driver core update from Greg KH: "Here's the set of driver core patches for 3.19-rc1. They are dominated by the removal of the .owner field in platform drivers. They touch a lot of files, but they are "simple" changes, just removing a line in a structure. Other than that, a few minor driver core and debugfs changes. There are some ath9k patches coming in through this tree that have been acked by the wireless maintainers as they relied on the debugfs changes. Everything has been in linux-next for a while" * tag 'driver-core-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (324 commits) Revert "ath: ath9k: use debugfs_create_devm_seqfile() helper for seq_file entries" fs: debugfs: add forward declaration for struct device type firmware class: Deletion of an unnecessary check before the function call "vunmap" firmware loader: fix hung task warning dump devcoredump: provide a one-way disable function device: Add dev_<level>_once variants ath: ath9k: use debugfs_create_devm_seqfile() helper for seq_file entries ath: use seq_file api for ath9k debugfs files debugfs: add helper function to create device related seq_file drivers/base: cacheinfo: remove noisy error boot message Revert "core: platform: add warning if driver has no owner" drivers: base: support cpu cache information interface to userspace via sysfs drivers: base: add cpu_device_create to support per-cpu devices topology: replace custom attribute macros with standard DEVICE_ATTR* cpumask: factor out show_cpumap into separate helper function driver core: Fix unbalanced device reference in drivers_probe driver core: fix race with userland in device_add() sysfs/kernfs: make read requests on pre-alloc files use the buffer. sysfs/kernfs: allow attributes to request write buffer be pre-allocated. fs: sysfs: return EGBIG on write if offset is larger than file size ...
200 lines
5.0 KiB
C
200 lines
5.0 KiB
C
/*
|
|
* wm8994-regulator.c -- Regulator driver for the WM8994
|
|
*
|
|
* Copyright 2009 Wolfson Microelectronics PLC.
|
|
*
|
|
* Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify it
|
|
* under the terms of the GNU General Public License as published by the
|
|
* Free Software Foundation; either version 2 of the License, or (at your
|
|
* option) any later version.
|
|
*/
|
|
|
|
#include <linux/module.h>
|
|
#include <linux/moduleparam.h>
|
|
#include <linux/init.h>
|
|
#include <linux/bitops.h>
|
|
#include <linux/err.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/regulator/driver.h>
|
|
#include <linux/regulator/machine.h>
|
|
#include <linux/gpio.h>
|
|
#include <linux/slab.h>
|
|
|
|
#include <linux/mfd/wm8994/core.h>
|
|
#include <linux/mfd/wm8994/registers.h>
|
|
#include <linux/mfd/wm8994/pdata.h>
|
|
|
|
struct wm8994_ldo {
|
|
struct regulator_dev *regulator;
|
|
struct wm8994 *wm8994;
|
|
struct regulator_consumer_supply supply;
|
|
struct regulator_init_data init_data;
|
|
};
|
|
|
|
#define WM8994_LDO1_MAX_SELECTOR 0x7
|
|
#define WM8994_LDO2_MAX_SELECTOR 0x3
|
|
|
|
static struct regulator_ops wm8994_ldo1_ops = {
|
|
.list_voltage = regulator_list_voltage_linear,
|
|
.map_voltage = regulator_map_voltage_linear,
|
|
.get_voltage_sel = regulator_get_voltage_sel_regmap,
|
|
.set_voltage_sel = regulator_set_voltage_sel_regmap,
|
|
};
|
|
|
|
static int wm8994_ldo2_list_voltage(struct regulator_dev *rdev,
|
|
unsigned int selector)
|
|
{
|
|
struct wm8994_ldo *ldo = rdev_get_drvdata(rdev);
|
|
|
|
if (selector > WM8994_LDO2_MAX_SELECTOR)
|
|
return -EINVAL;
|
|
|
|
switch (ldo->wm8994->type) {
|
|
case WM8994:
|
|
return (selector * 100000) + 900000;
|
|
case WM8958:
|
|
return (selector * 100000) + 1000000;
|
|
case WM1811:
|
|
switch (selector) {
|
|
case 0:
|
|
return -EINVAL;
|
|
default:
|
|
return (selector * 100000) + 950000;
|
|
}
|
|
break;
|
|
default:
|
|
return -EINVAL;
|
|
}
|
|
}
|
|
|
|
static struct regulator_ops wm8994_ldo2_ops = {
|
|
.list_voltage = wm8994_ldo2_list_voltage,
|
|
.get_voltage_sel = regulator_get_voltage_sel_regmap,
|
|
.set_voltage_sel = regulator_set_voltage_sel_regmap,
|
|
};
|
|
|
|
static const struct regulator_desc wm8994_ldo_desc[] = {
|
|
{
|
|
.name = "LDO1",
|
|
.id = 1,
|
|
.type = REGULATOR_VOLTAGE,
|
|
.n_voltages = WM8994_LDO1_MAX_SELECTOR + 1,
|
|
.vsel_reg = WM8994_LDO_1,
|
|
.vsel_mask = WM8994_LDO1_VSEL_MASK,
|
|
.ops = &wm8994_ldo1_ops,
|
|
.min_uV = 2400000,
|
|
.uV_step = 100000,
|
|
.enable_time = 3000,
|
|
.owner = THIS_MODULE,
|
|
},
|
|
{
|
|
.name = "LDO2",
|
|
.id = 2,
|
|
.type = REGULATOR_VOLTAGE,
|
|
.n_voltages = WM8994_LDO2_MAX_SELECTOR + 1,
|
|
.vsel_reg = WM8994_LDO_2,
|
|
.vsel_mask = WM8994_LDO2_VSEL_MASK,
|
|
.ops = &wm8994_ldo2_ops,
|
|
.enable_time = 3000,
|
|
.owner = THIS_MODULE,
|
|
},
|
|
};
|
|
|
|
static const struct regulator_consumer_supply wm8994_ldo_consumer[] = {
|
|
{ .supply = "AVDD1" },
|
|
{ .supply = "DCVDD" },
|
|
};
|
|
|
|
static const struct regulator_init_data wm8994_ldo_default[] = {
|
|
{
|
|
.constraints = {
|
|
.valid_ops_mask = REGULATOR_CHANGE_STATUS,
|
|
},
|
|
.num_consumer_supplies = 1,
|
|
},
|
|
{
|
|
.constraints = {
|
|
.valid_ops_mask = REGULATOR_CHANGE_STATUS,
|
|
},
|
|
.num_consumer_supplies = 1,
|
|
},
|
|
};
|
|
|
|
static int wm8994_ldo_probe(struct platform_device *pdev)
|
|
{
|
|
struct wm8994 *wm8994 = dev_get_drvdata(pdev->dev.parent);
|
|
struct wm8994_pdata *pdata = dev_get_platdata(wm8994->dev);
|
|
int id = pdev->id % ARRAY_SIZE(pdata->ldo);
|
|
struct regulator_config config = { };
|
|
struct wm8994_ldo *ldo;
|
|
int ret;
|
|
|
|
dev_dbg(&pdev->dev, "Probing LDO%d\n", id + 1);
|
|
|
|
ldo = devm_kzalloc(&pdev->dev, sizeof(struct wm8994_ldo), GFP_KERNEL);
|
|
if (!ldo)
|
|
return -ENOMEM;
|
|
|
|
ldo->wm8994 = wm8994;
|
|
ldo->supply = wm8994_ldo_consumer[id];
|
|
ldo->supply.dev_name = dev_name(wm8994->dev);
|
|
|
|
config.dev = wm8994->dev;
|
|
config.driver_data = ldo;
|
|
config.regmap = wm8994->regmap;
|
|
config.init_data = &ldo->init_data;
|
|
if (pdata) {
|
|
config.ena_gpio = pdata->ldo[id].enable;
|
|
} else if (wm8994->dev->of_node) {
|
|
config.ena_gpio = wm8994->pdata.ldo[id].enable;
|
|
config.ena_gpio_initialized = true;
|
|
}
|
|
|
|
/* Use default constraints if none set up */
|
|
if (!pdata || !pdata->ldo[id].init_data || wm8994->dev->of_node) {
|
|
dev_dbg(wm8994->dev, "Using default init data, supply %s %s\n",
|
|
ldo->supply.dev_name, ldo->supply.supply);
|
|
|
|
ldo->init_data = wm8994_ldo_default[id];
|
|
ldo->init_data.consumer_supplies = &ldo->supply;
|
|
if (!config.ena_gpio)
|
|
ldo->init_data.constraints.valid_ops_mask = 0;
|
|
} else {
|
|
ldo->init_data = *pdata->ldo[id].init_data;
|
|
}
|
|
|
|
ldo->regulator = devm_regulator_register(&pdev->dev,
|
|
&wm8994_ldo_desc[id],
|
|
&config);
|
|
if (IS_ERR(ldo->regulator)) {
|
|
ret = PTR_ERR(ldo->regulator);
|
|
dev_err(wm8994->dev, "Failed to register LDO%d: %d\n",
|
|
id + 1, ret);
|
|
goto err;
|
|
}
|
|
|
|
platform_set_drvdata(pdev, ldo);
|
|
|
|
return 0;
|
|
|
|
err:
|
|
return ret;
|
|
}
|
|
|
|
static struct platform_driver wm8994_ldo_driver = {
|
|
.probe = wm8994_ldo_probe,
|
|
.driver = {
|
|
.name = "wm8994-ldo",
|
|
},
|
|
};
|
|
|
|
module_platform_driver(wm8994_ldo_driver);
|
|
|
|
/* Module information */
|
|
MODULE_AUTHOR("Mark Brown <broonie@opensource.wolfsonmicro.com>");
|
|
MODULE_DESCRIPTION("WM8994 LDO driver");
|
|
MODULE_LICENSE("GPL");
|
|
MODULE_ALIAS("platform:wm8994-ldo");
|