mirror of
git://git.openwrt.org/openwrt/openwrt.git
synced 2025-10-30 21:44:27 -04:00
2ad898e091
Removed upstreamed: generic/backport-6.1/789-STABLE-01-net-dsa-mt7530-prevent-possible-incorrect-XTAL-frequ.patch [1] generic/backport-6.1/789-STABLE-02-net-dsa-mt7530-fix-link-local-frames-that-ingress-vl.patch [2] generic/backport-6.1/789-STABLE-03-net-dsa-mt7530-fix-handling-of-all-link-local-frames.patch [3] generic/pending-6.1/735-net-mediatek-mtk_eth_soc-release-MAC_MCR_FORCE_LINK-.patch [4] generic/pending-6.1/736-net-ethernet-mtk_eth_soc-fix-PPE-hanging-issue.patch [5] Manual adjusted the following patches: mediatek/patches-6.1/100-dts-update-mt7622-rfb1.patch 1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.1.83&id=be4512b9ac6fc53e1ca8daccbda84f643215c547 2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.1.83&id=f1fa919ea59655f73cb3972264e157b8831ba546 3. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.1.83&id=86c0c154a759f2af9612a04bdf29110f02dce956 4. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.1.83&id=6b62bad2da1b338f452a9380639fc9b093d75a25 5. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.1.83&id=f78807362828ad01db2a9ed005bf79501b620f27 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
52 lines
1.4 KiB
Diff
52 lines
1.4 KiB
Diff
From 2b8634d1468ff498cc91b6adf993c27ae6fa079d Mon Sep 17 00:00:00 2001
|
|
From: Robert Marko <robimarko@gmail.com>
|
|
Date: Fri, 26 May 2023 22:48:01 +0200
|
|
Subject: [PATCH] cpufreq: qcom-nvmem: use SoC ID-s from bindings
|
|
|
|
SMEM SoC ID-s are now stored in DT bindings so lets use those instead of
|
|
defining them in the driver again.
|
|
|
|
Signed-off-by: Robert Marko <robimarko@gmail.com>
|
|
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
|
|
Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
|
|
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
|
|
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
|
|
Link: https://lore.kernel.org/r/20230526204802.3081168-4-robimarko@gmail.com
|
|
---
|
|
drivers/cpufreq/qcom-cpufreq-nvmem.c | 15 +++++----------
|
|
1 file changed, 5 insertions(+), 10 deletions(-)
|
|
|
|
--- a/drivers/cpufreq/qcom-cpufreq-nvmem.c
|
|
+++ b/drivers/cpufreq/qcom-cpufreq-nvmem.c
|
|
@@ -30,12 +30,7 @@
|
|
|
|
#define MSM_ID_SMEM 137
|
|
|
|
-enum _msm_id {
|
|
- MSM8996V3 = 0xF6ul,
|
|
- APQ8096V3 = 0x123ul,
|
|
- MSM8996SG = 0x131ul,
|
|
- APQ8096SG = 0x138ul,
|
|
-};
|
|
+#include <dt-bindings/arm/qcom,ids.h>
|
|
|
|
enum _msm8996_version {
|
|
MSM8996_V3,
|
|
@@ -153,12 +148,12 @@ static enum _msm8996_version qcom_cpufre
|
|
msm_id++;
|
|
|
|
switch ((enum _msm_id)*msm_id) {
|
|
- case MSM8996V3:
|
|
- case APQ8096V3:
|
|
+ case QCOM_ID_MSM8996:
|
|
+ case QCOM_ID_APQ8096:
|
|
version = MSM8996_V3;
|
|
break;
|
|
- case MSM8996SG:
|
|
- case APQ8096SG:
|
|
+ case QCOM_ID_MSM8996SG:
|
|
+ case QCOM_ID_APQ8096SG:
|
|
version = MSM8996_SG;
|
|
break;
|
|
default:
|