From patchwork Mon Jan 29 21:19:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Griffin X-Patchwork-Id: 13536434 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 7AA30C47DB3 for ; Mon, 29 Jan 2024 21:19:42 +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=YePURY35fidhaoZcezexQ25ak3qMhZZWcCuH2K2JHn4=; b=pL4LbKryNOo1Vm 8QnhgPWxVsWngx3ghUcbeZLvtT0jj/49/JBCPB50F+B3C6az+sFeoSAIUJ/h7CR+qh9xRkHpaYXpV oF/xEeG1dE4GpsbXLUPEfnXp5+RJ9zmu3RXZQNN9tu+K5R2GMt00ke/ynVCEeyd/0eiMe5GH2OAWM VV5shKffUNa/WOgD5qriLmYCKJfIUYGow7KndiRk1M1TNyGU44LGQP9iXFu50f2Zcc2idUOeJIB97 8m/TX4dAlq/A9T61fmaAar6gMHkl2kR48R9b+e4g39vtvFgZ2nEXgorSMDGivgNJ7KvFTygFZmPL1 t9etRvNllsoRZzXUaAHg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rUZ2Q-0000000EM2K-3gTI; Mon, 29 Jan 2024 21:19:30 +0000 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rUZ2N-0000000EM0h-3WVi for linux-arm-kernel@lists.infradead.org; Mon, 29 Jan 2024 21:19:29 +0000 Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-40e80046264so43111885e9.0 for ; Mon, 29 Jan 2024 13:19:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1706563164; x=1707167964; 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=z9S0cbpz+w0Ro+UeWqvavBY4QIBfmENEBk/Ib6o78C0=; b=wi3o092acFdfZfQUh5PRDLqYBEgff3O3C15JSoqsr9eHHosz9BGzv61qBNc4l+4EzD UTvL0nNOEh9oZgMfjsgDwOISmVXgXhw4ofXxPHZnLJiDCY3CEzATzy7UkT2RcMCHWt2d Y5JJc+ZVXmjPUNI+I5VhlRZQQjSCRBBnjmUN8xOlSWrjiADbBnl//uvyJdiJIkVljgAq 4m5UX9fJNAUv9EyCgFSI+Gp1Dn3+71FP0qO9sneYBHt3J+ILA0CVpaZn3c43dvx17YjX nKJ/D4pcDdBGndU78QBtMwCkmG/S7fTR+qgAcd88RqFdw1AkdaIMFHJZV3H4i6/nuE3t 5MMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706563164; x=1707167964; 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=z9S0cbpz+w0Ro+UeWqvavBY4QIBfmENEBk/Ib6o78C0=; b=A8LLXRzbxa3bC3DrkAVvRhX5FrrO9HkbYQrtU9fAuUMq3mLnkwhgXwbKKwRBLnSWsK hpHkPPOJJzsAP0uFx7arYQBl0KM+1wD3BgghBpdd6frXPnpY9eA15TMsBnoMRUnrX2DD uoaxKLxvBwbcAJWSKs9Ex26aaJrxUfmu3UothtdxlaEmJCeruRzZsST3gB0SPJfS/YHW OPQWahgLVy7mrl7BaNOrjtF5oxSvq0T1E7KrAaNNZQWQs3IroifGCoMvI7S1UblLOYEC nOt3DAt6bzWnq47YzMrvpVOFYU6fQqZ7m6yerTe1LUtQoL7RDrfqrdR/CKz1fR5THdkW gagg== X-Gm-Message-State: AOJu0YzItRne14bj4CEcahvJM9t4WRJQk+6wITmWbM+qdpzTzB+5lhTA dxRJZ6GWItwlAyFrK32Tn9VPN7IuFwVXdUzHRLOnkckrbeQc66WyFkF0txI2ct8= X-Google-Smtp-Source: AGHT+IGRgk5GtfOJQyRiGtbxBlTIlUTAyVf6cU6RUUU54aSsEc2ZIIRYWl3+Pb5eH74+lrAfwBsHyA== X-Received: by 2002:a05:600c:ad0:b0:40e:779f:416 with SMTP id c16-20020a05600c0ad000b0040e779f0416mr6409689wmr.2.1706563164594; Mon, 29 Jan 2024 13:19:24 -0800 (PST) Received: from gpeter-l.lan (host-92-21-139-67.as13285.net. [92.21.139.67]) by smtp.gmail.com with ESMTPSA id iv16-20020a05600c549000b0040e3635ca65sm15126928wmb.2.2024.01.29.13.19.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jan 2024 13:19:24 -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, 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 v2 2/2] watchdog: s3c2410_wdt: use exynos_get_pmu_regmap_by_phandle() for PMU regs Date: Mon, 29 Jan 2024 21:19:12 +0000 Message-ID: <20240129211912.3068411-3-peter.griffin@linaro.org> X-Mailer: git-send-email 2.43.0.429.g432eaa2c6b-goog In-Reply-To: <20240129211912.3068411-1-peter.griffin@linaro.org> References: <20240129211912.3068411-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-20240129_131927_908895_F4C334AB X-CRM114-Status: GOOD ( 16.07 ) 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. Signed-off-by: Peter Griffin Reviewed-by: Sam Protsenko --- drivers/watchdog/Kconfig | 1 - drivers/watchdog/s3c2410_wdt.c | 9 +++++---- 2 files changed, 5 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..a1e2682c7e57 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,12 @@ 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);