From patchwork Tue Jun 29 09:43:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fei Shao X-Patchwork-Id: 12349589 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1325AC11F68 for ; Tue, 29 Jun 2021 09:46:38 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 D0E8F61DAD for ; Tue, 29 Jun 2021 09:46:37 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D0E8F61DAD Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :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=luKUb2OdG4gospPSW7LNa9+f1O+J0uor2oUarItKVYU=; b=UHjJAa1nS0Fz+B bk+XmDAZ2/7umllQTL3aXaKGDAL4zaPfAGHnz/kiLrVL10zCTRjQzxlM0f9UctXKhasqmyvzGtL3i ef+Wzo9sdIrIpplZhzJl3gwU/otx6raGNQIpAyQkhADmB4Af1Rim5TIaFlf0qF9pKFl5gX3RpYR1r rUjVirZMIpGdFTS9GEgGqPUOLejd9nqTgB9+9AX/MLyWLShqtYGUeATlHR/oQ7meyDHJlgu8nHF2D HjYI7dFa284A/9rwKvxdksiJztgAn9/Pfvbib+WNMpUIS/Eiw7NxsPuECR9qQG6fbxIwR17pVLvvh zfIY0Nzr2pg1CS/rmd7g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lyAIB-00AQYo-8N; Tue, 29 Jun 2021 09:44:31 +0000 Received: from mail-pf1-x42c.google.com ([2607:f8b0:4864:20::42c]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lyAI5-00AQX9-0O for linux-arm-kernel@lists.infradead.org; Tue, 29 Jun 2021 09:44:26 +0000 Received: by mail-pf1-x42c.google.com with SMTP id y4so16712603pfi.9 for ; Tue, 29 Jun 2021 02:44:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=dJ37PQ0DUdpFn0rnRJ0yJT5LxxB3TZY0VJaQvUIpRAc=; b=NLAgUarWn5AgV3j8EjWc1nVme0dHFSRQeoYdTW4OesGN8EIARL9cKJR+wmp5r37Fn2 fRg9Xd/5/HP2HeA9vinT2g0ewkKNdMFnw8vu5qoRXrVG2+KBZKHcePlk/PTy7Wh5l1Oa TslX4PrI5Npy2FmW8kyi2Q+8crZglFuhIO40A= 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:mime-version :content-transfer-encoding; bh=dJ37PQ0DUdpFn0rnRJ0yJT5LxxB3TZY0VJaQvUIpRAc=; b=iUUKwIsqVh2PBzMEB7d62PLZYVIpCFGElwWsJOjqvSAOHWuWQUoZiM5w5fvhOk16K8 /zZ9njhiWjXjBPlyRiKiDUxO0SL6A2AzI/+PusGwpIR0iXNKw8tdSjPzRiJXwxMGIdUP 2spux0ZnagVTdIkC3Fwndxd5kLp2YgQzMemJXbmMvPNP/kp9pjGoK4jiZbzEJSG4fSX4 TDlxQkimlc0NSD5OX2r07GkFeNSCMQklG0HxI39bkwXaLynuc5rgmoOB07g/rcikohH0 WvUneNhV0+qWZqITbQ718IzN490TCBJXROJWJc2DKUDte87Kb18Xqqj7/XaHOuuV03c2 ITMQ== X-Gm-Message-State: AOAM531no3us5yK/CHdmUljpsQGTPVcssrlakrMklNldQ/XwaFnU5W3K lNQZ8fbTFk+vEQgDLhfdMOfolQ== X-Google-Smtp-Source: ABdhPJwf7am0fWVPDWZehB1xgbHGOk/B2M0vX1pYPiCsPRZk3hm0S1wfBKt2uJSRfpD/aBlbPtH27Q== X-Received: by 2002:a65:61ad:: with SMTP id i13mr27649776pgv.345.1624959863421; Tue, 29 Jun 2021 02:44:23 -0700 (PDT) Received: from fshao-glinux.tpe.corp.google.com ([2401:fa00:1:10:ebba:3e19:7691:d53e]) by smtp.gmail.com with ESMTPSA id f15sm17891538pgg.23.2021.06.29.02.44.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Jun 2021 02:44:22 -0700 (PDT) From: Fei Shao To: lee.jones@linaro.org Cc: Fei Shao , Gene Chen , Matthias Brugger , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-mediatek@lists.infradead.org Subject: [PATCH 1/2] mfd: mt6360: Sort regulator resources Date: Tue, 29 Jun 2021 17:43:38 +0800 Message-Id: <20210629094339.874120-1-fshao@chromium.org> X-Mailer: git-send-email 2.32.0.93.g670b81a890-goog MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210629_024425_119574_32A438E5 X-CRM114-Status: GOOD ( 10.11 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Reorder the regulator resources. Fixes: 4ee06e10dd26 ("mfd: mt6360: Combine mt6360 pmic/ldo resources into mt6360 regulator resources") Signed-off-by: Fei Shao --- drivers/mfd/mt6360-core.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -- 2.32.0.93.g670b81a890-goog diff --git a/drivers/mfd/mt6360-core.c b/drivers/mfd/mt6360-core.c index e628953548ce..6eaa6775b888 100644 --- a/drivers/mfd/mt6360-core.c +++ b/drivers/mfd/mt6360-core.c @@ -319,18 +319,18 @@ static const struct resource mt6360_regulator_resources[] = { DEFINE_RES_IRQ_NAMED(MT6360_BUCK2_OC_EVT, "buck2_oc_evt"), DEFINE_RES_IRQ_NAMED(MT6360_BUCK2_OV_EVT, "buck2_ov_evt"), DEFINE_RES_IRQ_NAMED(MT6360_BUCK2_UV_EVT, "buck2_uv_evt"), - DEFINE_RES_IRQ_NAMED(MT6360_LDO6_OC_EVT, "ldo6_oc_evt"), - DEFINE_RES_IRQ_NAMED(MT6360_LDO7_OC_EVT, "ldo7_oc_evt"), - DEFINE_RES_IRQ_NAMED(MT6360_LDO6_PGB_EVT, "ldo6_pgb_evt"), - DEFINE_RES_IRQ_NAMED(MT6360_LDO7_PGB_EVT, "ldo7_pgb_evt"), DEFINE_RES_IRQ_NAMED(MT6360_LDO1_OC_EVT, "ldo1_oc_evt"), DEFINE_RES_IRQ_NAMED(MT6360_LDO2_OC_EVT, "ldo2_oc_evt"), DEFINE_RES_IRQ_NAMED(MT6360_LDO3_OC_EVT, "ldo3_oc_evt"), DEFINE_RES_IRQ_NAMED(MT6360_LDO5_OC_EVT, "ldo5_oc_evt"), + DEFINE_RES_IRQ_NAMED(MT6360_LDO6_OC_EVT, "ldo6_oc_evt"), + DEFINE_RES_IRQ_NAMED(MT6360_LDO7_OC_EVT, "ldo7_oc_evt"), DEFINE_RES_IRQ_NAMED(MT6360_LDO1_PGB_EVT, "ldo1_pgb_evt"), DEFINE_RES_IRQ_NAMED(MT6360_LDO2_PGB_EVT, "ldo2_pgb_evt"), DEFINE_RES_IRQ_NAMED(MT6360_LDO3_PGB_EVT, "ldo3_pgb_evt"), DEFINE_RES_IRQ_NAMED(MT6360_LDO5_PGB_EVT, "ldo5_pgb_evt"), + DEFINE_RES_IRQ_NAMED(MT6360_LDO6_PGB_EVT, "ldo6_pgb_evt"), + DEFINE_RES_IRQ_NAMED(MT6360_LDO7_PGB_EVT, "ldo7_pgb_evt"), }; static const struct mfd_cell mt6360_devs[] = { From patchwork Tue Jun 29 09:43:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fei Shao X-Patchwork-Id: 12349587 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 44B59C11F66 for ; Tue, 29 Jun 2021 09:46:37 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 051A961DAD for ; Tue, 29 Jun 2021 09:46:36 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 051A961DAD Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=WBqtsvmJ/tMytc6iyl+uS2ijxJblYtebvmgqnuklV04=; b=AAnToTUxh/D0ZP tShbb5DmkUnA0Cc7S3lPeM5k6MtULrlz5J2+0c2KZdiJYZNJ04NCimnmP980tKEhVc6pZao9YfMUR mcOlHhSyKAUn2vWzpg8vyVOsDGqArEon4sQPsqw+Yx3EJqWum3hQ2cVbh1ef2d9pGvABLvkBy/oPW nx/qaQN5fWA/lwjfEdqsL0q+6p9WPECThjL2TO1Xm4VSFtLKWxOPJ/jITuL4J4mHh+9lt9vDvS6VT NRY2tgGWFzWsuWn1wXj8336IC3MRe8uhtuYmIpPAz6rch9lp/afMPKdztWjTqOH+n7Wy7VEgQ0pEo 48KECld4OvXgaVpTXTBw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lyAIU-00AQdl-OT; Tue, 29 Jun 2021 09:44:51 +0000 Received: from mail-pg1-x533.google.com ([2607:f8b0:4864:20::533]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lyAIK-00AQbR-VH for linux-arm-kernel@lists.infradead.org; Tue, 29 Jun 2021 09:44:42 +0000 Received: by mail-pg1-x533.google.com with SMTP id v7so18015803pgl.2 for ; Tue, 29 Jun 2021 02:44:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Egp2INH24GecpOyqDXmIt9wlO7BC40kEajevlBy0j3c=; b=KKfflM77Ww5SOuzT7DmT1GIeX0x5VOmSxBpbMVKSG367rvUR7Vs891hZ0rA8JD9LPN DILqKomfHn3hcFb271ORqCNsH8OeRsWvkJaHYPjsU3VqqDMAJZOL8SY0BDahznO0nkqP PJEd8dFPfBPPTfRTNpraJHZetghwEMyuu4Htk= 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:mime-version:content-transfer-encoding; bh=Egp2INH24GecpOyqDXmIt9wlO7BC40kEajevlBy0j3c=; b=n+iCMvWSXSnH2op5c5XPRDk/frlljMcUxVLxokgBVlGkf4hlKIhKoXbPK40fVwmcdv JUQ5y3QvWLtWAg6ayUXsegJWmJhVGPr5AkqWtXVzzTGm8wN4UGCgrAeVSdGs39gH8aqL Sp/CE5OVSN54b8MvTSYhz7qqk9fWcbIy8usHsyn3CYHweUj9Ky/WCYLoj29oQfHMbYDY TNVA04FlEKudpzP6xQzgBxdSK+0Anex6yP8UxMAxkiqJ5FnvZta0ln0b3GC5odLcEu2D pNc0m6vAnkYGtSLzKNpMG4NsD7W1Wc3IzUcMtfO6n9137hm406rBY0P1kfKf+Jwz75wR J3tw== X-Gm-Message-State: AOAM530+dF5a8U5GdvEqBBvuiozs+vRhX++OYRtn6CwRydUtFvIr4PBN gRqRVshfd8qwTuHo3l3q8qvThA== X-Google-Smtp-Source: ABdhPJxb1UAMqIPOICuhB0EY9ckYxXlb4L4WE5yeqXUyYXEGPBE1qDSui7jr01Ta0sSJ701ROVAxVw== X-Received: by 2002:aa7:8090:0:b029:300:18db:4e11 with SMTP id v16-20020aa780900000b029030018db4e11mr28988541pff.22.1624959880119; Tue, 29 Jun 2021 02:44:40 -0700 (PDT) Received: from fshao-glinux.tpe.corp.google.com ([2401:fa00:1:10:ebba:3e19:7691:d53e]) by smtp.gmail.com with ESMTPSA id f15sm17891538pgg.23.2021.06.29.02.44.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Jun 2021 02:44:39 -0700 (PDT) From: Fei Shao To: lee.jones@linaro.org Cc: Fei Shao , Gene Chen , Matthias Brugger , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-mediatek@lists.infradead.org Subject: [PATCH 2/2] mfd: mt6360: Restore error message to regmap_read failure Date: Tue, 29 Jun 2021 17:43:39 +0800 Message-Id: <20210629094339.874120-2-fshao@chromium.org> X-Mailer: git-send-email 2.32.0.93.g670b81a890-goog In-Reply-To: <20210629094339.874120-1-fshao@chromium.org> References: <20210629094339.874120-1-fshao@chromium.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210629_024441_064035_55E0ED8B X-CRM114-Status: GOOD ( 13.41 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org This adds back a missing error message for better log readability. Fixes: e84702940613 ("mfd: mt6360: Fix flow which is used to check ic exist") Signed-off-by: Fei Shao --- drivers/mfd/mt6360-core.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/mfd/mt6360-core.c b/drivers/mfd/mt6360-core.c index 6eaa6775b888..0ff8dae4536c 100644 --- a/drivers/mfd/mt6360-core.c +++ b/drivers/mfd/mt6360-core.c @@ -351,8 +351,10 @@ static int mt6360_check_vendor_info(struct mt6360_ddata *ddata) int ret; ret = regmap_read(ddata->regmap, MT6360_PMU_DEV_INFO, &info); - if (ret < 0) + if (ret < 0) { + dev_err(ddata->dev, "Failed to read device info from regmap\n"); return ret; + } if ((info & CHIP_VEN_MASK) != CHIP_VEN_MT6360) { dev_err(ddata->dev, "Device not supported\n");