Skip to content

Commit

Permalink
ipq806x: refresh dtsi patches
Browse files Browse the repository at this point in the history 
- Add new tsens node
- Add new cpufreq required nodes
- Drop arm cpuidle compatible
- Fix duplicate node set upstream
- Add voltage tolerance value for cpu opp

Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
  • Loading branch information
@Ansuel @ynezz
Ansuel authored and ynezz committed May 7, 2021
1 parent 62cc66f commit 1e25423
Show file tree
Hide file tree
Showing 6 changed files with 399 additions and 448 deletions.
40 changes: 16 additions & 24 deletions target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8062.dtsi
View file
Expand Up @@ -14,14 +14,6 @@
stdout-path = "serial0:115200n8";
};

cpus {
qcom,l2 {
qcom,l2-rates = <384000000 1000000000 1000000000>;
qcom,l2-cpufreq = <384000000 600000000 1000000000>;
qcom,l2-volt = <1100000 1100000 1100000>;
};
};

reserved-memory {
#address-cells = <1>;
#size-cells = <1>;
Expand Down Expand Up @@ -54,31 +46,31 @@
/delete-node/opp-1400000000;

opp-384000000 {
opp-microvolt-speed0-pvs0-v0 = <950000>;
opp-microvolt-speed0-pvs1-v0 = <900000>;
opp-microvolt-speed0-pvs2-v0 = <850000>;
opp-microvolt-speed0-pvs3-v0 = <800000>;
opp-microvolt-speed0-pvs0-v0 = <945000 950000 955000>;
opp-microvolt-speed0-pvs1-v0 = <985000 900000 905000>;
opp-microvolt-speed0-pvs2-v0 = <845000 850000 855000>;
opp-microvolt-speed0-pvs3-v0 = <795000 800000 805000>;
};

opp-600000000 {
opp-microvolt-speed0-pvs0-v0 = <1000000>;
opp-microvolt-speed0-pvs1-v0 = <950000>;
opp-microvolt-speed0-pvs2-v0 = <900000>;
opp-microvolt-speed0-pvs3-v0 = <850000>;
opp-microvolt-speed0-pvs0-v0 = <995000 1000000 1005000>;
opp-microvolt-speed0-pvs1-v0 = <945000 950000 955000>;
opp-microvolt-speed0-pvs2-v0 = <895000 900000 905000>;
opp-microvolt-speed0-pvs3-v0 = <845000 850000 855000>;
};

opp-800000000 {
opp-microvolt-speed0-pvs0-v0 = <1050000>;
opp-microvolt-speed0-pvs1-v0 = <1000000>;
opp-microvolt-speed0-pvs2-v0 = <950000>;
opp-microvolt-speed0-pvs3-v0 = <900000>;
opp-microvolt-speed0-pvs0-v0 = <1045000 1050000 1055000>;
opp-microvolt-speed0-pvs1-v0 = < 995000 1000000 1005000>;
opp-microvolt-speed0-pvs2-v0 = < 945000 950000 955000>;
opp-microvolt-speed0-pvs3-v0 = < 895000 900000 905000>;
};

opp-1000000000 {
opp-microvolt-speed0-pvs0-v0 = <1100000>;
opp-microvolt-speed0-pvs1-v0 = <1050000>;
opp-microvolt-speed0-pvs2-v0 = <1000000>;
opp-microvolt-speed0-pvs3-v0 = <950000>;
opp-microvolt-speed0-pvs0-v0 = <1095000 1100000 1105000>;
opp-microvolt-speed0-pvs1-v0 = <1045000 1050000 1055000>;
opp-microvolt-speed0-pvs2-v0 = < 995000 1000000 1005000>;
opp-microvolt-speed0-pvs3-v0 = < 945000 950000 955000>;
};
};

Expand Down
94 changes: 45 additions & 49 deletions target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8065.dtsi
View file
Expand Up @@ -12,12 +12,6 @@
stdout-path = "serial0:115200n8";
};

cpus {
qcom,l2 {
qcom,l2-cpufreq = <384000000 600000000 1400000000>;
};
};

reserved-memory {
#address-cells = <1>;
#size-cells = <1>;
Expand Down Expand Up @@ -92,66 +86,68 @@

/delete-node/opp-1200000000;

opp-384000000 {
opp-microvolt-speed0-pvs0-v0 = <975000>;
opp-microvolt-speed0-pvs1-v0 = <950000>;
opp-microvolt-speed0-pvs2-v0 = <925000>;
opp-microvolt-speed0-pvs3-v0 = <900000>;
opp-microvolt-speed0-pvs4-v0 = <875000>;
opp-microvolt-speed0-pvs5-v0 = <825000>;
opp-microvolt-speed0-pvs6-v0 = <775000>;
opp-384000000 {
opp-microvolt-speed0-pvs0-v0 = <970000 975000 980000>;
opp-microvolt-speed0-pvs1-v0 = <945000 950000 955000>;
opp-microvolt-speed0-pvs2-v0 = <920000 925000 930000>;
opp-microvolt-speed0-pvs3-v0 = <985000 900000 905000>;
opp-microvolt-speed0-pvs4-v0 = <870000 875000 880000>;
opp-microvolt-speed0-pvs5-v0 = <820000 825000 830000>;
opp-microvolt-speed0-pvs6-v0 = <770000 775000 780000>;
};

opp-600000000 {
opp-microvolt-speed0-pvs0-v0 = <1000000>;
opp-microvolt-speed0-pvs1-v0 = <975000>;
opp-microvolt-speed0-pvs2-v0 = <950000>;
opp-microvolt-speed0-pvs3-v0 = <925000>;
opp-microvolt-speed0-pvs4-v0 = <900000>;
opp-microvolt-speed0-pvs5-v0 = <850000>;
opp-microvolt-speed0-pvs6-v0 = <800000>;
opp-microvolt-speed0-pvs0-v0 = <995000 1000000 1005000>;
opp-microvolt-speed0-pvs1-v0 = <970000 975000 980000>;
opp-microvolt-speed0-pvs2-v0 = <945000 950000 955000>;
opp-microvolt-speed0-pvs3-v0 = <920000 925000 930000>;
opp-microvolt-speed0-pvs4-v0 = <895000 900000 905000>;
opp-microvolt-speed0-pvs5-v0 = <845000 850000 855000>;
opp-microvolt-speed0-pvs6-v0 = <795000 800000 805000>;
};

opp-800000000 {
opp-microvolt-speed0-pvs0-v0 = <1050000>;
opp-microvolt-speed0-pvs1-v0 = <1025000>;
opp-microvolt-speed0-pvs2-v0 = <1000000>;
opp-microvolt-speed0-pvs3-v0 = <975000>;
opp-microvolt-speed0-pvs4-v0 = <950000>;
opp-microvolt-speed0-pvs5-v0 = <900000>;
opp-microvolt-speed0-pvs6-v0 = <850000>;
opp-microvolt-speed0-pvs0-v0 = <1045000 1050000 1055000>;
opp-microvolt-speed0-pvs1-v0 = <1020000 1025000 1030000>;
opp-microvolt-speed0-pvs2-v0 = <995000 1000000 1005000>;
opp-microvolt-speed0-pvs3-v0 = <970000 975000 980000>;
opp-microvolt-speed0-pvs4-v0 = <945000 950000 955000>;
opp-microvolt-speed0-pvs5-v0 = <895000 900000 905000>;
opp-microvolt-speed0-pvs6-v0 = <845000 850000 855000>;
};

opp-1000000000 {
opp-microvolt-speed0-pvs0-v0 = <1100000>;
opp-microvolt-speed0-pvs1-v0 = <1075000>;
opp-microvolt-speed0-pvs2-v0 = <1050000>;
opp-microvolt-speed0-pvs3-v0 = <1025000>;
opp-microvolt-speed0-pvs4-v0 = <1000000>;
opp-microvolt-speed0-pvs5-v0 = <950000>;
opp-microvolt-speed0-pvs6-v0 = <900000>;
opp-microvolt-speed0-pvs0-v0 = <1095000 1100000 1105000>;
opp-microvolt-speed0-pvs1-v0 = <1070000 1075000 1080000>;
opp-microvolt-speed0-pvs2-v0 = <1045000 1050000 1055000>;
opp-microvolt-speed0-pvs3-v0 = <1020000 1025000 1030000>;
opp-microvolt-speed0-pvs4-v0 = <995000 1000000 1005000>;
opp-microvolt-speed0-pvs5-v0 = <945000 950000 955000>;
opp-microvolt-speed0-pvs6-v0 = <895000 900000 905000>;
};

opp-1400000000 {
opp-microvolt-speed0-pvs0-v0 = <1175000>;
opp-microvolt-speed0-pvs1-v0 = <1150000>;
opp-microvolt-speed0-pvs2-v0 = <1125000>;
opp-microvolt-speed0-pvs3-v0 = <1100000>;
opp-microvolt-speed0-pvs4-v0 = <1075000>;
opp-microvolt-speed0-pvs5-v0 = <1025000>;
opp-microvolt-speed0-pvs6-v0 = <975000>;
opp-microvolt-speed0-pvs0-v0 = <1170000 1175000 1180000>;
opp-microvolt-speed0-pvs1-v0 = <1145000 1150000 1155000>;
opp-microvolt-speed0-pvs2-v0 = <1120000 1125000 1130000>;
opp-microvolt-speed0-pvs3-v0 = <1095000 1100000 1105000>;
opp-microvolt-speed0-pvs4-v0 = <1070000 1075000 1080000>;
opp-microvolt-speed0-pvs5-v0 = <1020000 1025000 1030000>;
opp-microvolt-speed0-pvs6-v0 = <970000 975000 980000>;
opp-level = <1>;
};

opp-1725000000 {
opp-hz = /bits/ 64 <1725000000>;
opp-microvolt-speed0-pvs0-v0 = <1262500>;
opp-microvolt-speed0-pvs1-v0 = <1225000>;
opp-microvolt-speed0-pvs2-v0 = <1200000>;
opp-microvolt-speed0-pvs3-v0 = <1175000>;
opp-microvolt-speed0-pvs4-v0 = <1150000>;
opp-microvolt-speed0-pvs5-v0 = <1100000>;
opp-microvolt-speed0-pvs6-v0 = <1050000>;
opp-microvolt-speed0-pvs0-v0 = <1257500 1262500 1267500>;
opp-microvolt-speed0-pvs1-v0 = <1220000 1225000 1230000>;
opp-microvolt-speed0-pvs2-v0 = <1195000 1200000 1205000>;
opp-microvolt-speed0-pvs3-v0 = <1170000 1175000 1180000>;
opp-microvolt-speed0-pvs4-v0 = <1145000 1150000 1155000>;
opp-microvolt-speed0-pvs5-v0 = <1095000 1100000 1105000>;
opp-microvolt-speed0-pvs6-v0 = <1045000 1050000 1055000>;
opp-supported-hw = <0x1>;
clock-latency-ns = <100000>;
opp-level = <2>;
};
};
8 changes: 2 additions & 6 deletions target/linux/ipq806x/patches-5.10/0069-arm-boot-add-dts-files.patch
View file
Expand Up @@ -10,22 +10,18 @@ Signed-off-by: John Crispin <john@phrozen.org>

--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -842,7 +842,24 @@ dtb-$(CONFIG_ARCH_QCOM) += \
qcom-ipq4019-ap.dk04.1-c3.dtb \
qcom-ipq4019-ap.dk07.1-c1.dtb \
@@ -843,6 +843,20 @@ dtb-$(CONFIG_ARCH_QCOM) += \
qcom-ipq4019-ap.dk07.1-c2.dtb \
+ qcom-ipq8062-wg2600hp3.dtb \
qcom-ipq8064-ap148.dtb \
qcom-ipq8064-rb3011.dtb \
+ qcom-ipq8064-c2600.dtb \
+ qcom-ipq8064-d7800.dtb \
+ qcom-ipq8064-db149.dtb \
+ qcom-ipq8064-ap161.dtb \
+ qcom-ipq8064-ea7500-v1.dtb \
+ qcom-ipq8064-ea8500.dtb \
+ qcom-ipq8064-g10.dtb \
+ qcom-ipq8064-r7500.dtb \
+ qcom-ipq8064-r7500v2.dtb \
+ qcom-ipq8064-unifi-ac-hd.dtb \
+ qcom-ipq8064-wg2600hp.dtb \
+ qcom-ipq8064-wpq864.dtb \
+ qcom-ipq8064-wxr-2533dhp.dtb \
Expand Down
58 changes: 55 additions & 3 deletions target/linux/ipq806x/patches-5.10/082-ipq8064-dtsi-tweaks.patch
View file
@@ -1,6 +1,6 @@
--- a/arch/arm/boot/dts/qcom-ipq8064.dtsi
+++ b/arch/arm/boot/dts/qcom-ipq8064.dtsi
@@ -20,7 +20,7 @@
@@ -20,9 +20,9 @@
#address-cells = <1>;
#size-cells = <0>;

Expand All @@ -9,7 +9,9 @@
compatible = "qcom,krait";
enable-method = "qcom,kpss-acc-v1";
device_type = "cpu";
@@ -30,7 +30,7 @@
reg = <1>;
next-level-cache = <&L2>;
@@ -30,9 +30,9 @@
qcom,saw = <&saw0>;
};

Expand All @@ -18,6 +20,8 @@
compatible = "qcom,krait";
enable-method = "qcom,kpss-acc-v1";
device_type = "cpu";
reg = <1>;
next-level-cache = <&L2>;
@@ -67,7 +67,7 @@
no-map;
};
Expand All @@ -27,6 +31,14 @@
reg = <0x41000000 0x200000>;
no-map;
};
@@ -128,6 +128,7 @@
gpio-ranges = <&qcom_pinmux 0 0 69>;
#gpio-cells = <2>;
interrupt-controller;
+ #address-cells = <0>;
#interrupt-cells = <2>;
interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>;

@@ -155,6 +155,7 @@
function = "pcie3_rst";
drive-strength = <12>;
Expand All @@ -35,6 +47,14 @@
};
};

@@ -190,6 +190,7 @@
intc: interrupt-controller@2000000 {
compatible = "qcom,msm-qgic2";
interrupt-controller;
+ #address-cells = <0>;
#interrupt-cells = <3>;
reg = <0x02000000 0x1000>,
<0x02002000 0x1000>;
@@ -219,21 +220,23 @@
acc0: clock-controller@2088000 {
compatible = "qcom,kpss-acc-v1";
Expand Down Expand Up @@ -88,11 +108,43 @@
compatible = "qcom,ipq806x-ahci", "generic-ahci";
reg = <0x29000000 0x180>;

@@ -430,6 +433,7 @@
@@ -430,6 +430,16 @@ qfprom: qfprom@700000 {
reg = <0x00700000 0x1000>;
#address-cells = <1>;
#size-cells = <1>;
+
+ tsens_calib: calib@400 {
+ reg = <0x400 0xb>;
+ };
+ tsens_backup: backup@410 {
+ reg = <0x410 0xb>;
+ };
+ speedbin_efuse: speedbin@0c0 {
+ reg = <0x0c0 0x4>;
+ };
};

gcc: clock-controller@900000 {
@@ -437,9 +447,21 @@ gcc: clock-controller@900000 {

gcc: clock-controller@900000 {
- compatible = "qcom,gcc-ipq8064";
+ compatible = "qcom,gcc-ipq8064", "syscon";
reg = <0x00900000 0x4000>;
#clock-cells = <1>;
#reset-cells = <1>;
+ #power-domain-cells = <1>;
+
+ tsens: thermal-sensor@900000 {
+ compatible = "qcom,ipq8064-tsens";
+
+ nvmem-cells = <&tsens_calib>, <&tsens_backup>;
+ nvmem-cell-names = "calib", "calib_backup";
+ interrupts = <GIC_SPI 178 IRQ_TYPE_LEVEL_HIGH>;
+ interrupt-names = "uplow";
+ #thermal-sensor-cells = <1>;
+ #qcom,sensors = <11>;
+ };
};

tcsr: syscon@1a400000 {
Expand Down

0 comments on commit 1e25423

Please sign in to comment.