X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Fipq806x%2Fpatches-4.19%2F0064-clk-clk-rpm-fixes.patch;h=72217de12e62c8ed8bbd9e22ea92b5e3c6a14f8c;hb=63066d3006958ca52df71f53c6f413ad4fb74974;hp=167278a7015d48f485f8d18ed73b40b342d6e441;hpb=53801ae1c79ecf5153d658951e3c3afed4a16d93;p=openwrt%2Fopenwrt.git

diff --git a/target/linux/ipq806x/patches-4.19/0064-clk-clk-rpm-fixes.patch b/target/linux/ipq806x/patches-4.19/0064-clk-clk-rpm-fixes.patch
index 167278a701..72217de12e 100644
--- a/target/linux/ipq806x/patches-4.19/0064-clk-clk-rpm-fixes.patch
+++ b/target/linux/ipq806x/patches-4.19/0064-clk-clk-rpm-fixes.patch
@@ -12,19 +12,32 @@ Signed-off-by: John Crispin <john@phrozen.org>
 
 --- 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"
+@@ -16,6 +16,7 @@ Required properties :
  			"qcom,rpmcc-msm8974", "qcom,rpmcc"
  			"qcom,rpmcc-apq8064", "qcom,rpmcc"
+ 			"qcom,rpmcc-msm8996", "qcom,rpmcc"
 +			"qcom,rpmcc-ipq806x", "qcom,rpmcc"
  
  - #clock-cells : shall contain 1
  
+--- a/include/dt-bindings/clock/qcom,rpmcc.h
++++ b/include/dt-bindings/clock/qcom,rpmcc.h
+@@ -45,6 +45,10 @@
+ #define RPM_XO_A0				27
+ #define RPM_XO_A1				28
+ #define RPM_XO_A2				29
++#define RPM_NSS_FABRIC_0_CLK			30
++#define RPM_NSS_FABRIC_0_A_CLK			31
++#define RPM_NSS_FABRIC_1_CLK			32
++#define RPM_NSS_FABRIC_1_A_CLK			33
+ 
+ /* SMD RPM clocks */
+ #define RPM_SMD_XO_CLK_SRC				0
 --- 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);
+@@ -520,6 +520,16 @@ DEFINE_CLK_RPM_XO_BUFFER(apq8064, xo_a0_
+ DEFINE_CLK_RPM_XO_BUFFER(apq8064, xo_a1_clk, xo_a1_a_clk, 24);
+ DEFINE_CLK_RPM_XO_BUFFER(apq8064, xo_a2_clk, xo_a2_a_clk, 28);
  
 +/* ipq806x */
 +DEFINE_CLK_RPM(ipq806x, afab_clk, afab_a_clk, QCOM_RPM_APPS_FABRIC_CLK);
@@ -39,8 +52,8 @@ Signed-off-by: John Crispin <john@phrozen.org>
  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,
+@@ -546,15 +556,40 @@ static struct clk_rpm *apq8064_clks[] =
+ 	[RPM_XO_A2] = &apq8064_xo_a2_clk,
  };
  
 +static struct clk_rpm *ipq806x_clks[] = {
@@ -73,21 +86,10 @@ Signed-off-by: John Crispin <john@phrozen.org>
 +};
 +
  static const struct of_device_id rpm_clk_match_table[] = {
+ 	{ .compatible = "qcom,rpmcc-msm8660", .data = &rpm_clk_msm8660 },
+ 	{ .compatible = "qcom,rpmcc-apq8060", .data = &rpm_clk_msm8660 },
  	{ .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