mirror of
https://github.com/torvalds/linux.git
synced 2024-12-21 18:42:44 +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 ...
315 lines
7.9 KiB
C
315 lines
7.9 KiB
C
/*
|
|
* arizona-micsupp.c -- Microphone supply for Arizona devices
|
|
*
|
|
* Copyright 2012 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/of.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/regulator/driver.h>
|
|
#include <linux/regulator/machine.h>
|
|
#include <linux/regulator/of_regulator.h>
|
|
#include <linux/gpio.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/workqueue.h>
|
|
#include <sound/soc.h>
|
|
|
|
#include <linux/mfd/arizona/core.h>
|
|
#include <linux/mfd/arizona/pdata.h>
|
|
#include <linux/mfd/arizona/registers.h>
|
|
|
|
struct arizona_micsupp {
|
|
struct regulator_dev *regulator;
|
|
struct arizona *arizona;
|
|
|
|
struct regulator_consumer_supply supply;
|
|
struct regulator_init_data init_data;
|
|
|
|
struct work_struct check_cp_work;
|
|
};
|
|
|
|
static void arizona_micsupp_check_cp(struct work_struct *work)
|
|
{
|
|
struct arizona_micsupp *micsupp =
|
|
container_of(work, struct arizona_micsupp, check_cp_work);
|
|
struct snd_soc_dapm_context *dapm = micsupp->arizona->dapm;
|
|
struct arizona *arizona = micsupp->arizona;
|
|
struct regmap *regmap = arizona->regmap;
|
|
unsigned int reg;
|
|
int ret;
|
|
|
|
ret = regmap_read(regmap, ARIZONA_MIC_CHARGE_PUMP_1, ®);
|
|
if (ret != 0) {
|
|
dev_err(arizona->dev, "Failed to read CP state: %d\n", ret);
|
|
return;
|
|
}
|
|
|
|
if (dapm) {
|
|
if ((reg & (ARIZONA_CPMIC_ENA | ARIZONA_CPMIC_BYPASS)) ==
|
|
ARIZONA_CPMIC_ENA)
|
|
snd_soc_dapm_force_enable_pin(dapm, "MICSUPP");
|
|
else
|
|
snd_soc_dapm_disable_pin(dapm, "MICSUPP");
|
|
|
|
snd_soc_dapm_sync(dapm);
|
|
}
|
|
}
|
|
|
|
static int arizona_micsupp_enable(struct regulator_dev *rdev)
|
|
{
|
|
struct arizona_micsupp *micsupp = rdev_get_drvdata(rdev);
|
|
int ret;
|
|
|
|
ret = regulator_enable_regmap(rdev);
|
|
|
|
if (ret == 0)
|
|
schedule_work(&micsupp->check_cp_work);
|
|
|
|
return ret;
|
|
}
|
|
|
|
static int arizona_micsupp_disable(struct regulator_dev *rdev)
|
|
{
|
|
struct arizona_micsupp *micsupp = rdev_get_drvdata(rdev);
|
|
int ret;
|
|
|
|
ret = regulator_disable_regmap(rdev);
|
|
if (ret == 0)
|
|
schedule_work(&micsupp->check_cp_work);
|
|
|
|
return ret;
|
|
}
|
|
|
|
static int arizona_micsupp_set_bypass(struct regulator_dev *rdev, bool ena)
|
|
{
|
|
struct arizona_micsupp *micsupp = rdev_get_drvdata(rdev);
|
|
int ret;
|
|
|
|
ret = regulator_set_bypass_regmap(rdev, ena);
|
|
if (ret == 0)
|
|
schedule_work(&micsupp->check_cp_work);
|
|
|
|
return ret;
|
|
}
|
|
|
|
static struct regulator_ops arizona_micsupp_ops = {
|
|
.enable = arizona_micsupp_enable,
|
|
.disable = arizona_micsupp_disable,
|
|
.is_enabled = regulator_is_enabled_regmap,
|
|
|
|
.list_voltage = regulator_list_voltage_linear_range,
|
|
.map_voltage = regulator_map_voltage_linear_range,
|
|
|
|
.get_voltage_sel = regulator_get_voltage_sel_regmap,
|
|
.set_voltage_sel = regulator_set_voltage_sel_regmap,
|
|
|
|
.get_bypass = regulator_get_bypass_regmap,
|
|
.set_bypass = arizona_micsupp_set_bypass,
|
|
};
|
|
|
|
static const struct regulator_linear_range arizona_micsupp_ranges[] = {
|
|
REGULATOR_LINEAR_RANGE(1700000, 0, 0x1e, 50000),
|
|
REGULATOR_LINEAR_RANGE(3300000, 0x1f, 0x1f, 0),
|
|
};
|
|
|
|
static const struct regulator_desc arizona_micsupp = {
|
|
.name = "MICVDD",
|
|
.supply_name = "CPVDD",
|
|
.type = REGULATOR_VOLTAGE,
|
|
.n_voltages = 32,
|
|
.ops = &arizona_micsupp_ops,
|
|
|
|
.vsel_reg = ARIZONA_LDO2_CONTROL_1,
|
|
.vsel_mask = ARIZONA_LDO2_VSEL_MASK,
|
|
.enable_reg = ARIZONA_MIC_CHARGE_PUMP_1,
|
|
.enable_mask = ARIZONA_CPMIC_ENA,
|
|
.bypass_reg = ARIZONA_MIC_CHARGE_PUMP_1,
|
|
.bypass_mask = ARIZONA_CPMIC_BYPASS,
|
|
|
|
.linear_ranges = arizona_micsupp_ranges,
|
|
.n_linear_ranges = ARRAY_SIZE(arizona_micsupp_ranges),
|
|
|
|
.enable_time = 3000,
|
|
|
|
.owner = THIS_MODULE,
|
|
};
|
|
|
|
static const struct regulator_linear_range arizona_micsupp_ext_ranges[] = {
|
|
REGULATOR_LINEAR_RANGE(900000, 0, 0x14, 25000),
|
|
REGULATOR_LINEAR_RANGE(1500000, 0x15, 0x27, 100000),
|
|
};
|
|
|
|
static const struct regulator_desc arizona_micsupp_ext = {
|
|
.name = "MICVDD",
|
|
.supply_name = "CPVDD",
|
|
.type = REGULATOR_VOLTAGE,
|
|
.n_voltages = 40,
|
|
.ops = &arizona_micsupp_ops,
|
|
|
|
.vsel_reg = ARIZONA_LDO2_CONTROL_1,
|
|
.vsel_mask = ARIZONA_LDO2_VSEL_MASK,
|
|
.enable_reg = ARIZONA_MIC_CHARGE_PUMP_1,
|
|
.enable_mask = ARIZONA_CPMIC_ENA,
|
|
.bypass_reg = ARIZONA_MIC_CHARGE_PUMP_1,
|
|
.bypass_mask = ARIZONA_CPMIC_BYPASS,
|
|
|
|
.linear_ranges = arizona_micsupp_ext_ranges,
|
|
.n_linear_ranges = ARRAY_SIZE(arizona_micsupp_ext_ranges),
|
|
|
|
.enable_time = 3000,
|
|
|
|
.owner = THIS_MODULE,
|
|
};
|
|
|
|
static const struct regulator_init_data arizona_micsupp_default = {
|
|
.constraints = {
|
|
.valid_ops_mask = REGULATOR_CHANGE_STATUS |
|
|
REGULATOR_CHANGE_VOLTAGE |
|
|
REGULATOR_CHANGE_BYPASS,
|
|
.min_uV = 1700000,
|
|
.max_uV = 3300000,
|
|
},
|
|
|
|
.num_consumer_supplies = 1,
|
|
};
|
|
|
|
static const struct regulator_init_data arizona_micsupp_ext_default = {
|
|
.constraints = {
|
|
.valid_ops_mask = REGULATOR_CHANGE_STATUS |
|
|
REGULATOR_CHANGE_VOLTAGE |
|
|
REGULATOR_CHANGE_BYPASS,
|
|
.min_uV = 900000,
|
|
.max_uV = 3300000,
|
|
},
|
|
|
|
.num_consumer_supplies = 1,
|
|
};
|
|
|
|
static int arizona_micsupp_of_get_pdata(struct arizona *arizona,
|
|
struct regulator_config *config,
|
|
const struct regulator_desc *desc)
|
|
{
|
|
struct arizona_pdata *pdata = &arizona->pdata;
|
|
struct arizona_micsupp *micsupp = config->driver_data;
|
|
struct device_node *np;
|
|
struct regulator_init_data *init_data;
|
|
|
|
np = of_get_child_by_name(arizona->dev->of_node, "micvdd");
|
|
|
|
if (np) {
|
|
config->of_node = np;
|
|
|
|
init_data = of_get_regulator_init_data(arizona->dev, np, desc);
|
|
|
|
if (init_data) {
|
|
init_data->consumer_supplies = &micsupp->supply;
|
|
init_data->num_consumer_supplies = 1;
|
|
|
|
pdata->micvdd = init_data;
|
|
}
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int arizona_micsupp_probe(struct platform_device *pdev)
|
|
{
|
|
struct arizona *arizona = dev_get_drvdata(pdev->dev.parent);
|
|
const struct regulator_desc *desc;
|
|
struct regulator_config config = { };
|
|
struct arizona_micsupp *micsupp;
|
|
int ret;
|
|
|
|
micsupp = devm_kzalloc(&pdev->dev, sizeof(*micsupp), GFP_KERNEL);
|
|
if (!micsupp)
|
|
return -ENOMEM;
|
|
|
|
micsupp->arizona = arizona;
|
|
INIT_WORK(&micsupp->check_cp_work, arizona_micsupp_check_cp);
|
|
|
|
/*
|
|
* Since the chip usually supplies itself we provide some
|
|
* default init_data for it. This will be overridden with
|
|
* platform data if provided.
|
|
*/
|
|
switch (arizona->type) {
|
|
case WM5110:
|
|
desc = &arizona_micsupp_ext;
|
|
micsupp->init_data = arizona_micsupp_ext_default;
|
|
break;
|
|
default:
|
|
desc = &arizona_micsupp;
|
|
micsupp->init_data = arizona_micsupp_default;
|
|
break;
|
|
}
|
|
|
|
micsupp->init_data.consumer_supplies = &micsupp->supply;
|
|
micsupp->supply.supply = "MICVDD";
|
|
micsupp->supply.dev_name = dev_name(arizona->dev);
|
|
|
|
config.dev = arizona->dev;
|
|
config.driver_data = micsupp;
|
|
config.regmap = arizona->regmap;
|
|
|
|
if (IS_ENABLED(CONFIG_OF)) {
|
|
if (!dev_get_platdata(arizona->dev)) {
|
|
ret = arizona_micsupp_of_get_pdata(arizona, &config,
|
|
desc);
|
|
if (ret < 0)
|
|
return ret;
|
|
}
|
|
}
|
|
|
|
if (arizona->pdata.micvdd)
|
|
config.init_data = arizona->pdata.micvdd;
|
|
else
|
|
config.init_data = &micsupp->init_data;
|
|
|
|
/* Default to regulated mode until the API supports bypass */
|
|
regmap_update_bits(arizona->regmap, ARIZONA_MIC_CHARGE_PUMP_1,
|
|
ARIZONA_CPMIC_BYPASS, 0);
|
|
|
|
micsupp->regulator = devm_regulator_register(&pdev->dev,
|
|
desc,
|
|
&config);
|
|
if (IS_ERR(micsupp->regulator)) {
|
|
ret = PTR_ERR(micsupp->regulator);
|
|
dev_err(arizona->dev, "Failed to register mic supply: %d\n",
|
|
ret);
|
|
return ret;
|
|
}
|
|
|
|
of_node_put(config.of_node);
|
|
|
|
platform_set_drvdata(pdev, micsupp);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static struct platform_driver arizona_micsupp_driver = {
|
|
.probe = arizona_micsupp_probe,
|
|
.driver = {
|
|
.name = "arizona-micsupp",
|
|
},
|
|
};
|
|
|
|
module_platform_driver(arizona_micsupp_driver);
|
|
|
|
/* Module information */
|
|
MODULE_AUTHOR("Mark Brown <broonie@opensource.wolfsonmicro.com>");
|
|
MODULE_DESCRIPTION("Arizona microphone supply driver");
|
|
MODULE_LICENSE("GPL");
|
|
MODULE_ALIAS("platform:arizona-micsupp");
|