Skip to content

Commit

Permalink
qualcommax: ipq60xx: fix build with linux kernel 6.6
Browse files Browse the repository at this point in the history
  • Loading branch information
coolsnowwolf committed Feb 9, 2025
1 parent 812109c commit 43e59ca
Show file tree
Hide file tree
Showing 4 changed files with 165 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,22 @@ Signed-off-by: Robert Marko <[email protected]>

--- a/arch/arm64/boot/dts/qcom/ipq6018.dtsi
+++ b/arch/arm64/boot/dts/qcom/ipq6018.dtsi
@@ -199,6 +199,11 @@
@@ -199,6 +199,21 @@
no-map;
};

+ nss_region: memory@40000000 {
+ nss_region: nss@40000000 {
+ no-map;
+ reg = <0x0 0x40000000 0x0 0x01000000>;
+ };
+
+ q6_etr_region: q6_etr_dump@50000000 {
+ reg = <0x0 0x50000000 0x0 0x100000>;
+ no-map;
+ };
+
+ m3_dump_region: m3_dump@50100000 {
+ reg = <0x0 0x50100000 0x0 0x100000>;
+ no-map;
+ };
+
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
--- a/arch/arm64/boot/dts/qcom/ipq6018.dtsi
+++ b/arch/arm64/boot/dts/qcom/ipq6018.dtsi
@@ -15,7 +15,7 @@
#size-cells = <2>;
interrupt-parent = <&intc>;

- clocks {
+ clocks: clocks {
sleep_clk: sleep-clk {
compatible = "fixed-clock";
clock-frequency = <32000>;
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
--- a/arch/arm64/boot/dts/qcom/ipq6018.dtsi
+++ b/arch/arm64/boot/dts/qcom/ipq6018.dtsi
@@ -43,7 +43,6 @@
clocks = <&apcs_glb APCS_ALIAS0_CORE_CLK>;
clock-names = "cpu";
operating-points-v2 = <&cpu_opp_table>;
- cpu-supply = <&ipq6018_s2>;
#cooling-cells = <2>;
};

@@ -56,7 +55,6 @@
clocks = <&apcs_glb APCS_ALIAS0_CORE_CLK>;
clock-names = "cpu";
operating-points-v2 = <&cpu_opp_table>;
- cpu-supply = <&ipq6018_s2>;
#cooling-cells = <2>;
};

@@ -69,7 +67,6 @@
clocks = <&apcs_glb APCS_ALIAS0_CORE_CLK>;
clock-names = "cpu";
operating-points-v2 = <&cpu_opp_table>;
- cpu-supply = <&ipq6018_s2>;
#cooling-cells = <2>;
};

@@ -82,7 +79,6 @@
clocks = <&apcs_glb APCS_ALIAS0_CORE_CLK>;
clock-names = "cpu";
operating-points-v2 = <&cpu_opp_table>;
- cpu-supply = <&ipq6018_s2>;
#cooling-cells = <2>;
};

@@ -171,20 +167,6 @@
compatible = "qcom,rpm-ipq6018";
qcom,glink-channels = "rpm_requests";

- regulators {
- compatible = "qcom,rpm-mp5496-regulators";
-
- ipq6018_s2: s2 {
- regulator-min-microvolt = <725000>;
- regulator-max-microvolt = <1062500>;
- regulator-always-on;
- };
-
- ipq6018_l2: l2 {
- regulator-min-microvolt = <1800000>;
- regulator-max-microvolt = <3300000>;
- };
- };
};
};
};
--- /dev/null
+++ b/arch/arm64/boot/dts/qcom/ipq6018-mp5496.dtsi
@@ -0,0 +1,39 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+
+&rpm_requests {
+ regulators {
+ compatible = "qcom,rpm-mp5496-regulators";
+
+ ipq6018_s2: s2 {
+ regulator-min-microvolt = <725000>;
+ regulator-max-microvolt = <1062500>;
+ regulator-always-on;
+ };
+
+ ipq6018_l2: l2 {
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <3300000>;
+ regulator-always-on;
+ };
+ };
+};
+
+&sdhc {
+ vqmmc-supply = <&ipq6018_l2>;
+};
+
+&CPU0 {
+ cpu-supply = <&ipq6018_s2>;
+};
+
+&CPU1 {
+ cpu-supply = <&ipq6018_s2>;
+};
+
+&CPU2 {
+ cpu-supply = <&ipq6018_s2>;
+};
+
+&CPU3 {
+ cpu-supply = <&ipq6018_s2>;
+};
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
From b4a32d218d424b81a58fbd419e1114b1c1f76168 Mon Sep 17 00:00:00 2001
From: Devi Priya <[email protected]>
Date: Thu, 5 Oct 2023 21:35:50 +0530
Subject: [PATCH] pwm: driver for qualcomm ipq6018 pwm block

Describe the PWM block on IPQ6018.

The PWM is in the TCSR area. Make &tcsr "simple-mfd" compatible, and add
&pwm as child of &tcsr.

Add also ipq6018 specific compatible string.

Reviewed-by: Krzysztof Kozlowski <[email protected]>
Co-developed-by: Baruch Siach <[email protected]>
Signed-off-by: Baruch Siach <[email protected]>
Signed-off-by: Devi Priya <[email protected]>
---
arch/arm64/boot/dts/qcom/ipq6018.dtsi | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)

--- a/arch/arm64/boot/dts/qcom/ipq6018.dtsi
+++ b/arch/arm64/boot/dts/qcom/ipq6018.dtsi
@@ -409,8 +409,21 @@
};

tcsr: syscon@1937000 {
- compatible = "qcom,tcsr-ipq6018", "syscon";
+ compatible = "qcom,tcsr-ipq6018", "syscon", "simple-mfd";
reg = <0x0 0x01937000 0x0 0x21000>;
+ ranges = <0x0 0x0 0x01937000 0x21000>;
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ pwm: pwm@a010 {
+ compatible = "qcom,ipq6018-pwm";
+ reg = <0xa010 0x20>;
+ clocks = <&gcc GCC_ADSS_PWM_CLK>;
+ assigned-clocks = <&gcc GCC_ADSS_PWM_CLK>;
+ assigned-clock-rates = <100000000>;
+ #pwm-cells = <2>;
+ status = "disabled";
+ };
};

usb2: usb@70f8800 {

0 comments on commit 43e59ca

Please sign in to comment.