From patchwork Thu Feb 8 16:17:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Griffin X-Patchwork-Id: 13550015 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 17F0AC48260 for ; Thu, 8 Feb 2024 16:21:48 +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=ODiAIagjvEIWy4 VW/fIySbIjpeaevnfZZJxt5rQ5SjOOMVPacoK8eK98o8nu0Wn08bnpAQTRfb0Qfe2mFHJyVlXaguT rYHRnmrjhrd0/QxgPpZuaAUPz+hquFgUihw5lHomgKOsV/nhw3byuWUPHmgn+BmdqO/1RHXsC3geB vUQCrx8YCPRDl16vsPDSx7lxoJj/zG9C5QK/UnpKEwTQlhcijK6QDErZEjk728RtgMqpKBBBhdWU7 3HjqQ5efu374ohby7Bf8xizs8RP7cc/sy936nj2TCc1f7EWZRONYU47QHtxUGTMtui3IKno008Mk3 XTP0DuExFXwqGkCPxZjw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rY79Y-0000000EIDr-2eTU; Thu, 08 Feb 2024 16:21:32 +0000 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rY79U-0000000EICl-0Yf3 for linux-arm-kernel@lists.infradead.org; Thu, 08 Feb 2024 16:21:29 +0000 Received: by mail-wr1-x429.google.com with SMTP id ffacd0b85a97d-33b5cdbbe4dso205268f8f.0 for ; Thu, 08 Feb 2024 08:21:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1707409287; x=1708014087; 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=RLQHqUIiygROBpuJAeyzPL2AiJq+y9XuszUbTidQwaIaJl+HyMVj7/D3hDzYdyE8ED cMrVYCss8xWcmBAHs2hKV8nb7NndPqY27Vd84w07JYR0JDSSOsQKeBCteA8N6ExsUddw eq6DmU+k0C1IamEyh6BzElgQ4QMq9ou50VqIhEWq1tkPglYSYSYDQLABWz3eECoOE7IU 8vd+W1YDJhSQEFeABwCSpZHdRsOL3l1cD2uBIXs8p9xbUEDYNVqAXi0cM5y0gr5o0IXY 7Lxmow9E1XDwcpMtAkThhJpPrcaan9Z7fTz7C8SOmyNMWZoyunS440cSyChd3pdSyRDt Tzrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707409287; x=1708014087; 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=ZhE/pcWMWbbsxZU622sna2gOgyzIzC2bdF/jw3EwMzl8LRJmoUCJxCX1luwZqElXUH wi7TsoSCGEmDcTHBLcWaJJFBibwqnD6ZSN8bZaG94Y2BBvBXnRwaTOOXbRJYECKuQgJz AmIugxXn9km5w9RLjm55u+7/cQMpOhKUYYh5K0KkzHBGY8JnpsAvUJgPsxIlrik9RDi1 Ed/HXuiRmIsBWWavFVmQP6OPkuKe2p4otyH7qVLagN2BUMwrHv78/BjNFNgEYsT7My8U Yw/ga2653HeEMonGVdslGi9uaMkpXzYyWByn5K68iyyk5LvntTTkDiP9o3CuBy9RBZzx xV4g== X-Forwarded-Encrypted: i=1; AJvYcCV2rFW4FpNuiDOGUBLOjvDmEqqJIdUJvdwUuvmLwSl+UxrAPHxXS6vhZem7H2xAiIw8ws+4VxsuqWSvTVPG7dYtgap1tCngCYEAPzAObzxEr7qAMOc= X-Gm-Message-State: AOJu0Yx5iQwWn/7vAQ1+0/rKBhOneih3iDSSv4soHNJS9F1MiHWaTVBL KGp8dKfahuu+bX3/3tGSv4tZ/6zk5EIBW8S2c7VQUabqgtQFQQPXo1BDSlyjvNo= X-Google-Smtp-Source: AGHT+IE9GqRr3/H8i68cQfLtU2iGCsiCKO3R5gWttUZU/5XxgjUSyD0tIivpaca4ynGb4xceQrCnNg== X-Received: by 2002:adf:f70a:0:b0:33b:37fd:eafe with SMTP id r10-20020adff70a000000b0033b37fdeafemr6274601wrp.69.1707409286849; Thu, 08 Feb 2024 08:21:26 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCW9QSqiihNfbdq7cJ4HSCgq7fx+xjvtIvCIXg1uNCblGGv7Zg6YsinZ5dEMJMj69hMDubW2XrTIRaH6V7oYBE1TZC8bkhHTFZ934qZoXq6oi9iOrCffZd40IW3EcRm+L5xkK57a7Ppt7kZeBlt+Zygiq57SPJdM37Woe2JsiCVeeDVsUZ1PoCHzxHB8fV14T1Y4zjvsLIZZ+dOzFTPdbMFOEqKU0pavc/Lohx+YQypK/LXXMPXfJQzDyOHL7J89SG4dkdanalvgC5BKGvCY/X5vTD1FzWtH9OKWfwkSTGyU1+bYYNm/uPKfETlFW3FDYzcaJTOrhjWXBxAQUxJreX/KIouUaKXP3vlto6kFlc85D4BApqOxAF6y8nrkPNe3Z+CkorGdR1jj67GzDFZ6Oqq+YR7zLHyiwktg8qnrYK9ImbMJEysPJ4Z73rPDIQ6OfMHQU4azQjrWrYCgXQURS3A7kCr0TOuRJAQPZa0jg+zadEv4d0Er4MQzyY840BGFmVxND9EZ7KD5p8b6G8m5mncaAIxZBGl4+h7lils0U0aYEGw9pNJ0HSkEe78rwZNhMgOiH1uZoKT5FOqrBWYXOeVIEIIX2DqWcvhpGGb8H80inclkduhb+myMYQxfQdW3d/Z94mtwlK/CuyzG22kzc2dlxNwiQalosE+9p0E= Received: from gpeter-l.lan (host-92-21-139-67.as13285.net. [92.21.139.67]) by smtp.gmail.com with ESMTPSA id v18-20020adfe4d2000000b0033aedaea1b2sm3915846wrm.30.2024.02.08.08.21.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Feb 2024 08:21:26 -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: alexey.klimov@linaro.org, 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, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org Subject: [PATCH v4 2/2] watchdog: s3c2410_wdt: use exynos_get_pmu_regmap_by_phandle() for PMU regs Date: Thu, 8 Feb 2024 16:17:00 +0000 Message-ID: <20240208161700.268570-3-peter.griffin@linaro.org> X-Mailer: git-send-email 2.43.0.594.gd9cf4e227d-goog In-Reply-To: <20240208161700.268570-1-peter.griffin@linaro.org> References: <20240208161700.268570-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-20240208_082128_196599_0994E050 X-CRM114-Status: GOOD ( 15.85 ) 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 Acked-by: Guenter Roeck Tested-by: Alexey Klimov Tested-by: Sam Protsenko --- 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);