mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-23 15:32:33 +00:00
1199a91095
Refreshed patches. The following patches were upstreamed and have been deleted: * target/linux/lantiq/patches-4.14/0025-MIPS-lantiq-gphy-Remove-reboot-remove-reset-asserts.patch * target/linux/generic/pending-4.14/101-clocksource-mips-gic-timer-fix-clocksource-counter-w.patch * target/linux/generic/pending-4.14/103-MIPS-c-r4k-fix-data-corruption-related-to-cache-coherence.patch * target/linux/generic/pending-4.14/181-net-usb-add-lte-modem-wistron-neweb-d18q1.patch Compile-tested: ramips/mt7621, x86/64 Run-tested: ramips/mt7621 Signed-off-by: Stijn Segers <foss@volatilesystems.org>
94 lines
3.6 KiB
Diff
94 lines
3.6 KiB
Diff
From d30840e2b1cf79d90392e6051b0c0b6006d29d8b Mon Sep 17 00:00:00 2001
|
|
From: John Crispin <john@phrozen.org>
|
|
Date: Thu, 9 Mar 2017 09:32:40 +0100
|
|
Subject: [PATCH 64/69] clk: clk-rpm fixes
|
|
|
|
Signed-off-by: John Crispin <john@phrozen.org>
|
|
---
|
|
.../devicetree/bindings/clock/qcom,rpmcc.txt | 1 +
|
|
drivers/clk/qcom/clk-rpm.c | 35 ++++++++++++++++++++++
|
|
include/dt-bindings/clock/qcom,rpmcc.h | 4 +++
|
|
3 files changed, 40 insertions(+)
|
|
|
|
--- a/Documentation/devicetree/bindings/clock/qcom,rpmcc.txt
|
|
+++ b/Documentation/devicetree/bindings/clock/qcom,rpmcc.txt
|
|
@@ -13,6 +13,7 @@ Required properties :
|
|
"qcom,rpmcc-msm8916", "qcom,rpmcc"
|
|
"qcom,rpmcc-msm8974", "qcom,rpmcc"
|
|
"qcom,rpmcc-apq8064", "qcom,rpmcc"
|
|
+ "qcom,rpmcc-ipq806x", "qcom,rpmcc"
|
|
|
|
- #clock-cells : shall contain 1
|
|
|
|
--- a/drivers/clk/qcom/clk-rpm.c
|
|
+++ b/drivers/clk/qcom/clk-rpm.c
|
|
@@ -359,6 +359,16 @@ DEFINE_CLK_RPM(apq8064, sfab_clk, sfab_a
|
|
DEFINE_CLK_RPM(apq8064, sfpb_clk, sfpb_a_clk, QCOM_RPM_SFPB_CLK);
|
|
DEFINE_CLK_RPM(apq8064, qdss_clk, qdss_a_clk, QCOM_RPM_QDSS_CLK);
|
|
|
|
+/* ipq806x */
|
|
+DEFINE_CLK_RPM(ipq806x, afab_clk, afab_a_clk, QCOM_RPM_APPS_FABRIC_CLK);
|
|
+DEFINE_CLK_RPM(ipq806x, cfpb_clk, cfpb_a_clk, QCOM_RPM_CFPB_CLK);
|
|
+DEFINE_CLK_RPM(ipq806x, daytona_clk, daytona_a_clk, QCOM_RPM_DAYTONA_FABRIC_CLK);
|
|
+DEFINE_CLK_RPM(ipq806x, ebi1_clk, ebi1_a_clk, QCOM_RPM_EBI1_CLK);
|
|
+DEFINE_CLK_RPM(ipq806x, sfab_clk, sfab_a_clk, QCOM_RPM_SYS_FABRIC_CLK);
|
|
+DEFINE_CLK_RPM(ipq806x, sfpb_clk, sfpb_a_clk, QCOM_RPM_SFPB_CLK);
|
|
+DEFINE_CLK_RPM(ipq806x, nss_fabric_0_clk, nss_fabric_0_a_clk, QCOM_RPM_NSS_FABRIC_0_CLK);
|
|
+DEFINE_CLK_RPM(ipq806x, nss_fabric_1_clk, nss_fabric_1_a_clk, QCOM_RPM_NSS_FABRIC_1_CLK);
|
|
+
|
|
static struct clk_rpm *apq8064_clks[] = {
|
|
[RPM_APPS_FABRIC_CLK] = &apq8064_afab_clk,
|
|
[RPM_APPS_FABRIC_A_CLK] = &apq8064_afab_a_clk,
|
|
@@ -380,13 +390,38 @@ static struct clk_rpm *apq8064_clks[] =
|
|
[RPM_QDSS_A_CLK] = &apq8064_qdss_a_clk,
|
|
};
|
|
|
|
+static struct clk_rpm *ipq806x_clks[] = {
|
|
+ [RPM_APPS_FABRIC_CLK] = &ipq806x_afab_clk,
|
|
+ [RPM_APPS_FABRIC_A_CLK] = &ipq806x_afab_a_clk,
|
|
+ [RPM_CFPB_CLK] = &ipq806x_cfpb_clk,
|
|
+ [RPM_CFPB_A_CLK] = &ipq806x_cfpb_a_clk,
|
|
+ [RPM_DAYTONA_FABRIC_CLK] = &ipq806x_daytona_clk,
|
|
+ [RPM_DAYTONA_FABRIC_A_CLK] = &ipq806x_daytona_a_clk,
|
|
+ [RPM_EBI1_CLK] = &ipq806x_ebi1_clk,
|
|
+ [RPM_EBI1_A_CLK] = &ipq806x_ebi1_a_clk,
|
|
+ [RPM_SYS_FABRIC_CLK] = &ipq806x_sfab_clk,
|
|
+ [RPM_SYS_FABRIC_A_CLK] = &ipq806x_sfab_a_clk,
|
|
+ [RPM_SFPB_CLK] = &ipq806x_sfpb_clk,
|
|
+ [RPM_SFPB_A_CLK] = &ipq806x_sfpb_a_clk,
|
|
+ [RPM_NSS_FABRIC_0_CLK] = &ipq806x_nss_fabric_0_clk,
|
|
+ [RPM_NSS_FABRIC_0_A_CLK] = &ipq806x_nss_fabric_0_a_clk,
|
|
+ [RPM_NSS_FABRIC_1_CLK] = &ipq806x_nss_fabric_1_clk,
|
|
+ [RPM_NSS_FABRIC_1_A_CLK] = &ipq806x_nss_fabric_1_a_clk,
|
|
+};
|
|
+
|
|
static const struct rpm_clk_desc rpm_clk_apq8064 = {
|
|
.clks = apq8064_clks,
|
|
.num_clks = ARRAY_SIZE(apq8064_clks),
|
|
};
|
|
|
|
+static const struct rpm_clk_desc rpm_clk_ipq806x = {
|
|
+ .clks = ipq806x_clks,
|
|
+ .num_clks = ARRAY_SIZE(ipq806x_clks),
|
|
+};
|
|
+
|
|
static const struct of_device_id rpm_clk_match_table[] = {
|
|
{ .compatible = "qcom,rpmcc-apq8064", .data = &rpm_clk_apq8064 },
|
|
+ { .compatible = "qcom,rpmcc-ipq806x", .data = &rpm_clk_ipq806x },
|
|
{ }
|
|
};
|
|
MODULE_DEVICE_TABLE(of, rpm_clk_match_table);
|
|
--- a/include/dt-bindings/clock/qcom,rpmcc.h
|
|
+++ b/include/dt-bindings/clock/qcom,rpmcc.h
|
|
@@ -37,6 +37,10 @@
|
|
#define RPM_SYS_FABRIC_A_CLK 19
|
|
#define RPM_SFPB_CLK 20
|
|
#define RPM_SFPB_A_CLK 21
|
|
+#define RPM_NSS_FABRIC_0_CLK 22
|
|
+#define RPM_NSS_FABRIC_0_A_CLK 23
|
|
+#define RPM_NSS_FABRIC_1_CLK 24
|
|
+#define RPM_NSS_FABRIC_1_A_CLK 25
|
|
|
|
/* SMD RPM clocks */
|
|
#define RPM_SMD_XO_CLK_SRC 0
|