From patchwork Tue Sep 18 12:23:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 10604271 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 99DFF5A4 for ; Tue, 18 Sep 2018 12:24:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 88B862A073 for ; Tue, 18 Sep 2018 12:24:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7C81C2A78D; Tue, 18 Sep 2018 12:24:19 +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=-2.9 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id EC1CD2A073 for ; Tue, 18 Sep 2018 12:24:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=tKPO7EeCg9ZZxt1iJL3h3GZRx3ho/h2an9AaVyxni/U=; b=MC7 JdLDfgob0UDiE6AJb+HljXNLCRzZp7VYkxhJm6emBGPf1jJaS241KFRYQLijiHwtIPAjvRG54hVuT 6LaeeJFpEa2QpNRIPNNDNX2HpXKjh/SulDJOQ3eBPrRRBRo4a5BeFQT/jE27A5GEadmWQAYiWP5GB kqBs6KNdhs3nOwRK43qZnfUXg+RR4zNbAPA4hYZrcBT3mpHYPkweuw89Gz8RiLqADKwglFoCuqbv/ imSbTxTEO9YfGmAyTRVqsFij15pF9QgdSH64Zv6c7NhJ6iFRigMVoq+8hJlMYqqyqeOLM0LeDwuOe Akf/K7MJt7GudLkNa7HQNRofljGg8RQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1g2F33-00028p-Pq; Tue, 18 Sep 2018 12:24:09 +0000 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1g2F2z-00027a-4F for linux-arm-kernel@lists.infradead.org; Tue, 18 Sep 2018 12:24:06 +0000 Received: by mail-wr1-x443.google.com with SMTP id 20-v6so1853926wrb.12 for ; Tue, 18 Sep 2018 05:23:54 -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=VKrBpIcl4jlmZaNpVzM9ImAXZzwPbu5aZVeaJblb2tk=; b=O9ho/nNI7IuCjP/eYL+bYcw6Xxyh9e6xrsDV4l2o/fe8B3P+E05SzX5bzhciWmfFwt iUfDoW/SU5rc+xpkwQf3ntCZ/aaI0WfR86xgW6MYYG5Fj+EhCycIsPQewaO+AeZBI0tj EAEtGZ2w1TdECwPGXdx7Fm+dYIDNRtqCt7x1qUhNV/1mEKI/B1JgG1/hoYiIqLa5um1/ RYcs/zEFDz65jVfjfCozI2GRpVe3ZdM1da+u5jSvp9cE56S34WgcIzjqICkMvQpEOaIe fyZxou0hTJXocX7N3hvjdZsW7a6FtsVVPkzpiWvSqF1mEo2DB7aruEuCc5CoDVRS5rq2 etiQ== 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=VKrBpIcl4jlmZaNpVzM9ImAXZzwPbu5aZVeaJblb2tk=; b=Px9UJ834iyxBJUdIJAFGTW0G2lwJLypxZKo2PcRrIqX63mjwRJSJuf0fFKzWOGbb3z 5XnA7RQbe5d/jNxfwjEgUYs2AvTkwAr2zk1MaXEou6yxDiiFomyzw13trTg8Nlfb7PEM u8RJW66NiPh0IDLCYezdoD5PT0o9ci0g6y+s3E2KYXeOYHtJO8GffKcBUyao1zVu0RsA gubsfK1G4KlxoOE+te+mvo0I+UcTbcH8nvNBRMuasYSj1gQwwusa/OQuXVfTMtbbAnuQ VGf9o2YoN+mbAEst744dTD/+OzLmUKpLIS5CQHxJ0WkrmjkUasi0HzFdHvH9HelfrSwu HDjQ== X-Gm-Message-State: APzg51A7ZRqalg7v5ZDo3xhBxb4Xpody1pyK8hZdi5hg/JXGAfqQ/pEd O7yHvyqOY9gHJBtqYbpYKYmA8iBZ X-Google-Smtp-Source: ANB0Vdb1jjREjmqX7y1m7t/iAlGMMag3nBOigca2tm+J//+fVcIzrL1IQgoIbtsQd7KnL3oageH2WQ== X-Received: by 2002:a5d:62c2:: with SMTP id o2-v6mr24705357wrv.83.1537273432268; Tue, 18 Sep 2018 05:23:52 -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 s2-v6sm22142331wrn.83.2018.09.18.05.23.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 18 Sep 2018 05:23:51 -0700 (PDT) From: Marek Vasut X-Google-Original-From: Marek Vasut To: linux-arm-kernel@lists.infradead.org Subject: [PATCH V6] ARM: shmobile: Rework the PMIC IRQ line quirk Date: Tue, 18 Sep 2018 14:23:40 +0200 Message-Id: <20180918122340.5478-1-marek.vasut+renesas@gmail.com> X-Mailer: git-send-email 2.18.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180918_052405_197521_0A80C9A3 X-CRM114-Status: GOOD ( 24.81 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Geert Uytterhoeven , Kuninori Morimoto , linux-renesas-soc@vger.kernel.org, Wolfram Sang , Simon Horman , Marek Vasut MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.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: 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 V6: - Skip invalid entries instead of aborting on them --- .../mach-shmobile/regulator-quirk-rcar-gen2.c | 139 ++++++++++++++---- 1 file changed, 110 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 21ebc7678ffd..8e50daa99151 100644 --- a/arch/arm/mach-shmobile/regulator-quirk-rcar-gen2.c +++ b/arch/arm/mach-shmobile/regulator-quirk-rcar-gen2.c @@ -23,11 +23,12 @@ #include #include #include +#include #include #include +#include #include - #define IRQC_BASE 0xe61c0000 #define IRQC_MONITOR 0x104 /* IRQn Signal Level Monitor Register */ @@ -36,34 +37,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) @@ -80,17 +92,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); } @@ -103,6 +118,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; @@ -114,7 +134,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") && @@ -122,22 +147,78 @@ 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; + + ret = of_property_read_u32(np, "reg", &addr); + if (ret) /* Skip invalid entry and continue */ + continue; + + 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)); + + quirk->id = id; + quirk->i2c_msg.addr = addr; + + ret = of_irq_parse_one(np, 0, argsa); + if (ret) { /* Skip invalid entry and continue */ + kfree(quirk); + continue; + } + + 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);