From patchwork Wed Nov 27 19:06:55 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Balbi X-Patchwork-Id: 3249391 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 60AFB9F54F for ; Wed, 27 Nov 2013 19:09:46 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3CAFD205CD for ; Wed, 27 Nov 2013 19:09:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5E126205EE for ; Wed, 27 Nov 2013 19:09:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757816Ab3K0TJ0 (ORCPT ); Wed, 27 Nov 2013 14:09:26 -0500 Received: from devils.ext.ti.com ([198.47.26.153]:50947 "EHLO devils.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757724Ab3K0TIe (ORCPT ); Wed, 27 Nov 2013 14:08:34 -0500 Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id rARJ7pQV004563; Wed, 27 Nov 2013 13:07:51 -0600 Received: from DLEE70.ent.ti.com (dlee70.ent.ti.com [157.170.170.113]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id rARJ7pfl031442; Wed, 27 Nov 2013 13:07:51 -0600 Received: from dlep33.itg.ti.com (157.170.170.75) by DLEE70.ent.ti.com (157.170.170.113) with Microsoft SMTP Server id 14.2.342.3; Wed, 27 Nov 2013 13:07:51 -0600 Received: from localhost (ileax41-snat.itg.ti.com [10.172.224.153]) by dlep33.itg.ti.com (8.14.3/8.13.8) with ESMTP id rARJ7ndG022977; Wed, 27 Nov 2013 13:07:50 -0600 From: Felipe Balbi To: CC: , Tony Lindgren , Aaro Koskinen , Linux OMAP Mailing List , Linux Kernel Mailing List , Linux ARM Kernel Mailing List , Felipe Balbi Subject: [PATCH 11/13] mfd: menelaus: start to use irqdomain Date: Wed, 27 Nov 2013 13:06:55 -0600 Message-ID: <1385579217-20127-12-git-send-email-balbi@ti.com> X-Mailer: git-send-email 1.8.4.GIT In-Reply-To: <1385579217-20127-1-git-send-email-balbi@ti.com> References: <1385579217-20127-1-git-send-email-balbi@ti.com> MIME-Version: 1.0 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP introduce an irq_chip and irq_domain for menelaus driver. Following patches will convert uses to traditional request_threaded_irq(). Signed-off-by: Felipe Balbi --- drivers/mfd/menelaus.c | 109 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 109 insertions(+) diff --git a/drivers/mfd/menelaus.c b/drivers/mfd/menelaus.c index aa3c579..295fe84 100644 --- a/drivers/mfd/menelaus.c +++ b/drivers/mfd/menelaus.c @@ -34,6 +34,7 @@ #include #include #include +#include #include #include #include @@ -47,6 +48,7 @@ #include #define DRIVER_NAME "menelaus" +#define MENELAUS_NR_IRQS 16 #define MENELAUS_I2C_ADDRESS 0x72 @@ -168,11 +170,19 @@ struct menelaus_chip { u8 rtc_control; unsigned uie:1; #endif + int irq_base; unsigned vcore_hw_mode:1; u8 mask1, mask2; + u8 ack1, ack2; + void (*handlers[16])(struct menelaus_chip *); void (*mmc_callback)(void *data, u8 mask); void *mmc_callback_data; + + unsigned mask1_pending:1; + unsigned mask2_pending:1; + unsigned ack1_pending:1; + unsigned ack2_pending:1; }; static struct menelaus_chip *the_menelaus; @@ -235,6 +245,83 @@ static int menelaus_ack_irq(struct menelaus_chip *m, int irq) return menelaus_write_reg(m, MENELAUS_INT_ACK1, 1 << irq); } +static void menelaus_irq_ack(struct irq_data *data) +{ + struct menelaus_chip *m = irq_data_get_irq_chip_data(data); + int irq = data->irq - m->irq_base; + + if (irq > 7) { + m->ack2 |= BIT(irq); + m->ack2_pending = true; + } else { + m->ack1 |= BIT(irq); + m->ack1_pending = true; + } +} + +static void menelaus_irq_mask(struct irq_data *data) +{ + struct menelaus_chip *m = irq_data_get_irq_chip_data(data); + int irq = data->irq - m->irq_base; + + if (irq > 7) { + m->mask2 |= BIT(irq); + m->mask2_pending = true; + } else { + m->mask1 |= BIT(irq); + m->mask1_pending = true; + } +} + +static void menelaus_irq_unmask(struct irq_data *data) +{ + struct menelaus_chip *m = irq_data_get_irq_chip_data(data); + int irq = data->irq - m->irq_base; + + if (irq > 7) { + m->mask2 &= ~BIT(irq); + m->mask2_pending = true; + } else { + m->mask1 &= ~BIT(irq); + m->mask1_pending = true; + } +} + +static void menelaus_irq_bus_lock(struct irq_data *data) +{ + struct menelaus_chip *m = irq_data_get_irq_chip_data(data); + + mutex_lock(&m->lock); +} + +static void menelaus_irq_bus_sync_unlock(struct irq_data *data) +{ + struct menelaus_chip *m = irq_data_get_irq_chip_data(data); + + if (m->ack1_pending) + menelaus_write_reg(m, MENELAUS_INT_ACK1, m->ack1); + + if (m->ack2_pending) + menelaus_write_reg(m, MENELAUS_INT_ACK2, m->ack2); + + if (m->mask1_pending) + menelaus_write_reg(m, MENELAUS_INT_MASK1, m->mask1); + + if (m->mask2_pending) + menelaus_write_reg(m, MENELAUS_INT_MASK2, m->mask2); + + mutex_unlock(&m->lock); +} + +static struct irq_chip menelaus_irq_chip = { + .name = "menelaus", + .irq_ack = menelaus_irq_ack, + .irq_mask = menelaus_irq_mask, + .irq_unmask = menelaus_irq_unmask, + .irq_bus_lock = menelaus_irq_bus_lock, + .irq_bus_sync_unlock = menelaus_irq_bus_sync_unlock, +}; + /* Adds a handler for an interrupt. Does not run in interrupt context */ static int menelaus_add_irq_work(struct menelaus_chip *m, int irq, void (*handler)(struct menelaus_chip *)) @@ -1186,8 +1273,11 @@ static int menelaus_probe(struct i2c_client *client, const struct i2c_device_id *id) { struct menelaus_chip *m; + struct device_node *node = client->dev.of_node; int rev = 0, val; int err = 0; + int irq_base; + int i; struct menelaus_platform_data *menelaus_pdata = dev_get_platdata(&client->dev); @@ -1206,6 +1296,25 @@ static int menelaus_probe(struct i2c_client *client, the_menelaus = m; m->client = client; + irq_base = irq_alloc_descs(-1, 0, MENELAUS_NR_IRQS, 0); + if (irq_base < 0) { + dev_err(&client->dev, "failed to allocate irq descs\n"); + return irq_base; + } + + irq_domain_add_legacy(node, MENELAUS_NR_IRQS, irq_base, 0, + &irq_domain_simple_ops, m); + + m->irq_base = irq_base; + + for (i = irq_base; i < irq_base + MENELAUS_NR_IRQS; i++) { + irq_set_chip_and_handler(i, &menelaus_irq_chip, + handle_simple_irq); + irq_set_nested_thread(i, 1); + irq_set_chip_data(i, m); + set_irq_flags(i, IRQF_VALID); + } + /* If a true probe check the device */ rev = menelaus_read_reg(m, MENELAUS_REV); if (rev < 0) {