From patchwork Fri Feb 2 14:57:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Griffin X-Patchwork-Id: 13542972 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 31E5BC48291 for ; Fri, 2 Feb 2024 14:58:01 +0000 (UTC) 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=jd+Mb2dr7S97XK60tvAEMZRvPePYWlX7AgEEh+Xan1o=; b=XY4qEovtu8DFAl mFmjS4Ic/eG58zYJXpkcPTOMalpjTkxeTEr9V1Z0Lk2hFN9t5AfxUfNon19utU7UyZaKiJMekqQET jc67W7CxUImJ6pWvR8u0nR9t3fosvwhTR0P5qh3Q+W5EaVcOCrNJPEdwawih2LZo2bbKwCUHr6ixy gBoY7raWEZbU1hjwl4tpfkg7VwiF0+7skMvfWmVMDTZyLuP+FNduJDQRzWbejlBAFNAKGQgVah5Od Hb+wbtzi86YKgzQbI8PuRMEtacVzualUUgAcxzTDhu3jyznuhXr+D6+V192jmmFrsmwKnz+6ndfvG DkNVPQobp3QDvrR+KY9Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rVuzI-0000000Bs5R-2jjm; Fri, 02 Feb 2024 14:57:52 +0000 Received: from mail-ej1-x635.google.com ([2a00:1450:4864:20::635]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rVuzD-0000000Bs2R-2iwI for linux-arm-kernel@lists.infradead.org; Fri, 02 Feb 2024 14:57:48 +0000 Received: by mail-ej1-x635.google.com with SMTP id a640c23a62f3a-a359446b57dso281822866b.3 for ; Fri, 02 Feb 2024 06:57:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1706885866; x=1707490666; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=nxb698xf8QkMydB4z0YB9c3r/9JegaMn6kB+mk5+8LA=; b=lcN+vmY0Idyng2fepswOgF71MeTBqWlhxysMNPXohLmKqeHZZ7OGtdvqBO9h6UWhA4 sK9N3WCpUwnIVriUYHSxPusDPtkMON68pCwaa2McUa+u4L2kfKLjvZEe1VR4fK7v7rEz Wwmm/iA0rlyUHE7J6o24atwvy85WhB1JEfn2nflEKD/cGJG41VDuvWoKzkDQL/P04ts3 VArxe2MKhApaknxB0D+OMfm8fp1T/B2LUYfNXhCPRAktRBc/pOOzhWKvxG66UnVftLgw bGrt0N8wHSecK+v/dRrdjx/xr8bcbWSqRcXcP24dhAUahxXehyKoGriIbgbDkcUEi/hN Q0Mg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706885866; x=1707490666; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=nxb698xf8QkMydB4z0YB9c3r/9JegaMn6kB+mk5+8LA=; b=Y+FcfuHjZqEnSGJ/6lVJsYoeB9vhdG/zIqibm8rqzJ+In985kSIgpqhrjQKxRaQ77A Fx1c9REznaESh/vf7oFqd5RMePXKj5EAAik7LceogLSUC2dErvyzDt8AIn5/AwfRelmm pUEUlkhPyo/d/zJkE0wRX/KVQH1U7vI4XfBGizOj3HmTAnEcAU3AMFErKHIMEhsWuGI9 gLqUW9rGch4TN1NEGezfssz+7Lb4el6zcGvvYNvbBDbAhJIQR+0Bw0nmkissfn9jYByq MNG6nxfh7hwIuyfvkfOW3iCC+B2hKo7nRVwfQYUTrR8I8V++yil8S6HlxgNfux+btvcB q/Jw== X-Gm-Message-State: AOJu0YxrGqRbn94E9LnyEoGQ1/cIRJO2I9JYi/0tyI4GXyo/PvzO2Ue2 i2jNNMLY9kEok/dphQSnk7esN2ia0rFLQsY+9UlfDUdR9fapNLX5nirpX5yR4Gc= X-Google-Smtp-Source: AGHT+IEq5+ecus9eptHUpdICSkpu0fVKudtg5PpRU+RWCPogFNs8q/6X9DnhhUg2PfG3cuiVlChiOg== X-Received: by 2002:a17:906:30c3:b0:a37:7fd:9a1e with SMTP id b3-20020a17090630c300b00a3707fd9a1emr1331738ejb.1.1706885866301; Fri, 02 Feb 2024 06:57:46 -0800 (PST) X-Forwarded-Encrypted: i=0; AJvYcCXrgol+/K1m0i+gOh3V1PPaImHM0PUK7M2r5Dhk8DlbpenPP7J3oMx0Nu4z1Jcs9BMeM2nQPP9g8rKwaLyJxpSaW8BMRXW9G2cT9pZiqYa2kM2u8/fyuzQUC3HDW+SeAuGR8pyG0ALCT5h3XKnM9HLMfR5cCakEeuHs4glq5BGPJyIkWw23UPoxZFPIomrq0AqPtjjo3zGb4cT/Ooy4sWrfQmnp8+QkqA1eg8pknfWgaPMI+Cku8uOOmxVGY6DwVjxGS5aUsg8cHCsGUjJ6QlN3trlh035+uQK1peWwRYMKfC/719FJwj6ah0p3cWDp7hB+RU1z2wq0zIjCeSyoUc+wtlJ0Egcn+YON3VY/7m5u5m1+LegS6yZ1+/5V5txyyQpwwioOPjwESPuc7rcH+b91kgI7P5Eua1ZqrBuyktP28MUhpYO39r5RMb6kMwvegotd4a9BHVTP1UUgzTFzR/3xIuRtWcEGB6jDdS3F6qqkZz5ikEFLHly7CU2lY+2b7zGdusclQ/jk42rXZ6+jwzzBR9Ao0EhC9b5IozdHuH33wPvM6IRRw7gfCj4UKCQX4UPmOOXXfelfeIDyhR1Yumga9mB5PTE40iL5rRxnsyKVYKhDWIOst2adexrp/clU6H/VPwaIM3E0AUTpSBIXGZmj7x3U6ay4Rd3Li2p4UmlJhnRIQEBSAbRHmgJkw8luLlGRaHc9JVD1OQ== Received: from gpeter-l.lan (host-92-21-139-67.as13285.net. [92.21.139.67]) by smtp.gmail.com with ESMTPSA id t8-20020a17090616c800b00a36c60180aesm957200ejd.60.2024.02.02.06.57.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Feb 2024 06:57:45 -0800 (PST) From: Peter Griffin To: arnd@arndb.de, krzysztof.kozlowski@linaro.org, linux@roeck-us.net, wim@linux-watchdog.org, alim.akhtar@samsung.com, jaewon02.kim@samsung.com, semen.protsenko@linaro.org Cc: kernel-team@android.com, peter.griffin@linaro.org, alexey.klimov@linaro.org, tudor.ambarus@linaro.org, andre.draszik@linaro.org, saravanak@google.com, willmcvicker@google.com, linux-fsd@tesla.com, linux-watchdog@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org Subject: [PATCH v3 2/2] watchdog: s3c2410_wdt: use exynos_get_pmu_regmap_by_phandle() for PMU regs Date: Fri, 2 Feb 2024 14:57:31 +0000 Message-ID: <20240202145731.4082033-3-peter.griffin@linaro.org> X-Mailer: git-send-email 2.43.0.594.gd9cf4e227d-goog In-Reply-To: <20240202145731.4082033-1-peter.griffin@linaro.org> References: <20240202145731.4082033-1-peter.griffin@linaro.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240202_065747_725408_4183DD6A X-CRM114-Status: GOOD ( 16.60 ) 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 Obtain the PMU regmap using the new API added to exynos-pmu driver rather than syscon_regmap_lookup_by_phandle(). As this driver no longer depends on mfd syscon remove that header and Kconfig dependency. Reviewed-by: Sam Protsenko Signed-off-by: Peter Griffin --- drivers/watchdog/Kconfig | 1 - drivers/watchdog/s3c2410_wdt.c | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index 7d22051b15a2..d78fe7137799 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -512,7 +512,6 @@ config S3C2410_WATCHDOG tristate "S3C6410/S5Pv210/Exynos Watchdog" depends on ARCH_S3C64XX || ARCH_S5PV210 || ARCH_EXYNOS || COMPILE_TEST select WATCHDOG_CORE - select MFD_SYSCON if ARCH_EXYNOS help Watchdog timer block in the Samsung S3C64xx, S5Pv210 and Exynos SoCs. This will reboot the system when the timer expires with diff --git a/drivers/watchdog/s3c2410_wdt.c b/drivers/watchdog/s3c2410_wdt.c index 349d30462c8c..686cf544d0ae 100644 --- a/drivers/watchdog/s3c2410_wdt.c +++ b/drivers/watchdog/s3c2410_wdt.c @@ -24,9 +24,9 @@ #include #include #include -#include #include #include +#include #define S3C2410_WTCON 0x00 #define S3C2410_WTDAT 0x04 @@ -699,11 +699,11 @@ static int s3c2410wdt_probe(struct platform_device *pdev) return ret; if (wdt->drv_data->quirks & QUIRKS_HAVE_PMUREG) { - wdt->pmureg = syscon_regmap_lookup_by_phandle(dev->of_node, - "samsung,syscon-phandle"); + wdt->pmureg = exynos_get_pmu_regmap_by_phandle(dev->of_node, + "samsung,syscon-phandle"); if (IS_ERR(wdt->pmureg)) return dev_err_probe(dev, PTR_ERR(wdt->pmureg), - "syscon regmap lookup failed.\n"); + "PMU regmap lookup failed.\n"); } wdt_irq = platform_get_irq(pdev, 0);