Skip to content

Commit 761e7a3

Browse files
Official-Ayrton990Official-Ayrton990
committed
Merge branch 'QK-eleven' into upstreamed-common
2 parents 0be49d7 + ffebc4e commit 761e7a3

File tree

23 files changed

+108
-263
lines changed

23 files changed

+108
-263
lines changed

‎arch/arm64/boot/dts/vendor/qcom/kona-v2.dtsi‎

Lines changed: 54 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,44 @@
66
qcom,msm-id = <356 0x20000>;
77
};
88

9+
&CPU0 {
10+
capacity-dmips-mhz = <448>;
11+
dynamic-power-coefficient = <103>;
12+
};
13+
14+
&CPU1 {
15+
capacity-dmips-mhz = <448>;
16+
dynamic-power-coefficient = <103>;
17+
};
18+
19+
&CPU2 {
20+
capacity-dmips-mhz = <448>;
21+
dynamic-power-coefficient = <103>;
22+
};
23+
24+
&CPU3 {
25+
capacity-dmips-mhz = <448>;
26+
dynamic-power-coefficient = <103>;
27+
};
28+
929
&CPU4 {
10-
dynamic-power-coefficient = <533>;
30+
capacity-dmips-mhz = <1022>;
31+
dynamic-power-coefficient = <340>;
1132
};
1233

1334
&CPU5 {
14-
dynamic-power-coefficient = <533>;
35+
capacity-dmips-mhz = <1022>;
36+
dynamic-power-coefficient = <340>;
1537
};
1638

1739
&CPU6 {
18-
dynamic-power-coefficient = <533>;
40+
capacity-dmips-mhz = <1022>;
41+
dynamic-power-coefficient = <340>;
1942
};
2043

2144
&CPU7 {
22-
dynamic-power-coefficient = <642>;
45+
capacity-dmips-mhz = <1024>;
46+
dynamic-power-coefficient = <409>;
2347
};
2448

2549
&clock_camcc {
@@ -390,4 +414,30 @@
390414
<GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>,
391415
<GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
392416
interrupt-names = "dcvsh0_int", "dcvsh1_int", "dcvsh2_int";
417+
418+
qcom,cpufreq-table-0 =
419+
< 691200>,
420+
<1708800>,
421+
<1804800>;
422+
423+
qcom,cpufreq-table-1 =
424+
< 710400>,
425+
<1478400>,
426+
<1766400>,
427+
<1862400>,
428+
<2054400>,
429+
<2246400>,
430+
<2342400>,
431+
<2419200>;
432+
433+
qcom,cpufreq-table-2 =
434+
< 844800>,
435+
<1862400>,
436+
<2073600>,
437+
<2265600>,
438+
<2361600>,
439+
<2457600>,
440+
<2553600>,
441+
<2841600>,
442+
<3187200>;
393443
};

‎arch/arm64/boot/dts/vendor/qcom/xiaomi-sm8250-common.dtsi‎

Lines changed: 0 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -5,81 +5,6 @@
55
#include "kona-sde-display.dtsi"
66
#include "kona-thermal-overlay.dtsi"
77

8-
// Overlayed CPU Frequency table
9-
&cpufreq_hw {
10-
interrupts = <GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH>,
11-
<GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>,
12-
<GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
13-
interrupt-names = "dcvsh0_int", "dcvsh1_int", "dcvsh2_int";
14-
15-
qcom,cpufreq-table-0 =
16-
< 691200>,
17-
<1708800>,
18-
<1804800>;
19-
20-
qcom,cpufreq-table-1 =
21-
< 710400>,
22-
<1478400>,
23-
<1766400>,
24-
<1862400>,
25-
<2054400>,
26-
<2246400>,
27-
<2342400>,
28-
<2419200>;
29-
30-
qcom,cpufreq-table-2 =
31-
< 844800>,
32-
<1862400>,
33-
<2073600>,
34-
<2265600>,
35-
<2361600>,
36-
<2457600>,
37-
<2553600>,
38-
<2841600>,
39-
<3187200>;
40-
};
41-
42-
//CPU Recalculation & Optimization
43-
&CPU0 {
44-
capacity-dmips-mhz = <448>;
45-
dynamic-power-coefficient = <103>;
46-
};
47-
48-
&CPU1 {
49-
capacity-dmips-mhz = <448>;
50-
dynamic-power-coefficient = <103>;
51-
};
52-
53-
&CPU2 {
54-
capacity-dmips-mhz = <448>;
55-
dynamic-power-coefficient = <103>;
56-
};
57-
58-
&CPU3 {
59-
capacity-dmips-mhz = <448>;
60-
dynamic-power-coefficient = <103>;
61-
};
62-
63-
&CPU4 {
64-
capacity-dmips-mhz = <1022>;
65-
dynamic-power-coefficient = <340>;
66-
};
67-
68-
&CPU5 {
69-
capacity-dmips-mhz = <1022>;
70-
dynamic-power-coefficient = <340>;
71-
};
72-
73-
&CPU6 {
74-
capacity-dmips-mhz = <1022>;
75-
dynamic-power-coefficient = <340>;
76-
};
77-
78-
&CPU7 {
79-
capacity-dmips-mhz = <1024>;
80-
dynamic-power-coefficient = <409>;
81-
};
82-
838
&qupv3_se12_2uart {
849
status = "ok";
8510
};

‎arch/arm64/configs/vendor/alioth_defconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,11 @@ CONFIG_KALLSYMS_ALL=y
5050
CONFIG_BPF_SYSCALL=y
5151
CONFIG_BPF_JIT_ALWAYS_ON=y
5252
CONFIG_EMBEDDED=y
53+
CONFIG_PERF_EVENTS=y
5354
# CONFIG_SLUB_DEBUG is not set
5455
# CONFIG_COMPAT_BRK is not set
5556
CONFIG_SLAB_FREELIST_RANDOM=y
5657
CONFIG_SLAB_FREELIST_HARDENED=y
57-
CONFIG_PROFILING=y
5858
# CONFIG_ZONE_DMA32 is not set
5959
CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
6060
CONFIG_ARCH_QCOM=y

‎arch/arm64/configs/vendor/apollo_defconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,11 @@ CONFIG_KALLSYMS_ALL=y
4949
CONFIG_BPF_SYSCALL=y
5050
CONFIG_BPF_JIT_ALWAYS_ON=y
5151
CONFIG_EMBEDDED=y
52+
CONFIG_PERF_EVENTS=y
5253
# CONFIG_SLUB_DEBUG is not set
5354
# CONFIG_COMPAT_BRK is not set
5455
CONFIG_SLAB_FREELIST_RANDOM=y
5556
CONFIG_SLAB_FREELIST_HARDENED=y
56-
CONFIG_PROFILING=y
5757
# CONFIG_ZONE_DMA32 is not set
5858
CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
5959

‎arch/arm64/configs/vendor/cas_defconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,11 @@ CONFIG_KALLSYMS_ALL=y
5050
CONFIG_BPF_SYSCALL=y
5151
CONFIG_BPF_JIT_ALWAYS_ON=y
5252
CONFIG_EMBEDDED=y
53+
CONFIG_PERF_EVENTS=y
5354
# CONFIG_SLUB_DEBUG is not set
5455
# CONFIG_COMPAT_BRK is not set
5556
CONFIG_SLAB_FREELIST_RANDOM=y
5657
CONFIG_SLAB_FREELIST_HARDENED=y
57-
CONFIG_PROFILING=y
5858
# CONFIG_ZONE_DMA32 is not set
5959
CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
6060
CONFIG_ARCH_HAS_REFCOUNT_FULL=y

‎arch/arm64/configs/vendor/cmi_defconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,11 @@ CONFIG_KALLSYMS_ALL=y
5151
CONFIG_BPF_SYSCALL=y
5252
CONFIG_BPF_JIT_ALWAYS_ON=y
5353
CONFIG_EMBEDDED=y
54+
CONFIG_PERF_EVENTS=y
5455
# CONFIG_SLUB_DEBUG is not set
5556
# CONFIG_COMPAT_BRK is not set
5657
CONFIG_SLAB_FREELIST_RANDOM=y
5758
CONFIG_SLAB_FREELIST_HARDENED=y
58-
CONFIG_PROFILING=y
5959
# CONFIG_ZONE_DMA32 is not set
6060
CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
6161
CONFIG_ARCH_HAS_REFCOUNT_FULL=y

‎arch/arm64/configs/vendor/lmi_defconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,11 @@ CONFIG_KALLSYMS_ALL=y
5050
CONFIG_BPF_SYSCALL=y
5151
CONFIG_BPF_JIT_ALWAYS_ON=y
5252
CONFIG_EMBEDDED=y
53+
CONFIG_PERF_EVENTS=y
5354
# CONFIG_SLUB_DEBUG is not set
5455
# CONFIG_COMPAT_BRK is not set
5556
CONFIG_SLAB_FREELIST_RANDOM=y
5657
CONFIG_SLAB_FREELIST_HARDENED=y
57-
CONFIG_PROFILING=y
5858
# CONFIG_ZONE_DMA32 is not set
5959
CONFIG_ARCH_HAS_REFCOUNT_FULL=y
6060
CONFIG_ARCH_HAS_REFCOUNT=y

‎arch/arm64/configs/vendor/thyme_defconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,11 @@ CONFIG_KALLSYMS_ALL=y
5050
CONFIG_BPF_SYSCALL=y
5151
CONFIG_BPF_JIT_ALWAYS_ON=y
5252
CONFIG_EMBEDDED=y
53+
CONFIG_PERF_EVENTS=y
5354
# CONFIG_SLUB_DEBUG is not set
5455
# CONFIG_COMPAT_BRK is not set
5556
CONFIG_SLAB_FREELIST_RANDOM=y
5657
CONFIG_SLAB_FREELIST_HARDENED=y
57-
CONFIG_PROFILING=y
5858
# CONFIG_ZONE_DMA32 is not set
5959
CONFIG_ARCH_QCOM=y
6060
CONFIG_ARCH_KONA=y

‎arch/arm64/configs/vendor/umi_defconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,11 @@ CONFIG_KALLSYMS_ALL=y
5050
CONFIG_BPF_SYSCALL=y
5151
CONFIG_BPF_JIT_ALWAYS_ON=y
5252
CONFIG_EMBEDDED=y
53+
CONFIG_PERF_EVENTS=y
5354
# CONFIG_SLUB_DEBUG is not set
5455
# CONFIG_COMPAT_BRK is not set
5556
CONFIG_SLAB_FREELIST_RANDOM=y
5657
CONFIG_SLAB_FREELIST_HARDENED=y
57-
CONFIG_PROFILING=y
5858
# CONFIG_ZONE_DMA32 is not set
5959
CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
6060
CONFIG_ARCH_HAS_REFCOUNT_FULL=y

‎arch/arm64/include/asm/cache.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
* cache before the transfer is done, causing old data to be seen by
4949
* the CPU.
5050
*/
51-
#define ARCH_DMA_MINALIGN (128)
51+
#define ARCH_DMA_MINALIGN L1_CACHE_BYTES
5252

5353
#ifdef CONFIG_KASAN_SW_TAGS
5454
#define ARCH_SLAB_MINALIGN (1ULL << KASAN_SHADOW_SCALE_SHIFT)

0 commit comments

Comments
 (0)