From patchwork Mon Jun 11 12:15:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 10457721 X-Patchwork-Delegate: horms@verge.net.au Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 52EEC60467 for ; Mon, 11 Jun 2018 12:15:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3D65528409 for ; Mon, 11 Jun 2018 12:15:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 31B872842B; Mon, 11 Jun 2018 12:15:20 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 79BF32841C for ; Mon, 11 Jun 2018 12:15:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932847AbeFKMPT (ORCPT ); Mon, 11 Jun 2018 08:15:19 -0400 Received: from mail-wr0-f196.google.com ([209.85.128.196]:34378 "EHLO mail-wr0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932658AbeFKMPS (ORCPT ); Mon, 11 Jun 2018 08:15:18 -0400 Received: by mail-wr0-f196.google.com with SMTP id a12-v6so20169762wro.1 for ; Mon, 11 Jun 2018 05:15:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=3gYPfsb1353o0oUIzL8yf80ph41Z1+NHBvJLyWEQaqc=; b=U7NN9NlR1R/aorin2ofDDV1KCxbppAIxntQ92ZYq3pIOggtbiwX7NcPvn606yUGoz5 yi2RrgyUBHZ+f7UaIoSl7dyZLI8w/TRx1NxKOtUhSvJ0gFmIeBssyG+MGm0qRZzuliQN jFcFgp2hrkRjBDnRX+aHSUvr8xX5xs76ValCR0BydeFqFmR9ezcPnbmbd/rsE1xIsorg 4iYQrTA37DAPtDvSNXLCCHDcTv5MuWa5lbw7CCaE//6yzUe7wyORbzXkC1BakCL3hoe4 KVhI2hJBLtMfziJIbK/MwrwA66pwxqOCsn6gJgaAS6gQr4Ftr9a8pej89NGcaA9UPu4Z VHbw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=3gYPfsb1353o0oUIzL8yf80ph41Z1+NHBvJLyWEQaqc=; b=Xsp1okpboItdgyVzHVVhthL6j+h/DOGvHlgTcDslcWeeMbYWsg7zDkt/hDvK8C0YgR j8FhsFuaeB3lBct6RsMcWVbD6kSfugJzPyHw7mAgFBUvtJiWJWh/x8TuaEcSoJW0KmkT UHJZrPSMoyNmRNtu1fJ6M750vlNyRB36dr8oSdpbEYcXvk59a7TK+w8yKHsh+hfsepy3 KoNqpezzLfP0WCthvT15/C5fyNAfCr4FPGIs2nnICGmhb4lvhEoLOclZQYXu9Y8h22RF GaGENfhJyKICIuYG2CMDpoYyjIr1HQfR4TIOpbn2SC4waLQNiTq/aPNd/DjeAR8mO4ae Qo9A== X-Gm-Message-State: APt69E2dkbzh78naqGgIVRyYtULRKOjY1T9/kbOvz268suWO8pwniH5Y 59k21KTuQD9EJ/cN9uVHKQw= X-Google-Smtp-Source: ADUXVKKKktag+19i9BqTIDjRFT6ioRL833EaFDqp4LuEQ17i5yAvVs/wrvylU/uLtRj/kCyVG6Z8fQ== X-Received: by 2002:adf:ee91:: with SMTP id b17-v6mr13763901wro.21.1528719317080; Mon, 11 Jun 2018 05:15:17 -0700 (PDT) Received: from kurokawa.lan (ip-86-49-107-50.net.upcbroadband.cz. [86.49.107.50]) by smtp.gmail.com with ESMTPSA id u15-v6sm11936427wma.37.2018.06.11.05.15.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 11 Jun 2018 05:15:16 -0700 (PDT) From: Marek Vasut X-Google-Original-From: Marek Vasut To: linux-arm-kernel@lists.infradead.org Cc: Marek Vasut , Geert Uytterhoeven , Kuninori Morimoto , Simon Horman , Wolfram Sang , linux-renesas-soc@vger.kernel.org Subject: [PATCH V5] ARM: shmobile: Rework the PMIC IRQ line quirk Date: Mon, 11 Jun 2018 14:15:13 +0200 Message-Id: <20180611121513.9673-1-marek.vasut+renesas@gmail.com> X-Mailer: git-send-email 2.16.2 Sender: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Rather than hard-coding the quirk topology, which stopped scaling, parse the information from DT. The code looks for all compatible PMICs -- da9063 and da9210 -- and checks if their IRQ line is tied to the same pin. If so, the code sends a matching sequence to the PMIC to deassert the IRQ. Signed-off-by: Marek Vasut Cc: Geert Uytterhoeven Cc: Kuninori Morimoto Cc: Simon Horman Cc: Wolfram Sang Cc: linux-renesas-soc@vger.kernel.org Acked-by: Wolfram Sang Tested-by: Geert Uytterhoeven (on Koelsch) Reviewed-by: Simon Horman Reviewed-by: Geert Uytterhoeven --- V2: - Replace the DT shared IRQ check loop with memcmp() - Send the I2C message to deassert the IRQ line to all PMICs in the list with shared IRQ line instead of just one - Add comment that this works only in case all the PMICs are on the same I2C bus V3: - Drop the addr = 0x00 init - Drop reinit of argsa in rcar_gen2_regulator_quirk V4: - Squash regulator_quirk on single line - Drop !np check in for_each_matching_node_and_match() - Use argsa in of_irq_parse_one V5: - Check kzalloc failure - Rename da...._msgs to da...._msg - Don't reinit quirk->shared --- arch/arm/mach-shmobile/regulator-quirk-rcar-gen2.c | 137 ++++++++++++++++----- 1 file changed, 108 insertions(+), 29 deletions(-) diff --git a/arch/arm/mach-shmobile/regulator-quirk-rcar-gen2.c b/arch/arm/mach-shmobile/regulator-quirk-rcar-gen2.c index 93f628acfd94..cf4d260882cf 100644 --- a/arch/arm/mach-shmobile/regulator-quirk-rcar-gen2.c +++ b/arch/arm/mach-shmobile/regulator-quirk-rcar-gen2.c @@ -31,11 +31,12 @@ #include #include #include +#include #include #include +#include #include - #define IRQC_BASE 0xe61c0000 #define IRQC_MONITOR 0x104 /* IRQn Signal Level Monitor Register */ @@ -44,34 +45,45 @@ /* start of DA9210 System Control and Event Registers */ #define DA9210_REG_MASK_A 0x54 +struct regulator_quirk { + struct list_head list; + const struct of_device_id *id; + struct of_phandle_args irq_args; + struct i2c_msg i2c_msg; + bool shared; /* IRQ line is shared */ +}; + +static LIST_HEAD(quirk_list); static void __iomem *irqc; /* first byte sets the memory pointer, following are consecutive reg values */ static u8 da9063_irq_clr[] = { DA9063_REG_IRQ_MASK_A, 0xff, 0xff, 0xff, 0xff }; static u8 da9210_irq_clr[] = { DA9210_REG_MASK_A, 0xff, 0xff }; -static struct i2c_msg da9xxx_msgs[3] = { - { - .addr = 0x58, - .len = ARRAY_SIZE(da9063_irq_clr), - .buf = da9063_irq_clr, - }, { - .addr = 0x68, - .len = ARRAY_SIZE(da9210_irq_clr), - .buf = da9210_irq_clr, - }, { - .addr = 0x70, - .len = ARRAY_SIZE(da9210_irq_clr), - .buf = da9210_irq_clr, - }, +static struct i2c_msg da9063_msg = { + .len = ARRAY_SIZE(da9063_irq_clr), + .buf = da9063_irq_clr, +}; + +static struct i2c_msg da9210_msg = { + .len = ARRAY_SIZE(da9210_irq_clr), + .buf = da9210_irq_clr, +}; + +static const struct of_device_id rcar_gen2_quirk_match[] = { + { .compatible = "dlg,da9063", .data = &da9063_msg }, + { .compatible = "dlg,da9210", .data = &da9210_msg }, + {}, }; static int regulator_quirk_notify(struct notifier_block *nb, unsigned long action, void *data) { + struct regulator_quirk *pos, *tmp; struct device *dev = data; struct i2c_client *client; static bool done; + int ret; u32 mon; if (done) @@ -88,17 +100,20 @@ static int regulator_quirk_notify(struct notifier_block *nb, client = to_i2c_client(dev); dev_dbg(dev, "Detected %s\n", client->name); - if ((client->addr == 0x58 && !strcmp(client->name, "da9063")) || - (client->addr == 0x68 && !strcmp(client->name, "da9210")) || - (client->addr == 0x70 && !strcmp(client->name, "da9210"))) { - int ret, len; + /* + * Send message to all PMICs that share an IRQ line to deassert it. + * + * WARNING: This works only if all the PMICs are on the same I2C bus. + */ + list_for_each_entry(pos, &quirk_list, list) { + if (!pos->shared) + continue; - /* There are two DA9210 on Stout, one on the other boards. */ - len = of_machine_is_compatible("renesas,stout") ? 3 : 2; + dev_info(&client->dev, "clearing %s@0x%02x interrupts\n", + pos->id->compatible, pos->i2c_msg.addr); - dev_info(&client->dev, "clearing da9063/da9210 interrupts\n"); - ret = i2c_transfer(client->adapter, da9xxx_msgs, len); - if (ret != len) + ret = i2c_transfer(client->adapter, &pos->i2c_msg, 1); + if (ret != 1) dev_err(&client->dev, "i2c error %d\n", ret); } @@ -111,6 +126,11 @@ static int regulator_quirk_notify(struct notifier_block *nb, remove: dev_info(dev, "IRQ2 is not asserted, removing quirk\n"); + list_for_each_entry_safe(pos, tmp, &quirk_list, list) { + list_del(&pos->list); + kfree(pos); + } + done = true; iounmap(irqc); return 0; @@ -122,7 +142,12 @@ static struct notifier_block regulator_quirk_nb = { static int __init rcar_gen2_regulator_quirk(void) { - u32 mon; + struct regulator_quirk *quirk, *pos, *tmp; + struct of_phandle_args *argsa, *argsb; + const struct of_device_id *id; + struct device_node *np; + u32 mon, addr; + int ret; if (!of_machine_is_compatible("renesas,koelsch") && !of_machine_is_compatible("renesas,lager") && @@ -130,22 +155,76 @@ static int __init rcar_gen2_regulator_quirk(void) !of_machine_is_compatible("renesas,gose")) return -ENODEV; + for_each_matching_node_and_match(np, rcar_gen2_quirk_match, &id) { + if (!of_device_is_available(np)) + break; + + quirk = kzalloc(sizeof(*quirk), GFP_KERNEL); + if (!quirk) { + ret = -ENOMEM; + goto err_mem; + } + + argsa = &quirk->irq_args; + memcpy(&quirk->i2c_msg, id->data, sizeof(quirk->i2c_msg)); + + ret = of_property_read_u32(np, "reg", &addr); + if (ret) + return ret; + + quirk->id = id; + quirk->i2c_msg.addr = addr; + + ret = of_irq_parse_one(np, 0, argsa); + if (ret) + return ret; + + list_for_each_entry(pos, &quirk_list, list) { + argsb = &pos->irq_args; + + if (argsa->args_count != argsb->args_count) + continue; + + ret = memcmp(argsa->args, argsb->args, + argsa->args_count * + sizeof(argsa->args[0])); + if (!ret) { + pos->shared = true; + quirk->shared = true; + } + } + + list_add_tail(&quirk->list, &quirk_list); + } + irqc = ioremap(IRQC_BASE, PAGE_SIZE); - if (!irqc) - return -ENOMEM; + if (!irqc) { + ret = -ENOMEM; + goto err_mem; + } mon = ioread32(irqc + IRQC_MONITOR); if (mon & REGULATOR_IRQ_MASK) { pr_debug("%s: IRQ2 is not asserted, not installing quirk\n", __func__); - iounmap(irqc); - return 0; + ret = 0; + goto err_free; } pr_info("IRQ2 is asserted, installing da9063/da9210 regulator quirk\n"); bus_register_notifier(&i2c_bus_type, ®ulator_quirk_nb); return 0; + +err_free: + iounmap(irqc); +err_mem: + list_for_each_entry_safe(pos, tmp, &quirk_list, list) { + list_del(&pos->list); + kfree(pos); + } + + return ret; } arch_initcall(rcar_gen2_regulator_quirk);