From patchwork Thu May 6 09:41:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mattijs Korpershoek X-Patchwork-Id: 12241931 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.4 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,URIBL_BLOCKED, 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 C54B7C433ED for ; Thu, 6 May 2021 09:44:29 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (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 282116112F for ; Thu, 6 May 2021 09:44:29 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 282116112F Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=baylibre.com 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=desiato.20200630; 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=vZFmfeMwZbxFrow5k/t8B24wpe/NJbXxjqsjHkqMKJI=; b=FMrLJUe1x290RDv7oXqT0Pwp5 NVX0FIG9WQwI1uv228t38XVkMxzi2BC6RbcNfQhWq6GayT7cgeYkrEcXFNxeM+4DrqXN3KBZqtmnz b8VFIC3K5d/rsJJ5Z5vR24vbou8CrqnlDvTG5EKwjWNdPZSeGGG0kXpt2hdm1ft/81we8x6op4UHv Xck5DK5DcX5dN5ZqH+CWBzEL/pVDE3VC9Iyy7ZzpEUyA4DSosUwAm+r+YsKT6V32sdcCqdYRx5DNQ uTqDgeBpdywUhu2J8rxylyKXvZCagyRkIAfJ1flNMnRqh+Pro3RPayXG+ezAoo3SYo3wWjnG5fOU2 RZYQFo9yw==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1leaWJ-003qRV-8s; Thu, 06 May 2021 09:42:11 +0000 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1leaVe-003qKe-Cl for linux-arm-kernel@desiato.infradead.org; Thu, 06 May 2021 09:41:30 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=WGLMaIjJ/59GAV1ofZhUU7K8F2hooQOdMuE41Fq9fiw=; b=Qj/Mwrcjc3B3BU03wrZUVu1bcX cWrZshkgKMAdqJ17E/Yz7vp7cWkgkEAlY14QWzuOBkeK/OKN4YWL0PDIm8U32khh0qfkwesiRG6jC VgwLbeY6DOSXRcPJdo5AH4QB8h2VzqGY55nRpfQ9jGIPg8HGNnc8iUFyrPD7xaRs9E8ENSCsfGYXr GySuX917w9t8EUF3UeXx7dSJ0RKBVWyTPnfbJ8THeGvt5Fke7Ur22VebDX1CHbTbLv1xmTZ5GL9rz Ymh7mbSY/Lw7gTHStTdZF4PdffkmPup1/Q+yjrn/Pr1C14R5Bh1XX6T20rwoGEERq5TfvmuF44BRT u82ZEkIA==; Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1leaVb-005uyn-G0 for linux-arm-kernel@lists.infradead.org; Thu, 06 May 2021 09:41:29 +0000 Received: by mail-wr1-x42b.google.com with SMTP id l13so4860182wru.11 for ; Thu, 06 May 2021 02:41:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=WGLMaIjJ/59GAV1ofZhUU7K8F2hooQOdMuE41Fq9fiw=; b=RkMnsD6KvMi6ZHCsPL8Dnl+4tGuWsXTN0tNVSraD1ZobCZPyShwIr47yrOkmMSQ1YE Dbw4UZHC5UpyoSn/gIIW1Ah18Rj9PgOMgz3EcHWBiEuVkdEpttBAnDiMoUtgv5XBIMLQ GMvKu7m3Z2D2J5OnzQd4sraDUcwPY83/P/UxzsGnowrwefRRd71b2s7c6YyPqM17BPlL JwE7IZI5WMOy+CcJE6XsolcQwzhQOt0DyQqkhxg5WUiYQ4xZwBmxrcsbi7OUhdx14BLe DZUW4sxnIOOFW2HnydnhO6RCGjz8Qr6z1ZclNx0bdPzpwnKNhgtgIoEKGqz7vAJ38iSC sqXQ== 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=WGLMaIjJ/59GAV1ofZhUU7K8F2hooQOdMuE41Fq9fiw=; b=dc0ET9GjdeqAmOD1Ojsz/PBcG/PouDMsD6a/TsCsKlZFIhwNB9OYVMwrDTqd2vf/Io 1KqgOKr0AjDBKHXB8BoFHcyOsU+o+G5unAUocFSJwmYYGcrBq/T/QBjcwtRPZHM5l/aS B21pqXXOHX56fJRvzbyxzLJAhGkh1z/7obdPWulBGqfVYvLJyY0nE2ZdgR8XkcpqjGnr HqakSqGe5qS1OKLsI809JE90QnjHrby6Q8J2GBehFAchpICGHul7Sg7aZlHY627cox/B JJn9LllelodeThxTNWeVF/oN1dYxbgyeBI4wpmGjX3eA7kPDc7WCLF3NqfiCxqOj2hqc gGtA== X-Gm-Message-State: AOAM533RtzgszwkxaDhKBKFvXBSSwKHZgS+yujPxSVJ6RmO+M2f0NraL GTFngjR5XaH5jyIMNvHtra2NnA== X-Google-Smtp-Source: ABdhPJwfEmWX/6FYzIU3H4cSjuIgImGG9IfqUxLnFTDYk1RcDZyq0ZieLpUOw1Km6YShmQ444UtqXg== X-Received: by 2002:adf:fd0c:: with SMTP id e12mr3802633wrr.324.1620294086330; Thu, 06 May 2021 02:41:26 -0700 (PDT) Received: from groot.home ([2a01:cb19:826e:8e00:2492:c5b6:6c3f:6de4]) by smtp.gmail.com with ESMTPSA id y14sm3360421wrs.64.2021.05.06.02.41.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 May 2021 02:41:26 -0700 (PDT) From: Mattijs Korpershoek To: Lee Jones , Matthias Brugger Cc: Fabien Parent , linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org, Mattijs Korpershoek Subject: [PATCH 2/3] mfd: mt6397: keys: use named IRQs instead of index Date: Thu, 6 May 2021 11:41:14 +0200 Message-Id: <20210506094116.638527-3-mkorpershoek@baylibre.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210506094116.638527-1-mkorpershoek@baylibre.com> References: <20210506094116.638527-1-mkorpershoek@baylibre.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210506_024127_552392_A8DFD448 X-CRM114-Status: GOOD ( 12.36 ) 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 Some pmics of the mt6397 family (such as MT6358), have two IRQs per physical key: one for press event, another for release event. The mtk-pmic-keys driver assumes that each key only has one IRQ. The key index and the RES_IRQ resource index have a 1/1 mapping. This won't work for MT6358, as we have multiple resources (2) for one key. To prepare mtk-pmic-keys to support MT6358, retrieve IRQs by name instead of by index. Note: The keys_resources are not part of the device-tree bindings so this won't break any DT schemas. Signed-off-by: Mattijs Korpershoek --- drivers/mfd/mt6397-core.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/mfd/mt6397-core.c b/drivers/mfd/mt6397-core.c index a83fbc486d26..5818e0c328c9 100644 --- a/drivers/mfd/mt6397-core.c +++ b/drivers/mfd/mt6397-core.c @@ -46,13 +46,13 @@ static const struct resource mt6397_rtc_resources[] = { }; static const struct resource mt6323_keys_resources[] = { - DEFINE_RES_IRQ(MT6323_IRQ_STATUS_PWRKEY), - DEFINE_RES_IRQ(MT6323_IRQ_STATUS_FCHRKEY), + DEFINE_RES_IRQ_NAMED(MT6323_IRQ_STATUS_PWRKEY, "powerkey"), + DEFINE_RES_IRQ_NAMED(MT6323_IRQ_STATUS_FCHRKEY, "homekey"), }; static const struct resource mt6397_keys_resources[] = { - DEFINE_RES_IRQ(MT6397_IRQ_PWRKEY), - DEFINE_RES_IRQ(MT6397_IRQ_HOMEKEY), + DEFINE_RES_IRQ_NAMED(MT6397_IRQ_PWRKEY, "powerkey"), + DEFINE_RES_IRQ_NAMED(MT6397_IRQ_HOMEKEY, "homekey"), }; static const struct resource mt6323_pwrc_resources[] = {