From patchwork Tue Feb 6 14:57:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Schneider-Pargmann X-Patchwork-Id: 13547423 X-Patchwork-Delegate: viresh.linux@gmail.com Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) (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 64A681332B6 for ; Tue, 6 Feb 2024 14:57:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707231459; cv=none; b=SDzYa7mKft/1CGiaiAHJwxMeUekmbnHFl5KHtkVEULh9+F1NY9jCHtJ7iz+eeTnVHgIEWp4G2JukZz/eKbp6MRPHLdVNBZa5ha7K0Ww58UKCWPwmsEgxB/5Ri8F7/DkpVaZ/xY7GSuUaOuwLlS6JorQ6ycWwLTRIEwunZ95Nz9U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707231459; c=relaxed/simple; bh=n/iIoTt4CdIC7Z7PYC2xA5OpZKG1rRXfvCAELL/uC3Y=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=N7UnNyF/yrlWnCoT7cSbL8+ZfLWc8NZFXX9xCWJzs9S1LG9Z6dLWbay4j6qVs9gN/6KErHWIAPCdFGW122wmygEsLK1K4/G4ggu3F2rEvhLv1pBpYlgAt21WDEf1enO2jNkuEIc1Ad60q7tWvp2rC6qiaSqn5GdBmz7iHgE6Tl0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=baylibre.com; spf=pass smtp.mailfrom=baylibre.com; dkim=pass (2048-bit key) header.d=baylibre-com.20230601.gappssmtp.com header.i=@baylibre-com.20230601.gappssmtp.com header.b=QYeXOGuO; arc=none smtp.client-ip=209.85.128.42 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=baylibre.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=baylibre-com.20230601.gappssmtp.com header.i=@baylibre-com.20230601.gappssmtp.com header.b="QYeXOGuO" Received: by mail-wm1-f42.google.com with SMTP id 5b1f17b1804b1-40fe2744e5cso4311555e9.1 for ; Tue, 06 Feb 2024 06:57:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20230601.gappssmtp.com; s=20230601; t=1707231455; x=1707836255; 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=eDuw9+ziqpp2LTPkuprkw43SW7UlWl5m+opLAnRrync=; b=QYeXOGuOB+0w1ioXBqOiwSSD2CtWuGnRrxSgxzINS/veJLsF9uKsa1d7mMpCTtWhsL z7SkoWVRsGmsjaGwTNkYFabIZF05pYYBguzz49LizpTaFfN5EVJeLKlNIVeh74sp9wCX sFfqrAZC+TkTExGTp4E7piFJYQvdmBfFoRzEw95G5+MflhWnHUFRBB5YygBBKBNoKYvE QoTH0gS/0edGMzBD/LPeNz/121FvAfQcAjd2tKLDsRP8ggcMlv6FEGpeSrEUG3EjK9Sm VJl7n0s+Gqpn2Ks8iRx32IN3vgvt835lu6iXf9U1ATdpTQhpTPcf9IRzu8aW+MCdS6DY AKyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707231455; x=1707836255; 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=eDuw9+ziqpp2LTPkuprkw43SW7UlWl5m+opLAnRrync=; b=uXtpnGQE/vgOT70ZiWA+AShF90EZvQRtiTe52F7dk4TmL4/kpisEZRTRV3PlUOOdal XaQuUVi/7o+k94WfC9jguZ0C+mfXgiChA2zquLt+zkdXzwDHklFpBsy92ZVRfBWi5MBV X6ZNQcyligw+9f/P4QOKz7rxdfq7/VM8Av/r3A37UCfik3edxs0WoBYpwPm11It8dOL+ hwJ0Y3VPNKxe2nGO2gzHrF7OE9wKi25oolf2My3bZWrvsugvCs6YcPZutVy6IUF4Tsul 4D6w5BPnKEo9fzirCmZv7A3231l5bjgr3cwjCPxzYPrfRdPiXYduV4HLRHIzOfNzjyYJ DVnA== X-Gm-Message-State: AOJu0YxQtZNICNraCs8Ap766mi0gDWnRTsGkB0DufJL7DXCa2z7mXnH0 bx9DEAbymhC5Fy4MqBBPkaI1MGAcXzHJyY21oRF4y8vd7TfRjyeHiBhf0sMdCvc= X-Google-Smtp-Source: AGHT+IFWUZhvu1Op3ONCs8HKFh7ZnxQTqJbptHCczEPX0pwjlbH/88Vtvj3qlhtauOBQnzW/yDQfnQ== X-Received: by 2002:a05:600c:4f04:b0:40f:d242:a2d2 with SMTP id l4-20020a05600c4f0400b0040fd242a2d2mr2128630wmq.12.1707231455728; Tue, 06 Feb 2024 06:57:35 -0800 (PST) X-Forwarded-Encrypted: i=0; AJvYcCVKwo1WacIy9JzhNBPozyAsTwJu42VbiXVrShxEmsJ+b1dtuf5ptoyQ6WNCuGK9OSuUIdQwZf7mgkn40vCCv7+mDIH7y010+gQUAsPFthaYQAW9bya+1AeY+zfQC4HCkEM2Cz4p0PXA/buzoPlMlhI/6ghVIw/53ddMH9CtqxSXBYe2B3fqh0fVtpnCrc/E8suY0fdZBko1Ikz7wk8TuK8v+Celc+q+JMyQkBGb0aq3F0iHMECbtnsdm85SWUI222v8vS7j8iorWTFKyqDVtzx+SlvArOaX2CFmJXgW2wB9cRKiMRbp5bJ0IiSEzsGX2MkNp3+RdWXe9UxqPubsQdP5NyMpp16q2HmAdbd4kFTlXIgh+Rc+q996g3NuG2Vt+NPl7mqY/K1yCfEuG6zTw5UQuOQG+QmDB43zMnXu7OQ+WqoBkfKREbpPutmma3UyEzW8Z6MJPXdYggJj5f5ctJ1j3wEniQ9MziAi Received: from blmsp.fritz.box ([2001:4091:a246:821e:6f3b:6b50:4762:8343]) by smtp.gmail.com with ESMTPSA id l14-20020a05600c4f0e00b0040fc56712e8sm2257896wmq.17.2024.02.06.06.57.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Feb 2024 06:57:35 -0800 (PST) From: Markus Schneider-Pargmann To: Viresh Kumar , Nishanth Menon , Stephen Boyd , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Vignesh Raghavendra , Tero Kristo , "Rafael J . Wysocki" Cc: Andrew Davis , Dhruva Gole , linux-pm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Markus Schneider-Pargmann Subject: [PATCH 1/3] dt-bindings: cpufreq: Add nvmem-cells for chip information Date: Tue, 6 Feb 2024 15:57:19 +0100 Message-ID: <20240206145721.2418893-2-msp@baylibre.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240206145721.2418893-1-msp@baylibre.com> References: <20240206145721.2418893-1-msp@baylibre.com> Precedence: bulk X-Mailing-List: linux-pm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Add nvmem-cells to describe chip information like chipvariant and chipspeed. If nvmem-cells are used, the syscon property is not necessary anymore. Signed-off-by: Markus Schneider-Pargmann Acked-by: Andrew Davis Reviewed-by: Krzysztof Kozlowski Reviewed-by: Dhruva Gole Nacked-by: Krzysztof Kozlowski --- .../bindings/opp/operating-points-v2-ti-cpu.yaml | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/opp/operating-points-v2-ti-cpu.yaml b/Documentation/devicetree/bindings/opp/operating-points-v2-ti-cpu.yaml index 02d1d2c17129..b1881a0834fe 100644 --- a/Documentation/devicetree/bindings/opp/operating-points-v2-ti-cpu.yaml +++ b/Documentation/devicetree/bindings/opp/operating-points-v2-ti-cpu.yaml @@ -34,6 +34,14 @@ properties: points to syscon node representing the control module register space of the SoC. + nvmem-cells: + $ref: /schemas/types.yaml#/definitions/phandle-array + + nvmem-cell-names: + items: + - const: chipvariant + - const: chipspeed + opp-shared: true patternProperties: @@ -55,7 +63,13 @@ patternProperties: required: - compatible - - syscon + +oneOf: + - required: + - syscon + - required: + - nvmem-cells + - nvmem-cell-names additionalProperties: false From patchwork Tue Feb 6 14:57:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Schneider-Pargmann X-Patchwork-Id: 13547424 X-Patchwork-Delegate: viresh.linux@gmail.com Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) (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 7C46A1332BA for ; Tue, 6 Feb 2024 14:57:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707231460; cv=none; b=nLwSS5Eu4wIqkfnVcmjH5rQDal20OpS8texv1ewH3OpT8fm3OirTEIB+oiej6E7JC4ODnwdjRMXqwsJEQfkBzAAdCR4EAz5mMD6j/L67iCYDG8kFLNqdznzFuOvsOBU9J5RJ7ZMkSO3VTwox0896w9qKhu8/sajYdW9fsVafGf0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707231460; c=relaxed/simple; bh=msEfwhV3HoCipEB+GKffGUeyyj2VovDScomEYsfnrT0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=oos1vmNxMvwqycrGQDzPY79khyhpQozXlmWnLWzELxFa0sW4WiwZAjsF1FkXYw/iMbm44ArHGHgoaROoo02TZDEUbsQm9BfAS/Isx5j592WkBdVVoquHQo7EHb7GqXeW/OuZBqZDq0RfymLgqrqj14lg+OB/njKU8u3INaGLPw8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=baylibre.com; spf=pass smtp.mailfrom=baylibre.com; dkim=pass (2048-bit key) header.d=baylibre-com.20230601.gappssmtp.com header.i=@baylibre-com.20230601.gappssmtp.com header.b=RBHswoEn; arc=none smtp.client-ip=209.85.128.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=baylibre.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=baylibre-com.20230601.gappssmtp.com header.i=@baylibre-com.20230601.gappssmtp.com header.b="RBHswoEn" Received: by mail-wm1-f50.google.com with SMTP id 5b1f17b1804b1-40ff940b456so753005e9.2 for ; Tue, 06 Feb 2024 06:57:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20230601.gappssmtp.com; s=20230601; t=1707231457; x=1707836257; 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=XdH/MMRBTUfqayVAnmhejns1JtGutpHRzA8LTWcgILQ=; b=RBHswoEnMHhmIeslhpgKCttm9e68yGPHrvR4glYKLQtK1hb0Nbk6ROfFLYGBgujErt CcSo+VwSjCwmDmT1PpYTHuHGsQWG2cPBhUQd4pUJDV/evycY042p7L5v02UIEs3xb2Sw 0RFXQAFXUCPPVwAeZQ5ScfkEqUiGRPLfz3XeILFx3td8omaX9JPT1IJPAdWV8GX8BiDA GOSfOahyxVxdLMTlgcrZl7QCm2m5MEJDTSWYuyuPa+WdUruS8auvlq0iZ2yhi416Uo3f gEDV79SRIa4Kf8hr7xTkrJ12THycG2eOaOfjsZ2GV3XU1M9/7ackip27yuRnKuMBX7J5 18zg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707231457; x=1707836257; 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=XdH/MMRBTUfqayVAnmhejns1JtGutpHRzA8LTWcgILQ=; b=ECu41QtoTdV4huXIjs5NnYA8N0bzGhNWcIm0UPJmLog5v0MQj34g/IBXf3ReV1l4kU qZmRN8ijzAKKkA4BMXmOXcw5sn4JpSLA1II+k9yPrWslYRlJc/YO08MAp0vubnrXP+A/ SsKEGONrk6qIw76xVnK5yHVjO4GOXtGFFGmjkQv+a0M68GXSDXAha54fBJyBM/b6hekI BBhWHfYiG4PjvIzkfY22dY9J+uC2o7i8W6R7PRJNimn6S60HYaq0JkqWG1IAgWAWrwyL I5lvf7Vz1I8CIhnTskZUxCXvqbbYlswxL1tkqKH7nSjKytefjxfkw28vE1aY8bkGfTQm OVoA== X-Gm-Message-State: AOJu0Yx6nWg9/qbcNqrOrmNlPG18TPNLfYk21Rp1I8FPQiGbyVZw20vV GWzFg2Pc4w1ym437/QzEA8gotrK69uU5ji89+7b4FmkPRRCATrOyQn3JELCz3dc= X-Google-Smtp-Source: AGHT+IEANI1IHeJsecUK707xmJF7E4tpQM8iIUO3QCbVIvB3uiEIfJf5lxl8quWa7bhmLD1KFJ0Gpg== X-Received: by 2002:a05:600c:46ce:b0:40f:f4e0:c2c6 with SMTP id q14-20020a05600c46ce00b0040ff4e0c2c6mr402014wmo.12.1707231456795; Tue, 06 Feb 2024 06:57:36 -0800 (PST) X-Forwarded-Encrypted: i=0; AJvYcCVtBTsv+GjvgKmDiMh00jYW5nzyq5ivozfUkLVr71EUPRNMJwVsYPPrGe4+GmTAMNtbTLLLgzfqETgNFMq4IlEupzzva2xnI3fo1Ulg14Xzn+dPTOHlxLjJEPhj0LcA83m28CFlabDX47m+DM6TiEZAEnwN4B6OPHDwR3tvbffao96CM648BE0gj9C+7JKzTTpCGpPz9523uYe42JQXyLl0q/CGTgkQupU3E2Gikxz78F7d8FsHYNvFvJ/Ob+ahn36iLomPVR1aG3ovKaca1Ayeal7LJbGJ3uo+s5bNr6xD18Z0s68SzbdcpCdX0cs3kTQLggIKeVC6Eu+17BQtZT4UNy4LUaO12FJ3n8cdlc+A/X52vPZ/cGGIx2nZcjywV00iCJZtaQRHY2KWeqLP1eLDq32bEjZeoVeUDxJE0vubBZ1XSv+eJ3yFH3vvikF4tuG2Vgyc4fVMueTg7N2XqrD07MU96qbmcEtc Received: from blmsp.fritz.box ([2001:4091:a246:821e:6f3b:6b50:4762:8343]) by smtp.gmail.com with ESMTPSA id l14-20020a05600c4f0e00b0040fc56712e8sm2257896wmq.17.2024.02.06.06.57.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Feb 2024 06:57:36 -0800 (PST) From: Markus Schneider-Pargmann To: Viresh Kumar , Nishanth Menon , Stephen Boyd , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Vignesh Raghavendra , Tero Kristo , "Rafael J . Wysocki" Cc: Andrew Davis , Dhruva Gole , linux-pm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Markus Schneider-Pargmann Subject: [PATCH 2/3] cpufreq: ti-cpufreq: Support nvmem for chip version Date: Tue, 6 Feb 2024 15:57:20 +0100 Message-ID: <20240206145721.2418893-3-msp@baylibre.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240206145721.2418893-1-msp@baylibre.com> References: <20240206145721.2418893-1-msp@baylibre.com> Precedence: bulk X-Mailing-List: linux-pm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Support using nvmem-cells 'chipvariant' and 'chipspeed' instead of syscon. This makes it more flexible and moves more configuration into the devicetree. If nvmem-cells are present, probing will fail if the configuration of these cells is broken. If nvmem-cells is not present syscon will be used. Signed-off-by: Markus Schneider-Pargmann Reviewed-by: Dhruva Gole --- drivers/cpufreq/ti-cpufreq.c | 105 ++++++++++++++++++++++------------- 1 file changed, 66 insertions(+), 39 deletions(-) diff --git a/drivers/cpufreq/ti-cpufreq.c b/drivers/cpufreq/ti-cpufreq.c index 46c41e2ca727..3ee72b1309f0 100644 --- a/drivers/cpufreq/ti-cpufreq.c +++ b/drivers/cpufreq/ti-cpufreq.c @@ -10,6 +10,7 @@ #include #include #include +#include #include #include #include @@ -65,6 +66,7 @@ struct ti_cpufreq_soc_data { struct ti_cpufreq_data { struct device *cpu_dev; + struct device *dev; struct device_node *opp_node; struct regmap *syscon; const struct ti_cpufreq_soc_data *soc_data; @@ -244,31 +246,40 @@ static struct ti_cpufreq_soc_data am625_soc_data = { static int ti_cpufreq_get_efuse(struct ti_cpufreq_data *opp_data, u32 *efuse_value) { + struct device_node *np = opp_data->opp_node; struct device *dev = opp_data->cpu_dev; u32 efuse; int ret; - ret = regmap_read(opp_data->syscon, opp_data->soc_data->efuse_offset, - &efuse); - if (ret == -EIO) { - /* not a syscon register! */ - void __iomem *regs = ioremap(OMAP3_SYSCON_BASE + - opp_data->soc_data->efuse_offset, 4); - - if (!regs) - return -ENOMEM; - efuse = readl(regs); - iounmap(regs); + ret = nvmem_cell_read_u32(opp_data->dev, "chipspeed", &efuse); + if (ret && (ret != -ENOENT || !opp_data->syscon)) + return dev_err_probe(dev, ret, + "Failed to read nvmem cell 'chipspeed': %pe", + ERR_PTR(ret)); + + if (ret) { + ret = regmap_read(opp_data->syscon, opp_data->soc_data->efuse_offset, + &efuse); + if (ret == -EIO) { + /* not a syscon register! */ + void __iomem *regs = ioremap(OMAP3_SYSCON_BASE + + opp_data->soc_data->efuse_offset, 4); + + if (!regs) + return -ENOMEM; + efuse = readl(regs); + iounmap(regs); + } + else if (ret) { + dev_err(dev, + "Failed to read the efuse value from syscon: %d\n", + ret); + return ret; } - else if (ret) { - dev_err(dev, - "Failed to read the efuse value from syscon: %d\n", - ret); - return ret; - } - efuse = (efuse & opp_data->soc_data->efuse_mask); - efuse >>= opp_data->soc_data->efuse_shift; + efuse = (efuse & opp_data->soc_data->efuse_mask); + efuse >>= opp_data->soc_data->efuse_shift; + } *efuse_value = opp_data->soc_data->efuse_xlate(opp_data, efuse); @@ -285,30 +296,41 @@ static int ti_cpufreq_get_efuse(struct ti_cpufreq_data *opp_data, static int ti_cpufreq_get_rev(struct ti_cpufreq_data *opp_data, u32 *revision_value) { + struct device_node *np = opp_data->opp_node; struct device *dev = opp_data->cpu_dev; u32 revision; int ret; - ret = regmap_read(opp_data->syscon, opp_data->soc_data->rev_offset, - &revision); - if (ret == -EIO) { - /* not a syscon register! */ - void __iomem *regs = ioremap(OMAP3_SYSCON_BASE + - opp_data->soc_data->rev_offset, 4); - - if (!regs) - return -ENOMEM; - revision = readl(regs); - iounmap(regs); + ret = nvmem_cell_read_u32(opp_data->dev, "chipvariant", &revision); + if (ret && (ret != -ENOENT || !opp_data->syscon)) + return dev_err_probe(dev, ret, + "Failed to read nvmem cell 'chipvariant': %pe", + ERR_PTR(ret)); + + if (ret) { + ret = regmap_read(opp_data->syscon, opp_data->soc_data->rev_offset, + &revision); + if (ret == -EIO) { + /* not a syscon register! */ + void __iomem *regs = ioremap(OMAP3_SYSCON_BASE + + opp_data->soc_data->rev_offset, 4); + + if (!regs) + return -ENOMEM; + revision = readl(regs); + iounmap(regs); + } + else if (ret) { + dev_err(dev, + "Failed to read the revision number from syscon: %d\n", + ret); + return ret; } - else if (ret) { - dev_err(dev, - "Failed to read the revision number from syscon: %d\n", - ret); - return ret; + + revision = (revision >> REVISION_SHIFT) & REVISION_MASK; } - *revision_value = BIT((revision >> REVISION_SHIFT) & REVISION_MASK); + *revision_value = BIT(revision); return 0; } @@ -392,9 +414,14 @@ static int ti_cpufreq_probe(struct platform_device *pdev) goto register_cpufreq_dt; } - ret = ti_cpufreq_setup_syscon_register(opp_data); - if (ret) - goto fail_put_node; + opp_data->dev = &pdev->dev; + opp_data->dev->of_node = opp_data->opp_node; + + if (!of_property_read_bool(opp_data->opp_node, "nvmem-cells")) { + ret = ti_cpufreq_setup_syscon_register(opp_data); + if (ret) + goto fail_put_node; + } /* * OPPs determine whether or not they are supported based on From patchwork Tue Feb 6 14:57:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Schneider-Pargmann X-Patchwork-Id: 13547425 X-Patchwork-Delegate: viresh.linux@gmail.com Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) (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 AD8951339A7 for ; Tue, 6 Feb 2024 14:57:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707231462; cv=none; b=s0jUO08gzYhLOEeKy2hT4ZfVwDAk5WtTnJOlazXbqluF3dyv1vUPABpwkZl54vftyU94URXsuEzljdAY4w9KuMZzqHIjC1HPeiXCf1X22I+L8KsKZD2tmXyOAATBFezhZrkojXA6AXQxBoQMebILNG/oHdUCYBEm2dA14INSgG8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707231462; c=relaxed/simple; bh=At3NKgE1b3gmQgeFp6wQ2Vd4bXzt+qAWBTc/hTeP86c=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ty3JtCOWVRVRoDIouu1wcC25qPEsC0HGif3x7cVD9eGbyMMtWul1BvdLqAi+5LJyVbuC/t4DYn4dsIVc7k/MJufC2I/TtxFnB8sHvfBh4A8iTAM0NiPt9sZu55SZFxtzN26JE+dqorx1SvoUb4oXzH04mlVBE11qf6u9dO8ghM0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=baylibre.com; spf=pass smtp.mailfrom=baylibre.com; dkim=pass (2048-bit key) header.d=baylibre-com.20230601.gappssmtp.com header.i=@baylibre-com.20230601.gappssmtp.com header.b=jmNeG6Ka; arc=none smtp.client-ip=209.85.221.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=baylibre.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=baylibre-com.20230601.gappssmtp.com header.i=@baylibre-com.20230601.gappssmtp.com header.b="jmNeG6Ka" Received: by mail-wr1-f52.google.com with SMTP id ffacd0b85a97d-33b40208735so1336657f8f.3 for ; Tue, 06 Feb 2024 06:57:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20230601.gappssmtp.com; s=20230601; t=1707231458; x=1707836258; 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=gASO78qnd+QKC6Tryaqp/xMfAhHvhZxuVEnU1FHt3IQ=; b=jmNeG6Ka6mK5PBQeg5+cSTHQc18pmDVl51g9Vritw5BI1+MxHq9v4N9I1l/MMjkMcR aITzRkUbxwQiYu2gqcwQ2BIfY43fDMEUhS+h9AyngMTeEnJfGKsrBDs5X58CKCIB/syM vgDI69KsoDoajaXws2etgus1ULixRRpFOAmolUUERCtDkfK3GYeYdXWPkDW1rDhJjuZz v/fgVWD8TFSOPtfrh/22tzcHqT9Vj32A8jPvmwHX7J8HG6akuP4W1iEvoH05Wc2HKY4T Cg3vRBStqlFhjI56hBJIvNCH/NMg3B2f102vTPdIV8XS4fmKoHawWEAUA2jOxkgNo1Yj WjGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707231458; x=1707836258; 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=gASO78qnd+QKC6Tryaqp/xMfAhHvhZxuVEnU1FHt3IQ=; b=P94BXIfusztbk7phD0bo3mVyPLNDyyUekuYN5SZWuvTQBNWFKb3zmryeNDDuUWnmV9 mmh0hN+hVT1DOvo4cbxFIDSBwZKJ4MO9AgwsJYlKj79HhnZze/KuRexTzRE+rL/2rC08 4JnWVRUOJY14DvKRwvsTIKGpWPcLNmfMgrV+i7jMfU1McsTmawwSl3JR66y2eBQ4du9S Cw+DbE8qzYzdQCfMenHR7kooVfFv6Ogn9qunuj0za2J9IDwNtSAII2Hqf/Bf4REqvwmd TjSFQzXmPsJJBhXcRiVUjl7TtRj1ykbYWLrq8kwI1F01UiK+Pga8wBGSNJ0A71wzBSqz ntMQ== X-Gm-Message-State: AOJu0YwYIAT8nff/hcbHO32n2mR0984SJqxXaUoniIV1SMitqupsHKYo z3AqQkLR1mowm+NoBuJdyBEWOQYXquyPN3yPFstaLQuo7tRJWL/VERc+w3ru8tg= X-Google-Smtp-Source: AGHT+IHeUAmaOBGgpivKhM4wX2IuW13WEvwte78xoboY3NHwL6YsIiphL2GESDSDG6g+c8QiLXAkAQ== X-Received: by 2002:adf:ed06:0:b0:33b:2658:cb3f with SMTP id a6-20020adfed06000000b0033b2658cb3fmr1379548wro.64.1707231457878; Tue, 06 Feb 2024 06:57:37 -0800 (PST) X-Forwarded-Encrypted: i=0; AJvYcCW+e3f5uvLGpr7flmrRvo7g/ZKUCh94rCar9aQ2aSwAPj/XhZOEv5Lhb2DES8a71KjQJwvfWXUMUYDSTajwyx8IisYphxcpVwURtlN8y+wGHywkjUR7SFw0DxyjGKvx86titt9zgHSb5CSpKKu6ObesGMlybdi8rmzkL1RHLwAnOQxULy7MwMWVmSjr5WtwWNO6rwpgbx8r0XLUUXBzRoNZL4pRtaimUBJ6GOPz2w61B2/KbajRd9z/vlUxMj0UCDhcj447yw44xT5xiAbrl51P6I6w8yfDJn9NB1BnkjsxL7/mH8D/v+HEUu9OPkzwI7y3w6hQL0LI82jEo1amSFpaFlOh5fmdBujRB086J6Vq2DI1QdO2XOZwpbxWhH+bByLavXAVp0gnqyXYqAPT5DB+CYGxIpUyIcQDKfRK/TlJhS9HNRPVlwFOEsxuVb15xFojA7FDoAlBOeQgDbJUFh8yatRIJs4QDNBC Received: from blmsp.fritz.box ([2001:4091:a246:821e:6f3b:6b50:4762:8343]) by smtp.gmail.com with ESMTPSA id l14-20020a05600c4f0e00b0040fc56712e8sm2257896wmq.17.2024.02.06.06.57.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Feb 2024 06:57:37 -0800 (PST) From: Markus Schneider-Pargmann To: Viresh Kumar , Nishanth Menon , Stephen Boyd , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Vignesh Raghavendra , Tero Kristo , "Rafael J . Wysocki" Cc: Andrew Davis , Dhruva Gole , linux-pm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Markus Schneider-Pargmann Subject: [PATCH 3/3] arm64: dts: ti: k3-am625: Use nvmem-cells for opp Date: Tue, 6 Feb 2024 15:57:21 +0100 Message-ID: <20240206145721.2418893-4-msp@baylibre.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240206145721.2418893-1-msp@baylibre.com> References: <20240206145721.2418893-1-msp@baylibre.com> Precedence: bulk X-Mailing-List: linux-pm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Use nvmem cells referring to chip variant and speed grade for the operating points. Signed-off-by: Markus Schneider-Pargmann --- arch/arm64/boot/dts/ti/k3-am625.dtsi | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm64/boot/dts/ti/k3-am625.dtsi b/arch/arm64/boot/dts/ti/k3-am625.dtsi index 4193c2b3eed6..d60e1be9eb89 100644 --- a/arch/arm64/boot/dts/ti/k3-am625.dtsi +++ b/arch/arm64/boot/dts/ti/k3-am625.dtsi @@ -105,6 +105,8 @@ a53_opp_table: opp-table { compatible = "operating-points-v2-ti-cpu"; opp-shared; syscon = <&wkup_conf>; + nvmem-cells = <&chip_variant>, <&chip_speed>; + nvmem-cell-names = "chipvariant", "chipspeed"; opp-200000000 { opp-hz = /bits/ 64 <200000000>;