Received: by 2002:a05:6358:3188:b0:123:57c1:9b43 with SMTP id q8csp27419767rwd; Tue, 4 Jul 2023 02:42:02 -0700 (PDT) X-Google-Smtp-Source: APBJJlG13Eq+kf/uV44Bt7E5KLz2tZmAdKsjor/mzw1gkJgCBQrSAdTuZwWsz9cbas0s+w5eZsST X-Received: by 2002:a17:90a:54:b0:25c:2260:9f5c with SMTP id 20-20020a17090a005400b0025c22609f5cmr9913658pjb.34.1688463722670; Tue, 04 Jul 2023 02:42:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688463722; cv=none; d=google.com; s=arc-20160816; b=aBmXBM3MLGZLweTOGB5Obq1rj1NRE18fcOZF9WIgHY4mmXTNfbGS2tBkfvYnZkxLaw u6/mHfGE7GnCXXaNuf1NCQv8JgoD/0B3sW2bg4CTpix34mFCBci/D9o7Zwfj8z8ozZIP FOhZ4+OB9YC4gZrE83zkn3ClYgmHaI/Z0QlcseaJjJZQJa2D1BaRQoHOSmWYefYigOw/ tO/xEgamtAWw7l1rcF8U7s+rnP61z5Ce4euOhjOM5bi1bprp1OhuKKzXs51R3BX4IK/D pTfzE6+rEX8+R4g/epABbmbFQFrQCz53tMQCxYC3Z/RBWbuXPC8306z0gfiwXWt6Qkow FCuA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=BfdWfFL82Sj9v9lVmFzp1Ri6VF6v4IEwdYbB7ZQI4LY=; fh=Zs2eP598WtcBDWEObzOBRXHDv03khO91MX7nDvuxCwQ=; b=bnQ4QnlkWPrxH4GthPGkfFxK4AQATVUyddCovMSBQE4A2/buXKN7w0ys8WXmb73ciU 2JYBFpBW7VAVROuMm37z7jq3wiwfQn94LB7qgW13Vb3OqI69mJRV7WC5Xdf4GzkEFRqq vRqB8KGRRST6x1BBySIslNb++IedZK5FUYeFoKjtLKCMmFUkCTKmJ4lsa7pZFXyUxgio F0aI61LdZvrX6FFag+V2ZV8mhDV2v8nTLFzhooqfOxVdwui7M1kSDy8eZHnIHgFOaTVX 56cD7nWSegZm6pLYSRtMjnF7cLSEWv0USEDPptFTPWrdBSUCU8MlJGvvz0yYIlX06QVt yrgA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id x34-20020a634a22000000b0054ff42d3833si20733458pga.336.2023.07.04.02.41.49; Tue, 04 Jul 2023 02:42:02 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232014AbjGDJdf (ORCPT + 99 others); Tue, 4 Jul 2023 05:33:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50340 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231826AbjGDJdN (ORCPT ); Tue, 4 Jul 2023 05:33:13 -0400 Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D8BBF1A4 for ; Tue, 4 Jul 2023 02:33:11 -0700 (PDT) Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qGcOv-0006ty-RI; Tue, 04 Jul 2023 11:32:49 +0200 Received: from [2a0a:edc0:0:1101:1d::28] (helo=dude02.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1qGcOu-00C09x-ID; Tue, 04 Jul 2023 11:32:48 +0200 Received: from sha by dude02.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1qGcOr-002Ty7-52; Tue, 04 Jul 2023 11:32:45 +0200 From: Sascha Hauer To: linux-rockchip@lists.infradead.org Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, Heiko Stuebner , Kyungmin Park , MyungJoo Ham , Will Deacon , Mark Rutland , kernel@pengutronix.de, Michael Riesch , Robin Murphy , Vincent Legoll , Rob Herring , Krzysztof Kozlowski , Conor Dooley , devicetree@vger.kernel.org, Sebastian Reichel , Sascha Hauer Subject: [PATCH v7 10/26] PM / devfreq: rockchip-dfi: Add RK3568 support Date: Tue, 4 Jul 2023 11:32:26 +0200 Message-Id: <20230704093242.583575-11-s.hauer@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230704093242.583575-1-s.hauer@pengutronix.de> References: <20230704093242.583575-1-s.hauer@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2 X-SA-Exim-Mail-From: sha@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This adds RK3568 support to the DFI driver. Only iniitialization differs from the currently supported RK3399. Signed-off-by: Sascha Hauer --- drivers/devfreq/event/rockchip-dfi.c | 21 +++++++++++++++++++++ include/soc/rockchip/rk3568_grf.h | 12 ++++++++++++ 2 files changed, 33 insertions(+) create mode 100644 include/soc/rockchip/rk3568_grf.h diff --git a/drivers/devfreq/event/rockchip-dfi.c b/drivers/devfreq/event/rockchip-dfi.c index 6b3ef97b3be09..261d112580c9e 100644 --- a/drivers/devfreq/event/rockchip-dfi.c +++ b/drivers/devfreq/event/rockchip-dfi.c @@ -23,6 +23,7 @@ #include #include +#include #define DMC_MAX_CHANNELS 2 @@ -209,10 +210,30 @@ static int rk3399_dfi_init(struct rockchip_dfi *dfi) return 0; }; +static int rk3568_dfi_init(struct rockchip_dfi *dfi) +{ + struct regmap *regmap_pmu = dfi->regmap_pmu; + u32 reg2, reg3; + + regmap_read(regmap_pmu, RK3568_PMUGRF_OS_REG2, ®2); + regmap_read(regmap_pmu, RK3568_PMUGRF_OS_REG3, ®3); + + dfi->ddr_type = FIELD_GET(RK3568_PMUGRF_OS_REG2_DRAMTYPE_INFO, reg2); + + if (FIELD_GET(RK3568_PMUGRF_OS_REG3_SYSREG_VERSION, reg3) >= 0x3) + dfi->ddr_type |= FIELD_GET(RK3568_PMUGRF_OS_REG3_DRAMTYPE_INFO_V3, reg3) << 3; + + dfi->channel_mask = 1; + + return 0; +}; + static const struct of_device_id rockchip_dfi_id_match[] = { { .compatible = "rockchip,rk3399-dfi", .data = rk3399_dfi_init }, + { .compatible = "rockchip,rk3568-dfi", .data = rk3568_dfi_init }, { }, }; + MODULE_DEVICE_TABLE(of, rockchip_dfi_id_match); static int rockchip_dfi_probe(struct platform_device *pdev) diff --git a/include/soc/rockchip/rk3568_grf.h b/include/soc/rockchip/rk3568_grf.h new file mode 100644 index 0000000000000..575584e9d8834 --- /dev/null +++ b/include/soc/rockchip/rk3568_grf.h @@ -0,0 +1,12 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +#ifndef __SOC_RK3568_GRF_H +#define __SOC_RK3568_GRF_H + +#define RK3568_PMUGRF_OS_REG2 0x208 +#define RK3568_PMUGRF_OS_REG2_DRAMTYPE_INFO GENMASK(15, 13) + +#define RK3568_PMUGRF_OS_REG3 0x20c +#define RK3568_PMUGRF_OS_REG3_DRAMTYPE_INFO_V3 GENMASK(13, 12) +#define RK3568_PMUGRF_OS_REG3_SYSREG_VERSION GENMASK(31, 28) + +#endif /* __SOC_RK3568_GRF_H */ -- 2.39.2