iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Immutable branch between MFD and [XXX] due for the v5.12 merge window

Browse Source 
-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEdrbJNaO+IJqU8IdIUa+KL4f8d2EFAmAhQaIACgkQUa+KL4f8
 d2EYSA//Vf3UATnocrwDAddWgqG+3XmWqnX6e/6t1XoZ5WxhGHHoVB/VtueZYeQD
 i/lpeHLrcP80oKHXse9t0GSuHvALePJMtmhBRQEMMqcPUsCFUvKmZT3i49luJ+MW
 gsoMvlSN9+THKhLgfs2C5KNpJApp4uOsjvdIGDhsfmcygbM9zow2IgCjsAN7N777
 ahp92H/5caHwB3J+RdHx4EaULcwWStaMucLQgN/Gt0mSX1AuwmyO5d23kghoQWsV
 ABnel8+pOb6baRjdfmCbiRacNicNMjQUmYMRCdv4b/heqNOyRo5P4oMZ434LC0pQ
 I0xQ5hNkdPaFVtmEHJhVdsmK/UbA+w7vfkbpR0BowK46pZzzZ6LUBwPAK1pRbQRf
 VHrKjqUsCxFqvmqDDAXJQZ9Yb3M53Yi4eA801ER/djp2DTR0a3k+d6W6r1akPbpD
 i33205V9oHi3HXcXvFsYNgvloZL59gI5/94mSD6jEr1bq16iOcIbnUf8YGCm7M9S
 rU+WsllQBdmQVxrqTb74xjVFpa/WZMDfKehVAmnTIa0qYRwVKEEme+LVHeeCDtz7
 Us+T9xY0AQUCSA6EhJseTxoEkmMleeTcq+O/4ND0IYAKVpx8vKH3bwZhHE4uzlp4
 TJV8Sf3uIDvKiLcAt4qekEWcVhWYTxS+cY5SpSwMN0vMRMF7qtw=
 =7NVJ
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQEzBAABCgAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAmAhUpYACgkQJNaLcl1U
 h9BUUAf9EfEa5IpiabxFGIG0RKVyapjTTWjUpv1tes0yuroz3ihV6eqt6w1BsCKW
 M5PEQ5PaTs9d4NyoXWYVSEx4dqw1BRVYnZETmVDcSOlJzuFEkw7aK8DPaeG2Q0QC
 x+Cq+NC9GxEl8uJIwHZVLYw1g7+cWDaP7eyyDJ783wiQ3g8Rix1sCzHBPP2RNn6k
 xVuVG1K8jJ1ReiSF9k4cP/Gb+fkWSWYW8iNuMDRkt4Y8jjKSIGdfP+X3PQ5z9OZb
 OLe1gKbpAZ1+jXXWeu3P8cRZk9Hh01sHj1Z4bK4i+3aoKQZrk0eljK1lA5BMZ+ej
 JAHXFyStjY0RGBiMo3ehmotM0FeAVg==
 =G+yK
 -----END PGP SIGNATURE-----

Merge tag 'ib-mfd-asoc-v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd into asoc-5.12

Immutable branch between MFD and [XXX] due for the v5.12 merge window
This commit is contained in:
Mark Brown 2021-02-08 15:02:15 +00:00
commit 017131e056
4 changed files with 141 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/mfd/arizona-core.c
View File

@ -797,17 +797,6 @@ const struct dev_pm_ops arizona_pm_ops = {
EXPORT_SYMBOL_GPL(arizona_pm_ops);
#ifdef CONFIG_OF
unsigned long arizona_of_get_type(struct device *dev)
{
const struct of_device_id *id = of_match_device(arizona_of_match, dev);
if (id)
return (unsigned long)id->data;
else
return 0;
}
EXPORT_SYMBOL_GPL(arizona_of_get_type);
static int arizona_of_get_core_pdata(struct arizona *arizona)
{
struct arizona_pdata *pdata = &arizona->pdata;

11
drivers/mfd/arizona-i2c.c
View File

@ -23,14 +23,16 @@
static int arizona_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id)
{
const void *match_data;
struct arizona *arizona;
const struct regmap_config *regmap_config = NULL;
unsigned long type;
unsigned long type = 0;
int ret;
if (i2c->dev.of_node)
type = arizona_of_get_type(&i2c->dev);
else
match_data = device_get_match_data(&i2c->dev);
if (match_data)
type = (unsigned long)match_data;
else if (id)
type = id->driver_data;
switch (type) {
@ -115,6 +117,7 @@ static struct i2c_driver arizona_i2c_driver = {
module_i2c_driver(arizona_i2c_driver);
MODULE_SOFTDEP("pre: arizona_ldo1");
MODULE_DESCRIPTION("Arizona I2C bus interface");
MODULE_AUTHOR("Mark Brown <broonie@opensource.wolfsonmicro.com>");
MODULE_LICENSE("GPL");

138
drivers/mfd/arizona-spi.c
View File

@ -7,7 +7,10 @@
* Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
*/
#include <linux/acpi.h>
#include <linux/err.h>
#include <linux/gpio/consumer.h>
#include <linux/gpio/machine.h>
#include <linux/module.h>
#include <linux/pm_runtime.h>
#include <linux/regmap.h>
@ -15,22 +18,141 @@
#include <linux/slab.h>
#include <linux/spi/spi.h>
#include <linux/of.h>
#include <uapi/linux/input-event-codes.h>
#include <linux/mfd/arizona/core.h>
#include "arizona.h"
#ifdef CONFIG_ACPI
const struct acpi_gpio_params reset_gpios = { 1, 0, false };
const struct acpi_gpio_params ldoena_gpios = { 2, 0, false };
static const struct acpi_gpio_mapping arizona_acpi_gpios[] = {
{ "reset-gpios", &reset_gpios, 1, },
{ "wlf,ldoena-gpios", &ldoena_gpios, 1 },
{ }
};
/*
* The ACPI resources for the device only describe external GPIO-s. They do
* not provide mappings for the GPIO-s coming from the Arizona codec itself.
*/
static const struct gpiod_lookup arizona_soc_gpios[] = {
{ "arizona", 2, "wlf,spkvdd-ena", 0, GPIO_ACTIVE_HIGH },
{ "arizona", 4, "wlf,micd-pol", 0, GPIO_ACTIVE_LOW },
};
/*
* The AOSP 3.5 mm Headset: Accessory Specification gives the following values:
* Function A Play/Pause: 0 ohm
* Function D Voice assistant: 135 ohm
* Function B Volume Up 240 ohm
* Function C Volume Down 470 ohm
* Minimum Mic DC resistance 1000 ohm
* Minimum Ear speaker impedance 16 ohm
* Note the first max value below must be less then the min. speaker impedance,
* to allow CTIA/OMTP detection to work. The other max values are the closest
* value from extcon-arizona.c:arizona_micd_levels halfway 2 button resistances.
*/
static const struct arizona_micd_range arizona_micd_aosp_ranges[] = {
{ .max = 11, .key = KEY_PLAYPAUSE },
{ .max = 186, .key = KEY_VOICECOMMAND },
{ .max = 348, .key = KEY_VOLUMEUP },
{ .max = 752, .key = KEY_VOLUMEDOWN },
};
static void arizona_spi_acpi_remove_lookup(void *lookup)
{
gpiod_remove_lookup_table(lookup);
}
static int arizona_spi_acpi_probe(struct arizona *arizona)
{
struct gpiod_lookup_table *lookup;
acpi_status status;
int ret;
/* Add mappings for the 2 ACPI declared GPIOs used for reset and ldo-ena */
devm_acpi_dev_add_driver_gpios(arizona->dev, arizona_acpi_gpios);
/* Add lookups for the SoCs own GPIOs used for micdet-polarity and spkVDD-enable */
lookup = devm_kzalloc(arizona->dev,
struct_size(lookup, table, ARRAY_SIZE(arizona_soc_gpios) + 1),
GFP_KERNEL);
if (!lookup)
return -ENOMEM;
lookup->dev_id = dev_name(arizona->dev);
memcpy(lookup->table, arizona_soc_gpios, sizeof(arizona_soc_gpios));
gpiod_add_lookup_table(lookup);
ret = devm_add_action_or_reset(arizona->dev, arizona_spi_acpi_remove_lookup, lookup);
if (ret)
return ret;
/* Enable 32KHz clock from SoC to codec for jack-detect */
status = acpi_evaluate_object(ACPI_HANDLE(arizona->dev), "CLKE", NULL, NULL);
if (ACPI_FAILURE(status))
dev_warn(arizona->dev, "Failed to enable 32KHz clk ACPI error %d\n", status);
/*
* Some DSDTs wrongly declare the IRQ trigger-type as IRQF_TRIGGER_FALLING
* The IRQ line will stay low when a new IRQ event happens between reading
* the IRQ status flags and acknowledging them. When the IRQ line stays
* low like this the IRQ will never trigger again when its type is set
* to IRQF_TRIGGER_FALLING. Correct the IRQ trigger-type to fix this.
*
* Note theoretically it is possible that some boards are not capable
* of handling active low level interrupts. In that case setting the
* flag to IRQF_TRIGGER_FALLING would not be a bug (and we would need
* to work around this) but so far all known usages of IRQF_TRIGGER_FALLING
* are a bug in the board's DSDT.
*/
arizona->pdata.irq_flags = IRQF_TRIGGER_LOW;
/* Wait 200 ms after jack insertion */
arizona->pdata.micd_detect_debounce = 200;
/* Use standard AOSP values for headset-button mappings */
arizona->pdata.micd_ranges = arizona_micd_aosp_ranges;
arizona->pdata.num_micd_ranges = ARRAY_SIZE(arizona_micd_aosp_ranges);
return 0;
}
static const struct acpi_device_id arizona_acpi_match[] = {
{
.id = "WM510204",
.driver_data = WM5102,
},
{
.id = "WM510205",
.driver_data = WM5102,
},
{ }
};
MODULE_DEVICE_TABLE(acpi, arizona_acpi_match);
#else
static int arizona_spi_acpi_probe(struct arizona *arizona)
{
return -ENODEV;
}
#endif
static int arizona_spi_probe(struct spi_device *spi)
{
const struct spi_device_id *id = spi_get_device_id(spi);
const void *match_data;
struct arizona *arizona;
const struct regmap_config *regmap_config = NULL;
unsigned long type;
unsigned long type = 0;
int ret;
if (spi->dev.of_node)
type = arizona_of_get_type(&spi->dev);
else
match_data = device_get_match_data(&spi->dev);
if (match_data)
type = (unsigned long)match_data;
else if (id)
type = id->driver_data;
switch (type) {
@ -75,6 +197,12 @@ static int arizona_spi_probe(struct spi_device *spi)
arizona->dev = &spi->dev;
arizona->irq = spi->irq;
if (has_acpi_companion(&spi->dev)) {
ret = arizona_spi_acpi_probe(arizona);
if (ret)
return ret;
}
return arizona_dev_init(arizona);
}
@ -102,6 +230,7 @@ static struct spi_driver arizona_spi_driver = {
.name = "arizona",
.pm = &arizona_pm_ops,
.of_match_table = of_match_ptr(arizona_of_match),
.acpi_match_table = ACPI_PTR(arizona_acpi_match),
},
.probe = arizona_spi_probe,
.remove = arizona_spi_remove,
@ -110,6 +239,7 @@ static struct spi_driver arizona_spi_driver = {
module_spi_driver(arizona_spi_driver);
MODULE_SOFTDEP("pre: arizona_ldo1");
MODULE_DESCRIPTION("Arizona SPI bus interface");
MODULE_AUTHOR("Mark Brown <broonie@opensource.wolfsonmicro.com>");
MODULE_LICENSE("GPL");

9
drivers/mfd/arizona.h
View File

@ -50,13 +50,4 @@ int arizona_dev_exit(struct arizona *arizona);
int arizona_irq_init(struct arizona *arizona);
int arizona_irq_exit(struct arizona *arizona);
#ifdef CONFIG_OF
unsigned long arizona_of_get_type(struct device *dev);
#else
static inline unsigned long arizona_of_get_type(struct device *dev)
{
return 0;
}
#endif
#endif