2dfea3803d
We have several new drivers, most of the time coming with their sub devices drivers: - Austria Microsystem's AS3711 - Nano River's viperboard - TI's TPS80031, AM335x TS/ADC, - Realtek's MMC/memstick card reader - Nokia's retu We also got some notable cleanups and improvements: - tps6586x got converted to IRQ domains. - tps65910 and tps65090 moved to the regmap IRQ API. - STMPE is now Device Tree aware. - A general twl6040 and twl-core cleanup, with moves to the regmap I/O and IRQ APIs and a conversion to the recently added PWM framework. - sta2x11 gained regmap support. Then the rest is mostly tiny cleanups and fixes, among which we have Mark's wm5xxx and wm8xxx patchset. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQIcBAABAgAGBQJQznPnAAoJEIqAPN1PVmxKuA8P/0nOJduXFM1c0Gy+DD5DnJnG cXzzeSTV8iO3a3sHIye43QPJ5V2YUR5uxLTUEOo/G7my/MoZ/azeNidkUD3qLVlm wVIq35lcS8dWTZaY7nlpBcWc6e39UB0sEueuJNxyhOv5lnMKdi2tAow5f4vIRQnd Q67/EbrgqdltcOpGmVuCdQcvphvWgy+K65jzbJG5zXs7hGX13Q+M5RnYhx76kc8f TDd0APZ71n5/RyISFSBSu2vfl2kES6o47aMgqqXMEHri6d3puAaXM0rFoMzXg/4G eBdxndN25H7rW7xvt9tuUod2rn1AO7tif5d7jal3Cfj61y3iqKY30yb3OzS9XQXH 9WZ2qDst11zvzQivxIkMGvfRXRfncNLWR4DrBSqVfSbYV2uQj2eS8C6ONwKVMXsQ 5tjNp91PFqN19sWQjIjSMcrNswxgpvdQ9mqFTyOGmISbqrpPSTi+MuO8r9+xTfUF PnzUX2nVOW/i9NcI7uotjzh8jiw6t8XMVHhkehiSYR9hzCb6MaPsFPN4jWq9XA2m 1htCHylNpHqHQ3Mup7Is6j0Li1ahdwfm4lbrgiVEA4t4Mqs5E/Ka+3V8laNAKylW PfCP/VmnJYzmgVTK/qobFNeKzRqR0i4WTL6T7oAxGL87Q4TJaqKpEkXWne8UXV+Q yIbN0fmWfCveCetM+vaf =F790 -----END PGP SIGNATURE----- Merge tag 'mfd-3.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6 Pull MFS update from Samuel Ortiz: "This is the MFD patch set for the 3.8 merge window. We have several new drivers, most of the time coming with their sub devices drivers: - Austria Microsystem's AS3711 - Nano River's viperboard - TI's TPS80031, AM335x TS/ADC, - Realtek's MMC/memstick card reader - Nokia's retu We also got some notable cleanups and improvements: - tps6586x got converted to IRQ domains. - tps65910 and tps65090 moved to the regmap IRQ API. - STMPE is now Device Tree aware. - A general twl6040 and twl-core cleanup, with moves to the regmap I/O and IRQ APIs and a conversion to the recently added PWM framework. - sta2x11 gained regmap support. Then the rest is mostly tiny cleanups and fixes, among which we have Mark's wm5xxx and wm8xxx patchset." Far amount of annoying but largely trivial conflicts. Many due to __devinit/exit removal, others due to one or two of the new drivers also having come in through another tree. * tag 'mfd-3.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6: (119 commits) mfd: tps6507x: Convert to devm_kzalloc mfd: stmpe: Update DT support for stmpe driver mfd: wm5102: Add readback of DSP status 3 register mfd: arizona: Log if we fail to create the primary IRQ domain mfd: tps80031: MFD_TPS80031 needs to select REGMAP_IRQ mfd: tps80031: Add terminating entry for tps80031_id_table mfd: sta2x11: Fix potential NULL pointer dereference in __sta2x11_mfd_mask() mfd: wm5102: Add tuning for revision B mfd: arizona: Defer patch initialistation until after first device boot mfd: tps65910: Fix wrong ack_base register mfd: tps65910: Remove unused data mfd: stmpe: Get rid of irq_invert_polarity mfd: ab8500-core: Fix invalid free of devm_ allocated data mfd: wm5102: Mark DSP memory regions as volatile mfd: wm5102: Correct default for LDO1_CONTROL_2 mfd: arizona: Register haptics devices mfd: wm8994: Make current device behaviour the default mfd: tps65090: MFD_TPS65090 needs to select REGMAP_IRQ mfd: Fix stmpe.c build when OF is not enabled mfd: jz4740-adc: Use devm_kzalloc ...
311 lines
7.2 KiB
C
311 lines
7.2 KiB
C
/*
|
|
* Arizona interrupt support
|
|
*
|
|
* 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 version 2 as
|
|
* published by the Free Software Foundation.
|
|
*/
|
|
|
|
#include <linux/delay.h>
|
|
#include <linux/gpio.h>
|
|
#include <linux/interrupt.h>
|
|
#include <linux/irq.h>
|
|
#include <linux/irqdomain.h>
|
|
#include <linux/module.h>
|
|
#include <linux/pm_runtime.h>
|
|
#include <linux/regmap.h>
|
|
#include <linux/regulator/consumer.h>
|
|
#include <linux/slab.h>
|
|
|
|
#include <linux/mfd/arizona/core.h>
|
|
#include <linux/mfd/arizona/registers.h>
|
|
|
|
#include "arizona.h"
|
|
|
|
static int arizona_map_irq(struct arizona *arizona, int irq)
|
|
{
|
|
int ret;
|
|
|
|
ret = regmap_irq_get_virq(arizona->aod_irq_chip, irq);
|
|
if (ret < 0)
|
|
ret = regmap_irq_get_virq(arizona->irq_chip, irq);
|
|
|
|
return ret;
|
|
}
|
|
|
|
int arizona_request_irq(struct arizona *arizona, int irq, char *name,
|
|
irq_handler_t handler, void *data)
|
|
{
|
|
irq = arizona_map_irq(arizona, irq);
|
|
if (irq < 0)
|
|
return irq;
|
|
|
|
return request_threaded_irq(irq, NULL, handler, IRQF_ONESHOT,
|
|
name, data);
|
|
}
|
|
EXPORT_SYMBOL_GPL(arizona_request_irq);
|
|
|
|
void arizona_free_irq(struct arizona *arizona, int irq, void *data)
|
|
{
|
|
irq = arizona_map_irq(arizona, irq);
|
|
if (irq < 0)
|
|
return;
|
|
|
|
free_irq(irq, data);
|
|
}
|
|
EXPORT_SYMBOL_GPL(arizona_free_irq);
|
|
|
|
int arizona_set_irq_wake(struct arizona *arizona, int irq, int on)
|
|
{
|
|
irq = arizona_map_irq(arizona, irq);
|
|
if (irq < 0)
|
|
return irq;
|
|
|
|
return irq_set_irq_wake(irq, on);
|
|
}
|
|
EXPORT_SYMBOL_GPL(arizona_set_irq_wake);
|
|
|
|
static irqreturn_t arizona_boot_done(int irq, void *data)
|
|
{
|
|
struct arizona *arizona = data;
|
|
|
|
dev_dbg(arizona->dev, "Boot done\n");
|
|
|
|
return IRQ_HANDLED;
|
|
}
|
|
|
|
static irqreturn_t arizona_ctrlif_err(int irq, void *data)
|
|
{
|
|
struct arizona *arizona = data;
|
|
|
|
/*
|
|
* For pretty much all potential sources a register cache sync
|
|
* won't help, we've just got a software bug somewhere.
|
|
*/
|
|
dev_err(arizona->dev, "Control interface error\n");
|
|
|
|
return IRQ_HANDLED;
|
|
}
|
|
|
|
static irqreturn_t arizona_irq_thread(int irq, void *data)
|
|
{
|
|
struct arizona *arizona = data;
|
|
unsigned int val;
|
|
int ret;
|
|
|
|
ret = pm_runtime_get_sync(arizona->dev);
|
|
if (ret < 0) {
|
|
dev_err(arizona->dev, "Failed to resume device: %d\n", ret);
|
|
return IRQ_NONE;
|
|
}
|
|
|
|
/* Always handle the AoD domain */
|
|
handle_nested_irq(irq_find_mapping(arizona->virq, 0));
|
|
|
|
/*
|
|
* Check if one of the main interrupts is asserted and only
|
|
* check that domain if it is.
|
|
*/
|
|
ret = regmap_read(arizona->regmap, ARIZONA_IRQ_PIN_STATUS, &val);
|
|
if (ret == 0 && val & ARIZONA_IRQ1_STS) {
|
|
handle_nested_irq(irq_find_mapping(arizona->virq, 1));
|
|
} else if (ret != 0) {
|
|
dev_err(arizona->dev, "Failed to read main IRQ status: %d\n",
|
|
ret);
|
|
}
|
|
|
|
pm_runtime_mark_last_busy(arizona->dev);
|
|
pm_runtime_put_autosuspend(arizona->dev);
|
|
|
|
return IRQ_HANDLED;
|
|
}
|
|
|
|
static void arizona_irq_enable(struct irq_data *data)
|
|
{
|
|
}
|
|
|
|
static void arizona_irq_disable(struct irq_data *data)
|
|
{
|
|
}
|
|
|
|
static struct irq_chip arizona_irq_chip = {
|
|
.name = "arizona",
|
|
.irq_disable = arizona_irq_disable,
|
|
.irq_enable = arizona_irq_enable,
|
|
};
|
|
|
|
static int arizona_irq_map(struct irq_domain *h, unsigned int virq,
|
|
irq_hw_number_t hw)
|
|
{
|
|
struct regmap_irq_chip_data *data = h->host_data;
|
|
|
|
irq_set_chip_data(virq, data);
|
|
irq_set_chip_and_handler(virq, &arizona_irq_chip, handle_edge_irq);
|
|
irq_set_nested_thread(virq, 1);
|
|
|
|
/* ARM needs us to explicitly flag the IRQ as valid
|
|
* and will set them noprobe when we do so. */
|
|
#ifdef CONFIG_ARM
|
|
set_irq_flags(virq, IRQF_VALID);
|
|
#else
|
|
irq_set_noprobe(virq);
|
|
#endif
|
|
|
|
return 0;
|
|
}
|
|
|
|
static struct irq_domain_ops arizona_domain_ops = {
|
|
.map = arizona_irq_map,
|
|
.xlate = irq_domain_xlate_twocell,
|
|
};
|
|
|
|
int arizona_irq_init(struct arizona *arizona)
|
|
{
|
|
int flags = IRQF_ONESHOT;
|
|
int ret, i;
|
|
const struct regmap_irq_chip *aod, *irq;
|
|
bool ctrlif_error = true;
|
|
|
|
switch (arizona->type) {
|
|
#ifdef CONFIG_MFD_WM5102
|
|
case WM5102:
|
|
aod = &wm5102_aod;
|
|
irq = &wm5102_irq;
|
|
|
|
switch (arizona->rev) {
|
|
case 0:
|
|
case 1:
|
|
ctrlif_error = false;
|
|
break;
|
|
default:
|
|
break;
|
|
}
|
|
break;
|
|
#endif
|
|
#ifdef CONFIG_MFD_WM5110
|
|
case WM5110:
|
|
aod = &wm5110_aod;
|
|
irq = &wm5110_irq;
|
|
|
|
switch (arizona->rev) {
|
|
case 0:
|
|
case 1:
|
|
ctrlif_error = false;
|
|
break;
|
|
default:
|
|
break;
|
|
}
|
|
break;
|
|
#endif
|
|
default:
|
|
BUG_ON("Unknown Arizona class device" == NULL);
|
|
return -EINVAL;
|
|
}
|
|
|
|
if (arizona->pdata.irq_active_high) {
|
|
ret = regmap_update_bits(arizona->regmap, ARIZONA_IRQ_CTRL_1,
|
|
ARIZONA_IRQ_POL, 0);
|
|
if (ret != 0) {
|
|
dev_err(arizona->dev, "Couldn't set IRQ polarity: %d\n",
|
|
ret);
|
|
goto err;
|
|
}
|
|
|
|
flags |= IRQF_TRIGGER_HIGH;
|
|
} else {
|
|
flags |= IRQF_TRIGGER_LOW;
|
|
}
|
|
|
|
/* Allocate a virtual IRQ domain to distribute to the regmap domains */
|
|
arizona->virq = irq_domain_add_linear(NULL, 2, &arizona_domain_ops,
|
|
arizona);
|
|
if (!arizona->virq) {
|
|
dev_err(arizona->dev, "Failed to add core IRQ domain\n");
|
|
ret = -EINVAL;
|
|
goto err;
|
|
}
|
|
|
|
ret = regmap_add_irq_chip(arizona->regmap,
|
|
irq_create_mapping(arizona->virq, 0),
|
|
IRQF_ONESHOT, -1, aod,
|
|
&arizona->aod_irq_chip);
|
|
if (ret != 0) {
|
|
dev_err(arizona->dev, "Failed to add AOD IRQs: %d\n", ret);
|
|
goto err_domain;
|
|
}
|
|
|
|
ret = regmap_add_irq_chip(arizona->regmap,
|
|
irq_create_mapping(arizona->virq, 1),
|
|
IRQF_ONESHOT, -1, irq,
|
|
&arizona->irq_chip);
|
|
if (ret != 0) {
|
|
dev_err(arizona->dev, "Failed to add AOD IRQs: %d\n", ret);
|
|
goto err_aod;
|
|
}
|
|
|
|
/* Make sure the boot done IRQ is unmasked for resumes */
|
|
i = arizona_map_irq(arizona, ARIZONA_IRQ_BOOT_DONE);
|
|
ret = request_threaded_irq(i, NULL, arizona_boot_done, IRQF_ONESHOT,
|
|
"Boot done", arizona);
|
|
if (ret != 0) {
|
|
dev_err(arizona->dev, "Failed to request boot done %d: %d\n",
|
|
arizona->irq, ret);
|
|
goto err_boot_done;
|
|
}
|
|
|
|
/* Handle control interface errors in the core */
|
|
if (ctrlif_error) {
|
|
i = arizona_map_irq(arizona, ARIZONA_IRQ_CTRLIF_ERR);
|
|
ret = request_threaded_irq(i, NULL, arizona_ctrlif_err,
|
|
IRQF_ONESHOT,
|
|
"Control interface error", arizona);
|
|
if (ret != 0) {
|
|
dev_err(arizona->dev,
|
|
"Failed to request CTRLIF_ERR %d: %d\n",
|
|
arizona->irq, ret);
|
|
goto err_ctrlif;
|
|
}
|
|
}
|
|
|
|
ret = request_threaded_irq(arizona->irq, NULL, arizona_irq_thread,
|
|
flags, "arizona", arizona);
|
|
|
|
if (ret != 0) {
|
|
dev_err(arizona->dev, "Failed to request IRQ %d: %d\n",
|
|
arizona->irq, ret);
|
|
goto err_main_irq;
|
|
}
|
|
|
|
return 0;
|
|
|
|
err_main_irq:
|
|
free_irq(arizona_map_irq(arizona, ARIZONA_IRQ_CTRLIF_ERR), arizona);
|
|
err_ctrlif:
|
|
free_irq(arizona_map_irq(arizona, ARIZONA_IRQ_BOOT_DONE), arizona);
|
|
err_boot_done:
|
|
regmap_del_irq_chip(irq_create_mapping(arizona->virq, 1),
|
|
arizona->irq_chip);
|
|
err_aod:
|
|
regmap_del_irq_chip(irq_create_mapping(arizona->virq, 0),
|
|
arizona->aod_irq_chip);
|
|
err_domain:
|
|
err:
|
|
return ret;
|
|
}
|
|
|
|
int arizona_irq_exit(struct arizona *arizona)
|
|
{
|
|
free_irq(arizona_map_irq(arizona, ARIZONA_IRQ_CTRLIF_ERR), arizona);
|
|
free_irq(arizona_map_irq(arizona, ARIZONA_IRQ_BOOT_DONE), arizona);
|
|
regmap_del_irq_chip(irq_create_mapping(arizona->virq, 1),
|
|
arizona->irq_chip);
|
|
regmap_del_irq_chip(irq_create_mapping(arizona->virq, 0),
|
|
arizona->aod_irq_chip);
|
|
free_irq(arizona->irq, arizona);
|
|
|
|
return 0;
|
|
}
|