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: 203829 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:693c:2685:b0:108:e6aa:91d0 with SMTP id mn5csp691030dyc; Tue, 20 Feb 2024 14:07:26 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCUHaWRi0l1LWxSRb7OSfF9jQ7l9r793OkDvLOfClAejxnMY33/vYWR6PiVtvxeMtVTc3FG0Fbs7tIFqCBDeXnCmqvBxhA== X-Google-Smtp-Source: AGHT+IHDMPBE7AWieDttuyLb2Vf2vEiV9xUU9V2cTNxEJCmn+Ml8BTtVFHIwrzoh83Zgj039b3Vs X-Received: by 2002:a17:90b:2383:b0:299:9521:90ea with SMTP id mr3-20020a17090b238300b00299952190eamr6228108pjb.6.1708466846614; Tue, 20 Feb 2024 14:07:26 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708466846; cv=pass; d=google.com; s=arc-20160816; b=g7Ks9SA59BbtKMrrKz/4fWrgEmqjDzidkyxIbe1ucqcJfi1A4cwuoZurt8WurMyuId wZtw32USt5GsMYoNrk6vQCpeXQEr1hnwnrNIAf+w8aJqnPZKzxGwhVt1ei5fLuJgsVyU pFwsKlnTMi7wQYZDD14kOkvs79cwL2q4p/8NeHdflVdTi7CxArz5rqDxsTFAYUJNGFxe q5016nKM+lgjPT45eD9AnNxGLuA5x2IbelvKj8g6zcZUXEgtKILYF1YzJdj5+H/mM4Jb gfbNkE4IvEwcb7EBbI5WcqWPlMZejMvMVmScAx6vWDYNWkfcF52pAGdx0EeOAzXxlocD 4mAA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=daii2vCQdv00wY9FjSBPTiVONH9pzRxUrLR+kFtKtA4=; fh=KXfrJtNocDaG2Xfr6xSkrZR37ELaVV7lD6DKWOx2VWM=; b=jlm1+IxBmfIfWyVcEInWAGnUQwH2uLjV3txqR3mm9u6oZQt5fbOqih5VwKuZZrMEi0 8O82PG/3YZHchfAqb3swAIcwuiJKyqkTAV6txTY6309qf8rCP9R88c/rBCS62/KHX7Kn 24zq3FijDbMjMM7NnE7EAJEYPB4BTdaOPRi/5iK1qQRx6qyIpDVyEJWQAo83AHLrsUi2 LXUk+rk3jXMn5ttL/ZdqLPBNiD6ngIiGnwQHWV4PHsKV9DOv/FONVrULwOedDIV7OcbH m+B1Qu4UeUbNOWAxSPec6WlUHXl8Gs43TzJoEQlZ8l2bxDjceowXoxz7WMOSiG1v8PSj wdPg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=meEQlzaU; arc=pass (i=1 spf=pass spfdomain=linaro.org dkim=pass dkdomain=linaro.org dmarc=pass fromdomain=linaro.org); spf=pass (google.com: domain of linux-kernel+bounces-73748-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-73748-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id i24-20020a17090ad35800b002961a86db73si181767pjx.102.2024.02.20.14.07.26 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Feb 2024 14:07:26 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-73748-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=meEQlzaU; arc=pass (i=1 spf=pass spfdomain=linaro.org dkim=pass dkdomain=linaro.org dmarc=pass fromdomain=linaro.org); spf=pass (google.com: domain of linux-kernel+bounces-73748-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-73748-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 70DCE282D52 for ; Tue, 20 Feb 2024 22:07:26 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id F2EC1153BFD; Tue, 20 Feb 2024 22:06:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="meEQlzaU" Received: from mail-ej1-f48.google.com (mail-ej1-f48.google.com [209.85.218.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0C85A152E1C for ; Tue, 20 Feb 2024 22:06:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708466784; cv=none; b=SNyI3OqPO1j80zI1gCYXkTEqKREzyA9ECJpsfqAiS9FE/sqfTcZra+LXhR8AE/ct+hPMmtBez4tYvnh1cWZkx37Yfcgcp2ol05YQ3MpQAcJiZmaCN30Uitkf4UeaaHo0jl4VZUwO242JDpri/6DWjh43eR5tJqnzjtf/19+MpC4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708466784; c=relaxed/simple; bh=0qlxg4Wl4LV4zmhyFrXH9tW2Y2omtNhqxGLvqo65VnU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=WccaRps84cdDqJV8oJOG7CAMzQorlTAL26hB2xf5GYGGJ3bKZzxq7tO8Z5wBo+U/4a1lEzxEPTltCuPSE1CJ54Rm29l35LMvoRY2k5NHkkRjMb8qsgE5wFJa2MvvuvHQwNgdWrSS4S2Pz/oS7h5oSCvBPNrsbhQI3mlMUv7RSSs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=meEQlzaU; arc=none smtp.client-ip=209.85.218.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Received: by mail-ej1-f48.google.com with SMTP id a640c23a62f3a-a3c1a6c10bbso772159266b.3 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=vger.kernel.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=meEQlzaULVexn+WCqEta3SKhfTZpGxWvDmvRU4Ecd6Li3id1n1LC0el6bdccUEWhpW VbpSHtE418jrwI6eyW0taaX0dg1Hw3zfra0oLEiSv2Hz1VLxKzE3P6FxAhfH4PsSuz2t xubyCRo9xypCY06e9Zgxj2KbpTW6SusQhOCobKPVY/GFE4wxHpIgeTxXQreIGFsqlM/v 9c1atNnGDY0yJDGEDzRtTQiPu6EoE9w+3RPidU8Qrrm/v+YwheHAGQaJii/WxIC8/wOP 4aa4SsnMJrMAr162mDmNb8ZJCtAmOMDJLFfqBTdkybOaSJhFodbK253iOGpnJBbsBF+8 +A5Q== 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=N9gJaehG0TBYP+xMH8EGKWEJQG/THYfgPWsbQcSt2gs6NUwGHOsKBdX05LN720YipP 746QUqE00+g+Z8JxUbXhEk8ZP/CY+dkBbfTPCcK6xzOIWCQNZtNM1kAq58OO8GOYjSxA m5iu6/DXprDBpHZu1vfRUZRmskNffNKyEZD4LjIgLLfhuErWCEqbxT80iG4aUR5abvRi YQbMRuIYhw1Pm9tc+NJLmGpS9P7qKAgNUcDPsmlhagDhMK12WT+D9Lud9/SkB31rVa6t DLAQTCWJ2YMxlBGHcgGjo+edmdhIalScmCn14tvfGnIjoVv8I+7wRdiqjwX6o2gJeo2M k/gw== X-Forwarded-Encrypted: i=1; AJvYcCWLEOi5nsdL7oyzVSZJXfLwcZ5330ILH+ATLKpC5lmTMjONpTI4TTIsyVOG07nW+jaBP1EJUEM9lL9A0wBCMuA5cMz1SE0sjWYLKsLx X-Gm-Message-State: AOJu0YwuGty8llfXiHWygCeLXUilotnDkMv/jSgwKdz5ZJSokFlSo/Wk 5LSk+I8EeoSGu1keN/nr2HYAVuLdQmxm22OulZBudXNyJH2tK7jxGwCiNfYTU0Y= 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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1791457332235140016 X-GMAIL-MSGID: 1791457332235140016 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);