From patchwork Mon Feb 19 20:42:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Griffin X-Patchwork-Id: 13563104 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 F04A5C54764 for ; Mon, 19 Feb 2024 20:43:14 +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=T/MgFHXNsb70sN qz3XD0FkR072g5mCa5VEqpCZm0DHqbT4XTyYkA0ibG9Px+iNdk9ORmWJR8ykY4h49NVqEREEUd7R9 oZyMdfq1YvesTU/dsPcqe/KZZTht+qpyiQWBPnjZbu612f5HDM5X0jujoyVUWoVIb/zpIMIKTSxnR m126hgk86GE1K0kHEfcN+OX9/we6zL1OebcMOyf1nVshRxvZIpgox7Ubb5OIDzsn+C1ZBn5A2SF8+ C4PNB4OfmkmfKBSlNqP2CXFoY91CZOazCWVEXPkhRdSDbEJrRp2RDxXQ2+Lme1rZLcnA0Yy1yiQtX jjZzc73hWDR3mH5wgL8A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rcATg-0000000C8X5-28LY; Mon, 19 Feb 2024 20:43:04 +0000 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rcATP-0000000C8OD-3jiY for linux-arm-kernel@lists.infradead.org; Mon, 19 Feb 2024 20:42:49 +0000 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-4126aee00b2so5287045e9.3 for ; Mon, 19 Feb 2024 12:42:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1708375366; x=1708980166; 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=bqV6+YyFUF4dGki83sP4LAmd6z27PjJaNJLHtlJDsShknkDqXoPbkgxZ+ZeX4ODpLF vFyWn5LjuqzE6mTFprxkUrfFNgjLxCO2UVeo9F1NFW4nH8Vq7k+81//jDOVMubSAIPAy m5rkIebTt1/UxETMnKrmgmF15oDr+dvs4cGqn6FnETR0K3Jmf7cwdd80O0hL28Yt0BzD ZXPdb7j+OUmvWvaCP8xQJq8nZFjxZU88ft5EXRBnQdUrGZUTxNx5iFaJXRmY62eY92iS K+Eev46Bj8bzrLrMVyVg951XyIGTfLHQYodaKTsY6gx8K6o3ZpUcPFxYRkGGccgEYp7t EXjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708375366; x=1708980166; 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=lJXA8MQRFZpeZiqUe8gGiQpQkhePCRCJdA6vSs0hrZlfPGR0yVgL0xvdpde83eYEG8 HOEFwCH5Zo4mk8l6G0RKyChVMljoFH0accIfCtJIebTxc5AbWF1iLUAWU6XJcD2UekJL rvBiECqwCz9Dw6qFZ+g6//jVncEwHIfoDVVacnH2GqOiwq074YfOVT9Maf3GSbPWiEKc a0mq+N6IsY1nRx9Lg6t/2qynvDX2JVNtvY7T2P0qSqn/PdC2stiqfAXheEMicjYFpDV/ bjDHzGTAdla03kku4IfQaKKNL7wGLB8hO//GIKrq+d9hoWbaDexeycZChompQFiEfZb9 Q8Kw== X-Forwarded-Encrypted: i=1; AJvYcCWEMcTVKRcxbmxwox7TVT6O5lO7DMtR4h4u3fXNvesKn53FH7NYYHC/g6B1MUOX8il/X1be6N8bAm9oyL76nzwETsE9k9fPF1yrn9KVGgS07BLXHLo= X-Gm-Message-State: AOJu0YwlAWx5dll4Qs/cccSXmbe72AQWq9S1pj4mv5nYDzf9MqAXZsRw 6TZF1yCu3YY7DjwXCfvSJjFyjjU+LJTZDXisCEDthfirNaHqiDA0zLLL8t6TxI0= X-Google-Smtp-Source: AGHT+IEcLCWqzEAqp5iQ3VVJMqv2pDXsuNSFdg1jtINv2Aw7ij2NaJ/bQGx00hCn5zu5haX9xWIfMw== X-Received: by 2002:a5d:624b:0:b0:33b:381d:a71e with SMTP id m11-20020a5d624b000000b0033b381da71emr8750226wrv.17.1708375366132; Mon, 19 Feb 2024 12:42:46 -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 bx15-20020a5d5b0f000000b0033d202abf01sm10561000wrb.28.2024.02.19.12.42.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Feb 2024 12:42: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: 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 v5 2/2] watchdog: s3c2410_wdt: use exynos_get_pmu_regmap_by_phandle() for PMU regs Date: Mon, 19 Feb 2024 20:42:38 +0000 Message-ID: <20240219204238.356942-3-peter.griffin@linaro.org> X-Mailer: git-send-email 2.44.0.rc0.258.g7320e95886-goog In-Reply-To: <20240219204238.356942-1-peter.griffin@linaro.org> References: <20240219204238.356942-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-20240219_124248_056137_4EB212FA X-CRM114-Status: GOOD ( 16.35 ) 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);