From patchwork Thu Jun 20 11:24:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Griffin X-Patchwork-Id: 13705349 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 6DABBC27C79 for ; Thu, 20 Jun 2024 12:32:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=GTdnj0h4hO88f5E9a81SRTfb2IoRwa/RVBQI7iSQd1U=; b=gtpEFh6m0EkcK38tJnYTwXUUIp eAikbQ5C7YvWMc3ajipznudmwS5bkj+WK+WfGmEcIGvxqHxZ6f7S2GDAYPcBvfknIEYC73KOq+Jbo jFX++v/dUO1sp01cK5/+SWhLdKsUu64cXyshun2Y+YoTvNZ9TCBmwojBNCkyaGOYDU02CohBHdjH4 giMJMKk2t5ZyK0q0codEsM1HuSLMzfcTxpBYx260OFXxk7a8IbLjtuIBNEqffaDL3suDTZSJ1fvXj 8yZIPo5H5w2zrrEmwJkj4Q41ut3jNpJ6R9tao9KGy3i90n/nxHSAmyr+xLk2P+fXyqW1yowehae84 P5dJVFLg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sKGy0-00000004xrP-40JG; Thu, 20 Jun 2024 12:32:41 +0000 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sKFuP-00000004k5O-3unC for linux-arm-kernel@lists.infradead.org; Thu, 20 Jun 2024 11:24:55 +0000 Received: by mail-wr1-x42c.google.com with SMTP id ffacd0b85a97d-364c9ec17d1so308457f8f.0 for ; Thu, 20 Jun 2024 04:24:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1718882692; x=1719487492; 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=GTdnj0h4hO88f5E9a81SRTfb2IoRwa/RVBQI7iSQd1U=; b=QkNLfJFrw2hbc6wrZh2lBpn+aueoHLVDLDNqK3LsFC4acnRZRUNUjOB4qm5014BeVm zPbz4MMPdXjHs6iT4KH0bMyP31FwJ+YPk+Im9//+r2Zdk1vjTZLrtNp+LehrUb3ApC0D r7HVKKRC7wBOKL+O5TM65ME+C6xKccz0FlIl2bc+8K+7dV0TGZ+TuWOOyqmcOfVLn8hY xaac5yD3ixG+8EWbChR7TN/ugo3w6yqcYv0SSgJJoD2h+rUjxUQxRatXo8c9cAVUBXw/ acN6whHHcAteEK3WSAy0C4gQHdewuNo60ZOubO0fpeVNaBCAkFKJaJsU5JQ9XLcfGxCq oD6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718882692; x=1719487492; 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=GTdnj0h4hO88f5E9a81SRTfb2IoRwa/RVBQI7iSQd1U=; b=cO8DLRxVb+gOv0YfBgfoC3i2cwWEu8muCfMAMLL8tpBQzyS99GeP23y3pocORYs/LQ ID45nlI2b/WVeQ7aRsqLV53U1QM2zQMysTnKU7h7OXNFDAusNEyxF4VtVlsn8XHskepw WCu1Eanh1Kw+MHzhYkhUQMPg+mvCy0hucllaSCw5Cj27+v/hJAXxbLCH00Yv5VpDKoF1 7rGDyscyO95+VojaRTZ7Jane5xyRUCbDDco6KNKgG7PeUHdDzWAMHN/Lv7ygGseNnnXM QKTU5cyMwG5v7tB9j157/UteuB6ER2YdociVeLURgBnLXYf35UP1lyVagIrWF4xldAQ2 3//w== X-Gm-Message-State: AOJu0Ywo/gXMnBNeNid5jMMriyV8u1+fSp89hM9uyeDoInsHV3L5wEIu bpdePuLRcorkscRTz+3i9MkW5p8nsMCijO+0+r3rqYJXBAfBF4N9YldVwnfWASA= X-Google-Smtp-Source: AGHT+IG0bmj/clv7a657zIPzp9MmvrFRbSd49FscT10OF1XmC+kRwLR3I33eOqChc4j25jNWe1YVvw== X-Received: by 2002:a5d:4687:0:b0:360:7c63:53cf with SMTP id ffacd0b85a97d-363177a1dcamr3799891f8f.19.1718882692152; Thu, 20 Jun 2024 04:24:52 -0700 (PDT) Received: from gpeter-l.lan ([2a0d:3344:2e8:8510::3aa]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3647bf3092csm2025371f8f.97.2024.06.20.04.24.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Jun 2024 04:24:51 -0700 (PDT) From: Peter Griffin To: lee@kernel.org, arnd@arndb.de, krzk@kernel.org, alim.akhtar@samsung.com Cc: linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org, tudor.ambarus@linaro.org, andre.draszik@linaro.org, saravanak@google.com, willmcvicker@google.com, semen.protsenko@linaro.org, kernel-team@android.com, Peter Griffin Subject: [PATCH v2 2/2] soc: samsung: exynos-pmu: update to use of_syscon_register_regmap() Date: Thu, 20 Jun 2024 12:24:46 +0100 Message-ID: <20240620112446.1286223-3-peter.griffin@linaro.org> X-Mailer: git-send-email 2.45.2.627.g7a2c4fd464-goog In-Reply-To: <20240620112446.1286223-1-peter.griffin@linaro.org> References: <20240620112446.1286223-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-20240620_042453_992516_3D5C91BC X-CRM114-Status: GOOD ( 15.83 ) 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 For SoCs like gs101 that need a special regmap, register this with of_syscon_register_regmap api, so it can be returned by syscon_regmap_lookup_by_phandle() and friends. For SoCs that don't require a custom regmap, revert back to syscon creating the mmio regmap rather than duplicating the logic here. exynos_get_pmu_regmap_by_phandle() api is also updated to retrieve the regmap via syscon. The exynos_get_pmu_regmap_by_phandle() api is kept around until fw_devlink support for syscon property is added for the pinctrl-samsung driver that also runs at postcore_initcall level. All other exynos client drivers can revert back to syscon_regmap_lookup_by_phandle(). Signed-off-by: Peter Griffin Reviewed-by: Arnd Bergmann Reviewed-by: Sam Protsenko --- Changes since v1: - pass pmu_np (not np) to syscon_node_to_regmap() (reported by William) Link to v1: https://lore.kernel.org/linux-arm-kernel/20240614140421.3172674-3-peter.griffin@linaro.org/ --- drivers/soc/samsung/exynos-pmu.c | 38 ++++++++++++-------------------- 1 file changed, 14 insertions(+), 24 deletions(-) diff --git a/drivers/soc/samsung/exynos-pmu.c b/drivers/soc/samsung/exynos-pmu.c index fd8b6ac06656..624324f4001c 100644 --- a/drivers/soc/samsung/exynos-pmu.c +++ b/drivers/soc/samsung/exynos-pmu.c @@ -204,16 +204,6 @@ static const struct regmap_config regmap_smccfg = { .reg_update_bits = tensor_sec_update_bits, }; -static const struct regmap_config regmap_mmiocfg = { - .name = "pmu_regs", - .reg_bits = 32, - .reg_stride = 4, - .val_bits = 32, - .fast_io = true, - .use_single_read = true, - .use_single_write = true, -}; - static const struct exynos_pmu_data gs101_pmu_data = { .pmu_secure = true }; @@ -290,7 +280,6 @@ EXPORT_SYMBOL_GPL(exynos_get_pmu_regmap); struct regmap *exynos_get_pmu_regmap_by_phandle(struct device_node *np, const char *propname) { - struct exynos_pmu_context *ctx; struct device_node *pmu_np; struct device *dev; @@ -316,9 +305,7 @@ struct regmap *exynos_get_pmu_regmap_by_phandle(struct device_node *np, if (!dev) return ERR_PTR(-EPROBE_DEFER); - ctx = dev_get_drvdata(dev); - - return ctx->pmureg; + return syscon_node_to_regmap(pmu_np); } EXPORT_SYMBOL_GPL(exynos_get_pmu_regmap_by_phandle); @@ -355,19 +342,22 @@ static int exynos_pmu_probe(struct platform_device *pdev) regmap = devm_regmap_init(dev, NULL, (void *)(uintptr_t)res->start, &pmu_regmcfg); + + if (IS_ERR(regmap)) + return dev_err_probe(&pdev->dev, PTR_ERR(regmap), + "regmap init failed\n"); + + ret = of_syscon_register_regmap(dev->of_node, regmap); + if (ret) + return ret; } else { - /* All other SoCs use a MMIO regmap */ - pmu_regmcfg = regmap_mmiocfg; - pmu_regmcfg.max_register = resource_size(res) - - pmu_regmcfg.reg_stride; - regmap = devm_regmap_init_mmio(dev, pmu_base_addr, - &pmu_regmcfg); + /* let syscon create mmio regmap */ + regmap = syscon_node_to_regmap(dev->of_node); + if (IS_ERR(regmap)) + return dev_err_probe(&pdev->dev, PTR_ERR(regmap), + "syscon_node_to_regmap failed\n"); } - if (IS_ERR(regmap)) - return dev_err_probe(&pdev->dev, PTR_ERR(regmap), - "regmap init failed\n"); - pmu_context->pmureg = regmap; pmu_context->dev = dev;