forge/pmaports
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

linux-postmarketos-qcom-msm8994: upgrade to 5.17.2 (MR 3073)

Browse source 
patches added are (not all, just some) fixes and feature enhancements
for msm8992 and msm8994 from qcom mainline maintainer tree [1] for v5.18
and v5.19.

Changes:
* update deviceinfo_dtb_mainline for device-huawei-angler and
  device-lg-bullhead.
* add sdhc1 support for device-huawei-angler

[1] https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git

Signed-off-by: Petr Vorel <petr.vorel@gmail.com>

[ci:skip-build] Already built successfully in CI in MR
This commit is contained in:
Petr Vorel 2022-04-14 20:32:19 +02:00 committed by Alexey Minnekhanov
parent 9a43f57791
commit 891a4cb5a1
No known key found for this signature in database
GPG key ID: 6FE3B029D9D9FAFF
13 changed files with 743 additions and 139 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
device/testing/device-huawei-angler/APKBUILD
View file

@ -1,7 +1,7 @@
# Reference: <https://postmarketos.org/devicepkg>
pkgname=device-huawei-angler
pkgver=2
pkgrel=2
pkgver=3
pkgrel=0
pkgdesc="Huawei Nexus 6P"
url="https://postmarketos.org"
arch="aarch64"
@ -61,7 +61,7 @@ nonfree_firmware() {
}
sha512sums="
c964279eba16e5bb4e74bb4389144e51463419e6ba8731363dc07609a6c9effa43ea8de0192f3983c704c9fb8f55e0ee5023f6e3f19cee781feae81daca7200f deviceinfo
813fc118a59f50a276a9dbcf627955d65bdef1cd345159cd56b6d45297b467614bfae64687a729295fc189d38b22af45999fb00cf3e02166b2e509beab9965ce deviceinfo
262f9f3e28cbb28d236cf6edce4919766baabb18e5b0cf35d672d306efeaf12fd66ffba57e6d9bef0eee90203dc98f95aab17145e4c12383055afb58b922ae58 90-android-touch-dev.rules
61fe1f91d7b0b570b77fcca76503373cbac2515ca3dcc2f2543b910dfaeb1e935a11975f824f6a72001df4e63329356a6aff2d016e9b4f5d8f7b739fee065c4e bcmdhd.cal
"

2
device/testing/device-huawei-angler/deviceinfo
View file

@ -31,5 +31,5 @@ deviceinfo_kernel_cmdline_downstream="androidboot.hardware=angler androidboot.co
# Mainline kernel options
deviceinfo_append_dtb_mainline="true"
deviceinfo_dtb_mainline="qcom/msm8994-angler-rev-101"
deviceinfo_dtb_mainline="qcom/msm8994-huawei-angler-rev-101"
deviceinfo_kernel_cmdline_mainline="console=tty0 console=ttyMSM0,115200,n8 debug ignore_loglevel PMOS_NO_OUTPUT_REDIRECT earlycon"

6
device/testing/device-lg-bullhead/APKBUILD
View file

@ -1,8 +1,8 @@
# Reference: <https://postmarketos.org/devicepkg>
pkgname=device-lg-bullhead
pkgdesc="Google Nexus 5X"
pkgver=1
pkgrel=1
pkgver=3
pkgrel=0
url="https://postmarketos.org"
license="MIT"
arch="aarch64"
@ -49,5 +49,5 @@ package() {
}
sha512sums="
a70681efe845eb0ca8aaaf935408e283c7a4b95adadff49327fecfc6dcdba8d0ef4cf7ca98c21580c1f3c2c4346366cd86108f0bba08a3bf923d1a02238bc2f9 deviceinfo
3dc9e1c5de8e3ab886d2a7233613051e0f67adc487620a66ddfcf369e25b1682a8f98c7a12c4e34198a87f2ca71786398f997880eafecd8c3ebf0f012eb1667b deviceinfo
"

2
device/testing/device-lg-bullhead/deviceinfo
View file

@ -33,5 +33,5 @@ deviceinfo_kernel_cmdline_downstream="console=ttyHSL0,115200,n8 androidboot.hard
# Mainline kernel options
deviceinfo_append_dtb_mainline="true"
deviceinfo_dtb_mainline="qcom/msm8992-bullhead-rev-101"
deviceinfo_dtb_mainline="qcom/msm8992-lg-bullhead-rev-101"
deviceinfo_kernel_cmdline_mainline="console=tty0 console=ttyMSM0,115200,n8 debug ignore_loglevel PMOS_NO_OUTPUT_REDIRECT earlycon"

80
device/testing/linux-postmarketos-qcom-msm8994/0001-arm64-dts-qcom-msm8992-lg-bullhead-Place-LG-Bullhead.patch Normal file
View file

@ -0,0 +1,80 @@
From 383094fa8188a695d655bbe9eccdb469b17eb350 Mon Sep 17 00:00:00 2001
From: Jean THOMAS <virgule@jeanthomas.me>
Date: Thu, 2 Dec 2021 00:18:31 +0100
Subject: [PATCH 1/8] arm64: dts: qcom: msm8992-lg-bullhead: Place LG Bullhead
generic code into a DTSI file
This patch puts the generic code common across all hardware revisions
into a DTSI file.
It also prefixes the DTS filename with the vendor name, to follow the
naming convention used by other DTS files.
[ cherry-picked from 3f99518c6f6520ad0fd14d862d54ee12f16156b4 ]
Signed-off-by: Jean THOMAS <virgule@jeanthomas.me>
Reviewed-by: Petr Vorel <petr.vorel@gmail.com>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Link: https://lore.kernel.org/r/20211201231832.188634-1-virgule@jeanthomas.me
Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
---
arch/arm64/boot/dts/qcom/Makefile | 2 +-
.../boot/dts/qcom/msm8992-lg-bullhead-rev-101.dts | 14 ++++++++++++++
...llhead-rev-101.dts => msm8992-lg-bullhead.dtsi} | 2 --
3 files changed, 15 insertions(+), 3 deletions(-)
create mode 100644 arch/arm64/boot/dts/qcom/msm8992-lg-bullhead-rev-101.dts
rename arch/arm64/boot/dts/qcom/{msm8992-bullhead-rev-101.dts => msm8992-lg-bullhead.dtsi} (98%)
diff --git a/arch/arm64/boot/dts/qcom/Makefile b/arch/arm64/boot/dts/qcom/Makefile
index f7232052d286..ee8e81f1c449 100644
--- a/arch/arm64/boot/dts/qcom/Makefile
+++ b/arch/arm64/boot/dts/qcom/Makefile
@@ -18,7 +18,7 @@ dtb-$(CONFIG_ARCH_QCOM) += msm8916-samsung-a5u-eur.dtb
dtb-$(CONFIG_ARCH_QCOM) += msm8916-samsung-j5.dtb
dtb-$(CONFIG_ARCH_QCOM) += msm8916-samsung-serranove.dtb
dtb-$(CONFIG_ARCH_QCOM) += msm8916-wingtech-wt88047.dtb
-dtb-$(CONFIG_ARCH_QCOM) += msm8992-bullhead-rev-101.dtb
+dtb-$(CONFIG_ARCH_QCOM) += msm8992-lg-bullhead-rev-101.dtb
dtb-$(CONFIG_ARCH_QCOM) += msm8992-msft-lumia-octagon-talkman.dtb
dtb-$(CONFIG_ARCH_QCOM) += msm8992-xiaomi-libra.dtb
dtb-$(CONFIG_ARCH_QCOM) += msm8994-angler-rev-101.dtb
diff --git a/arch/arm64/boot/dts/qcom/msm8992-lg-bullhead-rev-101.dts b/arch/arm64/boot/dts/qcom/msm8992-lg-bullhead-rev-101.dts
new file mode 100644
index 000000000000..e6a5ebd30e2f
--- /dev/null
+++ b/arch/arm64/boot/dts/qcom/msm8992-lg-bullhead-rev-101.dts
@@ -0,0 +1,14 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/* Copyright (c) Jean Thomas <virgule@jeanthomas.me>
+ */
+
+/dts-v1/;
+
+#include "msm8992-lg-bullhead.dtsi"
+
+/ {
+ model = "LG Nexus 5X rev 1.01";
+
+ /* required for bootloader to select correct board */
+ qcom,board-id = <0xb64 0>;
+};
diff --git a/arch/arm64/boot/dts/qcom/msm8992-bullhead-rev-101.dts b/arch/arm64/boot/dts/qcom/msm8992-lg-bullhead.dtsi
similarity index 98%
rename from arch/arm64/boot/dts/qcom/msm8992-bullhead-rev-101.dts
rename to arch/arm64/boot/dts/qcom/msm8992-lg-bullhead.dtsi
index 4da6c44bf532..3b0cc85d6674 100644
--- a/arch/arm64/boot/dts/qcom/msm8992-bullhead-rev-101.dts
+++ b/arch/arm64/boot/dts/qcom/msm8992-lg-bullhead.dtsi
@@ -18,9 +18,7 @@ / {
compatible = "lg,bullhead", "qcom,msm8992";
chassis-type = "handset";
- /* required for bootloader to select correct board */
qcom,msm-id = <251 0>, <252 0>;
- qcom,board-id = <0xb64 0>;
qcom,pmic-id = <0x10009 0x1000A 0x0 0x0>;
/* Bullhead firmware doesn't support PSCI */
--
2.35.1

40
device/testing/linux-postmarketos-qcom-msm8994/0002-arm64-dts-qcom-msm8994-SoC-specific-compatible-strin.patch Normal file
View file

@ -0,0 +1,40 @@
From a0b6a909421af138fdbc6a90ba268fd7afb1cd94 Mon Sep 17 00:00:00 2001
From: Petr Vorel <petr.vorel@gmail.com>
Date: Thu, 23 Dec 2021 09:31:52 +0100
Subject: [PATCH 2/8] arm64: dts: qcom: msm8994: SoC specific compatible
strings for qcom-sdhci
[ cherry-picked from 4ec48ebfc3eab546c66c62ee13028f7e271cf496 ]
Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Link: https://lore.kernel.org/r/20211223083153.22435-2-petr.vorel@gmail.com
---
arch/arm64/boot/dts/qcom/msm8994.dtsi | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/msm8994.dtsi b/arch/arm64/boot/dts/qcom/msm8994.dtsi
index 215f56daa26c..8c1dc5155b71 100644
--- a/arch/arm64/boot/dts/qcom/msm8994.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8994.dtsi
@@ -444,7 +444,7 @@ usb@f9200000 {
};
sdhc1: sdhci@f9824900 {
- compatible = "qcom,sdhci-msm-v4";
+ compatible = "qcom,msm8994-sdhci", "qcom,sdhci-msm-v4";
reg = <0xf9824900 0x1a0>, <0xf9824000 0x800>;
reg-names = "hc_mem", "core_mem";
@@ -467,7 +467,7 @@ sdhc1: sdhci@f9824900 {
};
sdhc2: sdhci@f98a4900 {
- compatible = "qcom,sdhci-msm-v4";
+ compatible = "qcom,msm8994-sdhci", "qcom,sdhci-msm-v4";
reg = <0xf98a4900 0x11c>, <0xf98a4000 0x800>;
reg-names = "hc_mem", "core_mem";
--
2.35.1

39
device/testing/linux-postmarketos-qcom-msm8994/0003-arm64-dts-qcom-msm8994-huawei-angler-Add-vendor-name.patch Normal file
View file

@ -0,0 +1,39 @@
From 6c215dc10bd70550c4b8dc9d22f80a4563036519 Mon Sep 17 00:00:00 2001
From: Petr Vorel <petr.vorel@gmail.com>
Date: Fri, 14 Jan 2022 00:33:56 +0100
Subject: [PATCH 3/8] arm64: dts: qcom: msm8994-huawei-angler: Add vendor name
huawei
to follow the naming convention used by other DTS files.
[ cherry-picked from 8af90d6daa36a7180a2cd6aad874136aade27412 ]
Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Link: https://lore.kernel.org/r/20220113233358.17972-5-petr.vorel@gmail.com
---
arch/arm64/boot/dts/qcom/Makefile | 2 +-
...994-angler-rev-101.dts => msm8994-huawei-angler-rev-101.dts} | 0
2 files changed, 1 insertion(+), 1 deletion(-)
rename arch/arm64/boot/dts/qcom/{msm8994-angler-rev-101.dts => msm8994-huawei-angler-rev-101.dts} (100%)
diff --git a/arch/arm64/boot/dts/qcom/Makefile b/arch/arm64/boot/dts/qcom/Makefile
index ee8e81f1c449..b3fe8ce77bb8 100644
--- a/arch/arm64/boot/dts/qcom/Makefile
+++ b/arch/arm64/boot/dts/qcom/Makefile
@@ -21,7 +21,7 @@ dtb-$(CONFIG_ARCH_QCOM) += msm8916-wingtech-wt88047.dtb
dtb-$(CONFIG_ARCH_QCOM) += msm8992-lg-bullhead-rev-101.dtb
dtb-$(CONFIG_ARCH_QCOM) += msm8992-msft-lumia-octagon-talkman.dtb
dtb-$(CONFIG_ARCH_QCOM) += msm8992-xiaomi-libra.dtb
-dtb-$(CONFIG_ARCH_QCOM) += msm8994-angler-rev-101.dtb
+dtb-$(CONFIG_ARCH_QCOM) += msm8994-huawei-angler-rev-101.dtb
dtb-$(CONFIG_ARCH_QCOM) += msm8994-msft-lumia-octagon-cityman.dtb
dtb-$(CONFIG_ARCH_QCOM) += msm8994-sony-xperia-kitakami-ivy.dtb
dtb-$(CONFIG_ARCH_QCOM) += msm8994-sony-xperia-kitakami-karin.dtb
diff --git a/arch/arm64/boot/dts/qcom/msm8994-angler-rev-101.dts b/arch/arm64/boot/dts/qcom/msm8994-huawei-angler-rev-101.dts
similarity index 100%
rename from arch/arm64/boot/dts/qcom/msm8994-angler-rev-101.dts
rename to arch/arm64/boot/dts/qcom/msm8994-huawei-angler-rev-101.dts
--
2.35.1

42
device/testing/linux-postmarketos-qcom-msm8994/0004-arm64-dts-qcom-msm8994-huawei-angler-Add-sdhc1-defin.patch Normal file
View file

@ -0,0 +1,42 @@
From 55d3174d3ccb7c9c6ab318a8998822b5928948ca Mon Sep 17 00:00:00 2001
From: Petr Vorel <petr.vorel@gmail.com>
Date: Wed, 23 Mar 2022 21:48:40 +0100
Subject: [PATCH 4/8] arm64: dts: qcom: msm8994-huawei-angler: Add sdhc1
definition
Angler does not have SD card, thus sdhc2 kept disabled.
[ cherry-picked from e7773dbc87674aec210432185d9624ed346a46f1 ]
Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Link: https://lore.kernel.org/r/20220323204840.22832-1-petr.vorel@gmail.com
---
arch/arm64/boot/dts/qcom/msm8994-huawei-angler-rev-101.dts | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/arch/arm64/boot/dts/qcom/msm8994-huawei-angler-rev-101.dts b/arch/arm64/boot/dts/qcom/msm8994-huawei-angler-rev-101.dts
index 0e3dd48f0dbf..6e43e4339f55 100644
--- a/arch/arm64/boot/dts/qcom/msm8994-huawei-angler-rev-101.dts
+++ b/arch/arm64/boot/dts/qcom/msm8994-huawei-angler-rev-101.dts
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: GPL-2.0-only
/* Copyright (c) 2015, Huawei Inc. All rights reserved.
* Copyright (c) 2016, The Linux Foundation. All rights reserved.
- * Copyright (c) 2021, Petr Vorel <petr.vorel@gmail.com>
+ * Copyright (c) 2021-2022, Petr Vorel <petr.vorel@gmail.com>
*/
/dts-v1/;
@@ -41,3 +41,8 @@ serial@f991e000 {
&tlmm {
gpio-reserved-ranges = <85 4>;
};
+
+&sdhc1 {
+ status = "okay";
+ mmc-hs400-1_8v;
+};
--
2.35.1

38
device/testing/linux-postmarketos-qcom-msm8994/0005-arm64-dts-qcom-msm8994-Fix-sleep-clock-name.patch Normal file
View file

@ -0,0 +1,38 @@
From 6ad8a8b7d7240ff76cd0c8190d2992100602b547 Mon Sep 17 00:00:00 2001
From: Konrad Dybcio <konrad.dybcio@somainline.org>
Date: Sat, 19 Mar 2022 18:46:31 +0100
Subject: [PATCH 5/8] arm64: dts: qcom: msm8994: Fix sleep clock name
The sleep clock name expected by GCC is actually "sleep" and not
"sleep_clk". Fix the clock-names value for it to make sure it is
provided.
[ cherry-picked from 5827e28304673444f8e1cf426c2b08cc16382290 ]
Fixes: 9204da57cd65 ("arm64: dts: qcom: msm8994: Provide missing "xo_board" and "sleep_clk" to GCC")
Signed-off-by: Konrad Dybcio <konrad.dybcio@somainline.org>
Reviewed-by: Petr Vorel <petr.vorel@gmail.com>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Link: https://lore.kernel.org/r/20220319174645.340379-2-konrad.dybcio@somainline.org
Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
---
arch/arm64/boot/dts/qcom/msm8994.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm64/boot/dts/qcom/msm8994.dtsi b/arch/arm64/boot/dts/qcom/msm8994.dtsi
index 8c1dc5155b71..9fab5094338f 100644
--- a/arch/arm64/boot/dts/qcom/msm8994.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8994.dtsi
@@ -714,7 +714,7 @@ gcc: clock-controller@fc400000 {
#power-domain-cells = <1>;
reg = <0xfc400000 0x2000>;
- clock-names = "xo", "sleep_clk";
+ clock-names = "xo", "sleep";
clocks = <&xo_board>, <&sleep_clk>;
};
--
2.35.1

34
device/testing/linux-postmarketos-qcom-msm8994/0006-dt-bindings-clock-qcom-rpmcc-Add-RPM-Modem-SubSystem.patch Normal file
View file

@ -0,0 +1,34 @@
From 0626532137f8950de7c2ec55a9f5944fbf4ffd24 Mon Sep 17 00:00:00 2001
From: Konrad Dybcio <konrad.dybcio@somainline.org>
Date: Sat, 26 Feb 2022 22:41:24 +0100
Subject: [PATCH 6/8] dt-bindings: clock: qcom: rpmcc: Add RPM Modem SubSystem
(MSS) clocks
Add the missing clock definitions.
[ cherry-picked from 5b2fa289c0d475bcae3a86fa04b81f1f678cc4d2 ]
Signed-off-by: Konrad Dybcio <konrad.dybcio@somainline.org>
Acked-by: Rob Herring <robh@kernel.org>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Link: https://lore.kernel.org/r/20220226214126.21209-1-konrad.dybcio@somainline.org
Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
---
include/dt-bindings/clock/qcom,rpmcc.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/include/dt-bindings/clock/qcom,rpmcc.h b/include/dt-bindings/clock/qcom,rpmcc.h
index fb624ff39273..015db95303d1 100644
--- a/include/dt-bindings/clock/qcom,rpmcc.h
+++ b/include/dt-bindings/clock/qcom,rpmcc.h
@@ -165,5 +165,7 @@
#define RPM_SMD_PKA_A_CLK 119
#define RPM_SMD_CPUSS_GNOC_CLK 120
#define RPM_SMD_CPUSS_GNOC_A_CLK 121
+#define RPM_SMD_MSS_CFG_AHB_CLK 122
+#define RPM_SMD_MSS_CFG_AHB_A_CLK 123
#endif
--
2.35.1

96
device/testing/linux-postmarketos-qcom-msm8994/0007-clk-qcom-smd-Add-missing-RPM-clocks-for-msm8992-4.patch Normal file
View file

@ -0,0 +1,96 @@
From b79b46ed4e9360f7f960193d871c9d18cf24f1be Mon Sep 17 00:00:00 2001
From: Konrad Dybcio <konrad.dybcio@somainline.org>
Date: Sat, 26 Feb 2022 22:41:25 +0100
Subject: [PATCH 7/8] clk: qcom: smd: Add missing RPM clocks for msm8992/4
XO and MSS_CFG were omitted when first adding the clocks for these SoCs.
Add them, and while at it, move the XO clock to the top of the definition
list, as ideally everyone should start using it sooner or later..
[ cherry-picked from f804360bb3a50decbed6e2761247964dca72c080 ]
Fixes: b4297844995f ("clk: qcom: smd: Add support for MSM8992/4 rpm clocks")
Signed-off-by: Konrad Dybcio <konrad.dybcio@somainline.org>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Link: https://lore.kernel.org/r/20220226214126.21209-2-konrad.dybcio@somainline.org
Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
---
drivers/clk/qcom/clk-smd-rpm.c | 13 +++++++++++--
include/linux/soc/qcom/smd-rpm.h | 1 +
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/drivers/clk/qcom/clk-smd-rpm.c b/drivers/clk/qcom/clk-smd-rpm.c
index ea28e45ca371..418f017e933f 100644
--- a/drivers/clk/qcom/clk-smd-rpm.c
+++ b/drivers/clk/qcom/clk-smd-rpm.c
@@ -413,6 +413,7 @@ static const struct clk_ops clk_smd_rpm_branch_ops = {
.recalc_rate = clk_smd_rpm_recalc_rate,
};
+DEFINE_CLK_SMD_RPM_BRANCH(sdm660, bi_tcxo, bi_tcxo_a, QCOM_SMD_RPM_MISC_CLK, 0, 19200000);
DEFINE_CLK_SMD_RPM(msm8916, pcnoc_clk, pcnoc_a_clk, QCOM_SMD_RPM_BUS_CLK, 0);
DEFINE_CLK_SMD_RPM(msm8916, snoc_clk, snoc_a_clk, QCOM_SMD_RPM_BUS_CLK, 1);
DEFINE_CLK_SMD_RPM(msm8916, bimc_clk, bimc_a_clk, QCOM_SMD_RPM_MEM_CLK, 0);
@@ -604,7 +605,11 @@ DEFINE_CLK_SMD_RPM_XO_BUFFER(msm8992, ln_bb_clk, ln_bb_a_clk, 8, 19200000);
DEFINE_CLK_SMD_RPM(msm8992, ce1_clk, ce1_a_clk, QCOM_SMD_RPM_CE_CLK, 0);
DEFINE_CLK_SMD_RPM(msm8992, ce2_clk, ce2_a_clk, QCOM_SMD_RPM_CE_CLK, 1);
+DEFINE_CLK_SMD_RPM_BRANCH(msm8992, mss_cfg_ahb_clk, mss_cfg_ahb_a_clk,
+ QCOM_SMD_RPM_MCFG_CLK, 0, 19200000);
static struct clk_smd_rpm *msm8992_clks[] = {
+ [RPM_SMD_XO_CLK_SRC] = &sdm660_bi_tcxo,
+ [RPM_SMD_XO_A_CLK_SRC] = &sdm660_bi_tcxo_a,
[RPM_SMD_PNOC_CLK] = &msm8916_pcnoc_clk,
[RPM_SMD_PNOC_A_CLK] = &msm8916_pcnoc_a_clk,
[RPM_SMD_OCMEMGX_CLK] = &msm8974_ocmemgx_clk,
@@ -637,6 +642,8 @@ static struct clk_smd_rpm *msm8992_clks[] = {
[RPM_SMD_LN_BB_A_CLK] = &msm8992_ln_bb_a_clk,
[RPM_SMD_MMSSNOC_AHB_CLK] = &msm8974_mmssnoc_ahb_clk,
[RPM_SMD_MMSSNOC_AHB_A_CLK] = &msm8974_mmssnoc_ahb_a_clk,
+ [RPM_SMD_MSS_CFG_AHB_CLK] = &msm8992_mss_cfg_ahb_clk,
+ [RPM_SMD_MSS_CFG_AHB_A_CLK] = &msm8992_mss_cfg_ahb_a_clk,
[RPM_SMD_QDSS_CLK] = &msm8916_qdss_clk,
[RPM_SMD_QDSS_A_CLK] = &msm8916_qdss_a_clk,
[RPM_SMD_RF_CLK1] = &msm8916_rf_clk1,
@@ -661,6 +668,8 @@ static const struct rpm_smd_clk_desc rpm_clk_msm8992 = {
DEFINE_CLK_SMD_RPM(msm8994, ce3_clk, ce3_a_clk, QCOM_SMD_RPM_CE_CLK, 2);
static struct clk_smd_rpm *msm8994_clks[] = {
+ [RPM_SMD_XO_CLK_SRC] = &sdm660_bi_tcxo,
+ [RPM_SMD_XO_A_CLK_SRC] = &sdm660_bi_tcxo_a,
[RPM_SMD_PNOC_CLK] = &msm8916_pcnoc_clk,
[RPM_SMD_PNOC_A_CLK] = &msm8916_pcnoc_a_clk,
[RPM_SMD_OCMEMGX_CLK] = &msm8974_ocmemgx_clk,
@@ -693,6 +702,8 @@ static struct clk_smd_rpm *msm8994_clks[] = {
[RPM_SMD_LN_BB_A_CLK] = &msm8992_ln_bb_a_clk,
[RPM_SMD_MMSSNOC_AHB_CLK] = &msm8974_mmssnoc_ahb_clk,
[RPM_SMD_MMSSNOC_AHB_A_CLK] = &msm8974_mmssnoc_ahb_a_clk,
+ [RPM_SMD_MSS_CFG_AHB_CLK] = &msm8992_mss_cfg_ahb_clk,
+ [RPM_SMD_MSS_CFG_AHB_A_CLK] = &msm8992_mss_cfg_ahb_a_clk,
[RPM_SMD_QDSS_CLK] = &msm8916_qdss_clk,
[RPM_SMD_QDSS_A_CLK] = &msm8916_qdss_a_clk,
[RPM_SMD_RF_CLK1] = &msm8916_rf_clk1,
@@ -857,8 +868,6 @@ static const struct rpm_smd_clk_desc rpm_clk_msm8998 = {
.num_clks = ARRAY_SIZE(msm8998_clks),
};
-DEFINE_CLK_SMD_RPM_BRANCH(sdm660, bi_tcxo, bi_tcxo_a, QCOM_SMD_RPM_MISC_CLK, 0,
- 19200000);
DEFINE_CLK_SMD_RPM_XO_BUFFER(sdm660, ln_bb_clk3, ln_bb_clk3_a, 3, 19200000);
DEFINE_CLK_SMD_RPM_XO_BUFFER_PINCTRL(sdm660, ln_bb_clk3_pin, ln_bb_clk3_pin_a, 3, 19200000);
diff --git a/include/linux/soc/qcom/smd-rpm.h b/include/linux/soc/qcom/smd-rpm.h
index 860dd8cdf9f3..82c9d489833a 100644
--- a/include/linux/soc/qcom/smd-rpm.h
+++ b/include/linux/soc/qcom/smd-rpm.h
@@ -40,6 +40,7 @@ struct qcom_smd_rpm;
#define QCOM_SMD_RPM_AGGR_CLK 0x72676761
#define QCOM_SMD_RPM_HWKM_CLK 0x6d6b7768
#define QCOM_SMD_RPM_PKA_CLK 0x616b70
+#define QCOM_SMD_RPM_MCFG_CLK 0x6766636d
int qcom_rpm_smd_write(struct qcom_smd_rpm *rpm,
int state,
--
2.35.1

20
device/testing/linux-postmarketos-qcom-msm8994/APKBUILD
View file

@ -3,7 +3,7 @@
_flavor="postmarketos-qcom-msm8994"
pkgname=linux-$_flavor
pkgver=5.14.15
pkgver=5.17.2
pkgrel=0
pkgdesc="Kernel mainline Qualcomm MSM8994 and MSM8992 devices"
arch="aarch64"
@ -31,6 +31,13 @@ esac
source="
https://cdn.kernel.org/pub/linux/kernel/v${_kernver%%.*}.x/linux-$_kernver.tar.xz
config-$_flavor.$arch
0001-arm64-dts-qcom-msm8992-lg-bullhead-Place-LG-Bullhead.patch
0002-arm64-dts-qcom-msm8994-SoC-specific-compatible-strin.patch
0003-arm64-dts-qcom-msm8994-huawei-angler-Add-vendor-name.patch
0004-arm64-dts-qcom-msm8994-huawei-angler-Add-sdhc1-defin.patch
0005-arm64-dts-qcom-msm8994-Fix-sleep-clock-name.patch
0006-dt-bindings-clock-qcom-rpmcc-Add-RPM-Modem-SubSystem.patch
0007-clk-qcom-smd-Add-missing-RPM-clocks-for-msm8992-4.patch
"
builddir="$srcdir/linux-$_kernver"
@ -60,6 +67,13 @@ package() {
}
sha512sums="
f2549b5494ce2e8174b70d29282a60e072ca31d4a83e1e1f4b3f0acb150e1849fe4f2eaf6b6cb18ac758e723c3d53aa8686e4e6d9d7cb9696983ffe64f6a9b59 linux-5.14.15.tar.xz
599feb3a76f9d90e4a851a6037d810d34f5889de1ac32bfeb2f71dd9f756d197464132ed491a3f4dc7fbd16a7341431f765df0ebc8adec83bff82326777591a2 config-postmarketos-qcom-msm8994.aarch64
d62537333c1cedf839e95bfcbf757f45dd063f27ecf7fbba910f04663c9bb259438c1616f4bd68c5b59157d79dbd40815bf13d3b3e99a18cbade2b32e4dc5483 linux-5.17.2.tar.xz
8f4972dfe2142aca4836255cdedea9bb9fa8ea06273ec61b87b32abc9eaa44ad7966f81f0b639ab0a3edd6eba43bdfdef57c9c926a8a7627e5d0e487ea2d6c70 config-postmarketos-qcom-msm8994.aarch64
e2283b4b6624c22856b1f68d21ac81a42a1cfe17ebbfacdf85e1070edc987e01f09cb25de4d9454e4f4491a8815a7c3a8ab19a314f1246d707e0e491808d60a4 0001-arm64-dts-qcom-msm8992-lg-bullhead-Place-LG-Bullhead.patch
f50b54d3f2f77b4fd14edb5d64791ea015d28e7de537ff01729320075e996685c3c9856e82b3c88a5bfad9f9a1a2ff7d700e7e831c9e41b3a0852f070816e94d 0002-arm64-dts-qcom-msm8994-SoC-specific-compatible-strin.patch
28be5b50a3a99c04e595a01c7ae5aef248dce51c67d7c27b4168e6f49578b948a675388e9d3590ad214e866ace441beae87dba15a3ab42309ab3e6b1addcf17e 0003-arm64-dts-qcom-msm8994-huawei-angler-Add-vendor-name.patch
5f02fe1063a260f7741ed252f3e09db2e2ae252c26b5909ec74168438aac9ce9a5b6ac684f359fa8b540bef06cd03b8d02daffc5a0d65693c7827cd82dfa189a 0004-arm64-dts-qcom-msm8994-huawei-angler-Add-sdhc1-defin.patch
3c3d9a7000f2892d57d67178cef4ff9d4efc56f8fbfdf75dc45e19c84ead40a02ea91da71074be57b7abc06be2a9e71711308951fd0ca9c0189ef0ca7515a5e5 0005-arm64-dts-qcom-msm8994-Fix-sleep-clock-name.patch
31ca34945bfcdccd1ae4e41471f6ee05da56b8cd1b5ef7d331d4b743f77b2f302024986e0e057fea5d3aaeaea4aaa42e88f9ddf2dc3a7223cc6649ad95ff36de 0006-dt-bindings-clock-qcom-rpmcc-Add-RPM-Modem-SubSystem.patch
e982f438044c5b4b728699f49d4bcb317efc3be6609162dffe105fc6777d3a369789db5981cfb77fc6d66b4ba24f074d48ff2e51882a883abe7f878ee4881eb7 0007-clk-qcom-smd-Add-missing-RPM-clocks-for-msm8992-4.patch
"

477
device/testing/linux-postmarketos-qcom-msm8994/config-postmarketos-qcom-msm8994.aarch64
View file

File diff suppressed because it is too large Load diff