From patchwork Tue Feb 20 22:06:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Griffin X-Patchwork-Id: 13564607 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 80020C48BC4 for ; Tue, 20 Feb 2024 22:06:43 +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=TBL7NbaKST9yzxpDSgVJs5+kiV5agDyOqOqk4Z4KiuE=; b=sRxQ8+vO5e2kVJ tFDg+N59Kd/0uz3nDPj2DmMCSOzGsex8DkKAsoJIeDqX8pEi9adFacMv/CBVPixG4raW0EY9MsvPN cqNOiTg22oVkqM3u80vHiTa9PfAN6UFd6HAGosSCgIRtFCYC0mc/Btk8NvTcqbhCWIevO6PRpSK8y qDslolm6zBwOjhsr9q3zAHn9xHhX+DMe21BeVcu6+ZpuKqVbV1ginba7zxVi+jcmBUCVfBaNPl2U1 DwG1TE6XJBFrbADPvLe/Q9X5x1A991c1f8/e/knGjzprV06/8KbQm2MYd9ngQb/vANmAWv45jRYkT g9FS5xxcQGMBanY2x9RQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rcYFx-0000000GJOM-2pKT; Tue, 20 Feb 2024 22:06:29 +0000 Received: from mail-ej1-x62e.google.com ([2a00:1450:4864:20::62e]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rcYFq-0000000GJLw-05Jq for linux-arm-kernel@lists.infradead.org; Tue, 20 Feb 2024 22:06:23 +0000 Received: by mail-ej1-x62e.google.com with SMTP id a640c23a62f3a-a3ee69976c9so238143966b.0 for ; Tue, 20 Feb 2024 14:06:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1708466780; x=1709071580; 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=daii2vCQdv00wY9FjSBPTiVONH9pzRxUrLR+kFtKtA4=; b=StwDvHr6745+4zi1Pn4X4/IT1wbwN+/4JcSakZTnYHEtqjW65pqCgsobhN5BhGMvFA n4ZQSY6bJrfnDZLZTWaehCH1JuUEMYT9AMKJD+fHfZT6rffACdzWM+RwvjJJzPeyuyxS q+cnlTXeLPfwtz9YZfHbSaB8VPFgrqHRNPyB7kyamppGWJzK1De5zOra7RuSik/+od8F epx0F5yiPLtCa6R44AXRJvU/Jhei7SX5K7lu0+hp62ef/ey3wfm6ljwteweyiDxXjWpU vCXdAZTG6kTJLhRbcahZlUSY9XZ4p3uzzj87AIpxWpn8t8sjERziqG3IX+zCk1VWAkst jo4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708466780; x=1709071580; 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=daii2vCQdv00wY9FjSBPTiVONH9pzRxUrLR+kFtKtA4=; b=G0W4Cf3nzd17zjmp6pN8ryMtfeaycSVboGvEEKG1J2WJscHT0sSuCXgioNEgHbfqDn uLOmbQUkMgxVInLZQaEp3bNUzzyQnNKP2r8K9/ZCEvq0tfrPT8P7Kis3/RbPnDnWCQZA MonhtNy/ySIUbr3Ejv2QvH7oPMSOuQUimS+LM6lLzqXe2mr6ZprDXT5+u+gWPwkBRXp6 I+0bL96rqQxpJx8s/7Vx+nKhUlV37fGuicDbvt7dZv/owG45DAwUDmF+crX7bSaCodDE Gxf3jDdbSeLmXOT+g+vHSDvrk96nSqg2g8Lua6xNU2Oa2IjzE1donTl2D1STt+Q2Rwbw BWJQ== X-Forwarded-Encrypted: i=1; AJvYcCWhEIPK6JPKJmKmdE6W9OgLlmPtyFa+YXqMYkHeFfB/bGlDdIwfgAGgKayH3BzOHiVuD56gZX1QlDexbJaWkkczXPqviuxZSOWvVm/90cC4ETA/ypw= X-Gm-Message-State: AOJu0YzA47dRss/AbFqBYzlHRMUIJwz/zr46rGpQFcaAeK1tWWO2v4Ot Ko0lRyZLyTt8FQHzbgEyLpVdymfwpBdCn6+JflHefdLq+bznWY0Kjj9Ig4/kA0Y= X-Google-Smtp-Source: AGHT+IENoRCzD3oMuUnlMnFJl867ZBn0wakLan0u2FvzSezPfB3YnUQKoLNvYdv4W+5EI7SAuJXN8g== X-Received: by 2002:a17:906:793:b0:a3f:2703:1c6a with SMTP id l19-20020a170906079300b00a3f27031c6amr585247ejc.51.1708466780215; Tue, 20 Feb 2024 14:06:20 -0800 (PST) Received: from gpeter-l.lan (host-92-18-74-232.as13285.net. [92.18.74.232]) by smtp.gmail.com with ESMTPSA id r8-20020a170906364800b00a3e4e7ad9dbsm3413771ejb.68.2024.02.20.14.06.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Feb 2024 14:06:19 -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 v6 2/2] watchdog: s3c2410_wdt: use exynos_get_pmu_regmap_by_phandle() for PMU regs Date: Tue, 20 Feb 2024 22:06:13 +0000 Message-ID: <20240220220613.797068-3-peter.griffin@linaro.org> X-Mailer: git-send-email 2.44.0.rc0.258.g7320e95886-goog In-Reply-To: <20240220220613.797068-1-peter.griffin@linaro.org> References: <20240220220613.797068-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-20240220_140622_069911_BD8E6EE9 X-CRM114-Status: GOOD ( 16.47 ) 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. Tested-by: Alexey Klimov Tested-by: Sam Protsenko Acked-by: Guenter Roeck 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);