From patchwork Mon Feb 26 10:17:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 10241977 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 EA5A260208 for ; Mon, 26 Feb 2018 10:18:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D3CE8299C8 for ; Mon, 26 Feb 2018 10:18:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C85D729F1A; Mon, 26 Feb 2018 10:18:43 +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=-1.9 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM autolearn=ham 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 088AD299C8 for ; Mon, 26 Feb 2018 10:18:43 +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=LzkLf/5X9X6zQ5yaOaqBHCs0DaYAFwYSqNOyQvLyN/Y=; b=FG0 wv1VLb3bSkby/ka5bEQRZkINfxkvjhp1dM6kD+z3t8u0YzU5bBpqBhHHs4c8nJq5mki+Pvr5UT1sN 92m8EWpHf/SZsjy56bOJjTbC4UNMgM1gDS31ZWmOfqxOXiGg9YC+W+CEq1UzzrBEnPPMljTbPoajg e+oGavItqanxCuCHrknE3qsCW5hoIqHY90tDr3CWVDNDGb2CE0JaF+J3fof7bHQH/bCCmqjcPigJA sLKSAHpDv8mv3Wsl864A4YSFYZjEcr5V6rhFNPUE8Bb3jMwWw+968pq0dr2G6nPlJ3wSVkLUAREF5 nfw3s2k57govRrOAQHnD9EGJfqEoNmg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1eqFrf-0006hF-J0; Mon, 26 Feb 2018 10:18:35 +0000 Received: from mail-wm0-x244.google.com ([2a00:1450:400c:c09::244]) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1eqFqf-0006I9-LE for linux-arm-kernel@lists.infradead.org; Mon, 26 Feb 2018 10:18:19 +0000 Received: by mail-wm0-x244.google.com with SMTP id x7so13771951wmc.0 for ; Mon, 26 Feb 2018 02:17:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=0r8O2UJ5itjjetPtaxo5T72rHgdCKKVA4p4A6UXcbbA=; b=ejSYUAYWFIDoijFRe+6EHghRz8IEeW1PVGNV31nV7V1A/qzzyzEgRumKNUTc4PKSO/ i4gV2Y44wNpCdTPm32QlL9OE8tCLc7/bKApAKcBlpbESrnLkhuZzVdSTts5NObtZovJj +eIqaoGZNxHfXysdXhBFxMHHH1R05irMKXunA31vj8CArLrX5LCvBEJnoLP1rsg5KpPt 1BPlMvO2OGj6ybTsOcoI8hu0r2uRt+W5q2sCOEd8cGyuRygvV2oKbriA7trjLbsvgkyr rVxY9s7pQ1CrJGJC5FsiGKLx6dlmymsBNMSTuSBnPcUKqtaHGVCYa7XT1cp0YgE3l5mU n6zg== 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=0r8O2UJ5itjjetPtaxo5T72rHgdCKKVA4p4A6UXcbbA=; b=UzvTfgSz3tbir9Mo0e6M5CJuxuUCEZ71xn/kgJADmzu32ocCWBp/IzGO3jF0hfp4fM VsW/ZLcqINidlWSNV5ZOagqakRzoT3GNgxy+J1m/yXW1gykJOEX0q+gKBFfTRzUL5ylh MK05Rr9EZFSk+vGteTwTpakMorVPo5NTfZGZx3dajgMF3uOr/QnEQ59rmPgOqeR90GuY mP70F5P/2BQjSTkFVbZpeQPWrL8AzuQYmwgRLmT6ExfqKUWS573wTHTAhfKL6dcx1l/F Fip/M0J2kIp3T8JUsuEs4+M1FqY70Cwxtoij5M/RWzpM2Ql4WQjIjtdGjzU6yU6e7FWh ujPQ== X-Gm-Message-State: APf1xPDnGA2pBXmSHl2tJJ0OeIKEnxdB6d1T3Cx15/n2GTNu/TVCEnNQ E4fVZl/l2f7bJRuM1V0pqHBIF6Ym X-Google-Smtp-Source: AG47ELsXwmQqesGeGGOiHP7luZCr4okM8wMbRNwoxSRjUUBOOJJJYjfL7KqNuBuT8W9hb71PPMK4eQ== X-Received: by 10.28.146.19 with SMTP id u19mr2669317wmd.67.1519640240554; Mon, 26 Feb 2018 02:17:20 -0800 (PST) Received: from kurokawa.lan (ip-86-49-107-50.net.upcbroadband.cz. [86.49.107.50]) by smtp.gmail.com with ESMTPSA id u136sm7100014wmf.5.2018.02.26.02.17.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 26 Feb 2018 02:17:19 -0800 (PST) From: Marek Vasut X-Google-Original-From: Marek Vasut To: linux-arm-kernel@lists.infradead.org Subject: [RFC][PATCH] ARM: shmobile: Rework the PMIC IRQ line quirk Date: Mon, 26 Feb 2018 11:17:18 +0100 Message-Id: <20180226101718.5353-1-marek.vasut+renesas@gmail.com> X-Mailer: git-send-email 2.15.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180226_021734_053196_D25F960E X-CRM114-Status: GOOD ( 21.80 ) 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: Simon Horman , Wolfram Sang , Kuninori Morimoto , Geert Uytterhoeven , 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 -- da9036 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 --- arch/arm/mach-shmobile/regulator-quirk-rcar-gen2.c | 124 +++++++++++++++++---- 1 file changed, 100 insertions(+), 24 deletions(-) diff --git a/arch/arm/mach-shmobile/regulator-quirk-rcar-gen2.c b/arch/arm/mach-shmobile/regulator-quirk-rcar-gen2.c index 27fb3a5ec73e..85e98cb0655a 100644 --- a/arch/arm/mach-shmobile/regulator-quirk-rcar-gen2.c +++ b/arch/arm/mach-shmobile/regulator-quirk-rcar-gen2.c @@ -31,8 +31,10 @@ #include #include #include +#include #include #include +#include #include @@ -44,34 +46,47 @@ /* 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_msgs = { + .addr = 0x00, + .len = ARRAY_SIZE(da9063_irq_clr), + .buf = da9063_irq_clr, +}; + +static struct i2c_msg da9210_msgs = { + .addr = 0x00, + .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_msgs }, + { .compatible = "dlg,da9210", .data = &da9210_msgs }, + {}, }; 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 +103,21 @@ 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; + list_for_each_entry(pos, &quirk_list, list) { + if (pos->i2c_msg.addr != client->addr) + continue; - /* There are two DA9210 on Stout, one on the other boards. */ - len = of_machine_is_compatible("renesas,stout") ? 3 : 2; + if (!of_device_is_compatible(dev->of_node, pos->id->compatible)) + continue; - dev_info(&client->dev, "clearing da9063/da9210 interrupts\n"); - ret = i2c_transfer(client->adapter, da9xxx_msgs, len); - if (ret != ARRAY_SIZE(da9xxx_msgs)) + if (!pos->shared) + continue; + + dev_info(&client->dev, "clearing %s@0x%02x interrupts\n", + pos->id->compatible, pos->i2c_msg.addr); + + ret = i2c_transfer(client->adapter, &pos->i2c_msg, 1); + if (ret != 1) dev_err(&client->dev, "i2c error %d\n", ret); } @@ -111,6 +130,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 +146,14 @@ static struct notifier_block regulator_quirk_nb = { static int __init rcar_gen2_regulator_quirk(void) { - u32 mon; + struct device_node *np; + const struct of_device_id *id; + struct regulator_quirk *quirk; + struct regulator_quirk *pos; + struct of_phandle_args *argsa, *argsb; + u32 mon, addr, i; + bool match; + int ret; if (!of_machine_is_compatible("renesas,koelsch") && !of_machine_is_compatible("renesas,lager") && @@ -130,6 +161,51 @@ 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(!np || !of_device_is_available(np)) + break; + + quirk = kzalloc(sizeof(*quirk), GFP_KERNEL); + + 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; + quirk->shared = false; + + ret = of_irq_parse_one(np, 0, &quirk->irq_args); + if (ret) + return ret; + + list_for_each_entry(pos, &quirk_list, list) { + argsa = &quirk->irq_args; + argsb = &pos->irq_args; + + if (argsa->args_count != argsb->args_count) + continue; + + match = true; + for (i = 0; i < argsa->args_count; i++) { + if (argsa->args[i] != argsb->args[i]) { + match = false; + break; + } + } + + if (match) { + pos->shared = true; + quirk->shared = true; + } + } + + list_add_tail(&quirk->list, &quirk_list); + } + irqc = ioremap(IRQC_BASE, PAGE_SIZE); if (!irqc) return -ENOMEM;