From patchwork Fri Jul 17 11:03:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gene Chen X-Patchwork-Id: 11669873 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6FD4613B1 for ; Fri, 17 Jul 2020 11:06:41 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4848E2070E for ; Fri, 17 Jul 2020 11:06:41 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="u8Afn4bn"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="kQRQtoVD" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4848E2070E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:MIME-Version:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:References:In-Reply-To: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:List-Owner; bh=nK34DYrxlDQZHq9JR7yiax0IyZZqx/dkxj169CBzJLQ=; b=u8Afn4bnOnJLSfeqx4VnJ4oCMW +MK4OIPz8mO18IMg7NEqu4znTmr0ufvOi18phjiCobwl70PYIPrcBSvtplgjpIQCLFxgtYpKrJxuk dQxc7yqbWGq7zHMLsjm8o8RInCFFJl5uD7ztDFiVM5gRMs7SlyF87UF6NV5u2TdW+ZXPwpZXLPas2 g0hvW22ZQV2/GiD2VLglKtI/hgPCkCeFauqbrFHed8V6PuVE60WNqq/n6CBI9jtysVWnUBq/u/Xu+ gPz8rxuMuqMhfTUUCYfFrq5Ni2DGAxFK7lc4Kc9XKnfA8i0fgIzwYFISEf5yMIBwxCzDXLyQAK8v+ nRNWV6xQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jwOB3-0006me-I6; Fri, 17 Jul 2020 11:05:17 +0000 Received: from mail-pl1-x642.google.com ([2607:f8b0:4864:20::642]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jwOA8-0006JF-17; Fri, 17 Jul 2020 11:04:21 +0000 Received: by mail-pl1-x642.google.com with SMTP id x9so5310566plr.2; Fri, 17 Jul 2020 04:04:19 -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:in-reply-to:references; bh=nw6Z+jEdgX4MwhkNZpBK/vRke3sTd3g/CLK5PfVY0sA=; b=kQRQtoVDcCe1mQO6zirmf6wtAschU12CTNXYboGLh2vva6NFBkdYCk/SNoTohn6/hr J1YbAEV6et1q4yr+LuYMRXOZQlz0UHb1B11OtZ6kD9aBt0tLY7qZcFbu52xQXHw8mqp9 Vb75tH9bBzzznWRckwXqcrTJoJSu33F3FutcBSbxahK4C7leE4v0SKFa/jYOu1EmPxv4 nr+afwobi5InW7jFU1eVTAzJogYhclPQh3XNeALhqQxuIyleGLEQ4tgQ9fQvs48y4Awr o72/Z5ZaemI7h/YOTeZ5q9620RTvz4oRQ/zk1TvdYrskqeZm2S1SjG650oNDY5zSPhxy qFwA== 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:in-reply-to :references; bh=nw6Z+jEdgX4MwhkNZpBK/vRke3sTd3g/CLK5PfVY0sA=; b=baH4LIeUvsT4Pvi+q2zp+5q8sQb8TLm3TN0CPbYNElwkbwlD80kkAP+xoa1Tek6oFZ smrlQL2lDmo7N6qzhNtq9PWndbbhkWEPmzHu8kCNxnEvuEljP7qRPJvTyhrUTXcEokQj u29K/Xwki3axcZ4ebn6FK5SRNfMk8May3sm/4Eg/t1xArqXGHOptbqPniTfMgNQQ3f4k 3m10PKm2qsC0x7PcXWZ2yhqfUGrDWuBZXa7xIQvDVN4pMy2IMS6OXe4NWItMT82REZ4u cWRbeRMNq+diP5zq7wBI6dQVtJKm5aYuLK26L/Mr1IG+tjdodRjJ+dTa34GkgjQLn6zX UlIw== X-Gm-Message-State: AOAM531wdxGfmM3mh4+3EHvF0jXFqVsgQHXxh+aeC7xl1Wbch/IMnWQ4 rB2dTC6jajyC/+6+0HTrmKU= X-Google-Smtp-Source: ABdhPJyq866hdU65j1dGryL6bnqc+luwNPufUNr6exbYIi+UMaZ8L/DZ4KZnLKNfQCgppPUSwiZusQ== X-Received: by 2002:a17:90a:cb81:: with SMTP id a1mr9525703pju.11.1594983857892; Fri, 17 Jul 2020 04:04:17 -0700 (PDT) Received: from localhost.localdomain ([2402:7500:469:ae36:984e:c073:9d0b:7c09]) by smtp.gmail.com with ESMTPSA id o26sm7619183pfp.219.2020.07.17.04.04.15 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 17 Jul 2020 04:04:17 -0700 (PDT) From: Gene Chen To: lee.jones@linaro.org, matthias.bgg@gmail.com Subject: [PATCH v2 8/9] mfd: mt6360: Fix flow which is used to check ic exist Date: Fri, 17 Jul 2020 19:03:30 +0800 Message-Id: <1594983811-25908-9-git-send-email-gene.chen.richtek@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1594983811-25908-1-git-send-email-gene.chen.richtek@gmail.com> References: <1594983811-25908-1-git-send-email-gene.chen.richtek@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200717_070420_136030_14B515F3 X-CRM114-Status: GOOD ( 14.07 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:642 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [gene.chen.richtek[at]gmail.com] 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: gene_chen@richtek.com, linux-kernel@vger.kernel.org, cy_huang@richtek.com, benjamin.chao@mediatek.com, linux-mediatek@lists.infradead.org, linux-arm-kernel@lists.infradead.org, shufan_lee@richtek.com MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org From: Gene Chen Fix flow which is used to check ic exist. Signed-off-by: Gene Chen --- drivers/mfd/mt6360-core.c | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/drivers/mfd/mt6360-core.c b/drivers/mfd/mt6360-core.c index 5a68228..3186a7c 100644 --- a/drivers/mfd/mt6360-core.c +++ b/drivers/mfd/mt6360-core.c @@ -293,6 +293,23 @@ static const struct mfd_cell mt6360_devs[] = { NULL, 0, 0, "mediatek,mt6360-tcpc"), }; +static int mt6360_check_vendor_info(struct mt6360_data *data) +{ + u32 info; + int ret; + + ret = regmap_read(data->regmap, MT6360_PMU_DEV_INFO, &info); + if (ret < 0) + return ret; + + if ((info & CHIP_VEN_MASK) != CHIP_VEN_MT6360) + return -ENODEV; + + data->chip_rev = info & CHIP_REV_MASK; + + return 0; +} + static const unsigned short mt6360_slave_addr[MT6360_SLAVE_MAX] = { MT6360_PMU_SLAVEID, MT6360_PMIC_SLAVEID, @@ -303,7 +320,6 @@ static const unsigned short mt6360_slave_addr[MT6360_SLAVE_MAX] = { static int mt6360_probe(struct i2c_client *client) { struct mt6360_data *data; - unsigned int reg_data; int i, ret; data = devm_kzalloc(&client->dev, sizeof(*data), GFP_KERNEL); @@ -319,16 +335,10 @@ static int mt6360_probe(struct i2c_client *client) return PTR_ERR(data->regmap); } - ret = regmap_read(data->regmap, MT6360_PMU_DEV_INFO, ®_data); + ret = mt6360_check_vendor_info(data); if (ret) { - dev_err(&client->dev, "Device not found\n"); - return ret; - } - - data->chip_rev = reg_data & CHIP_REV_MASK; - if (data->chip_rev != CHIP_VEN_MT6360) { dev_err(&client->dev, "Device not supported\n"); - return -ENODEV; + return ret; } ret = devm_regmap_add_irq_chip(&client->dev, data->regmap, client->irq,