summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/boot/dts/qcom/msmcobalt-qrd.dtsi13
-rw-r--r--arch/arm/boot/dts/qcom/msmcobalt-v2.dtsi4
-rw-r--r--arch/arm/boot/dts/qcom/msmcobalt.dtsi19
-rw-r--r--arch/arm/boot/dts/qcom/msmfalcon-regulator.dtsi358
-rw-r--r--arch/arm/boot/dts/qcom/msmfalcon.dtsi2
-rw-r--r--arch/arm/configs/msmcortex_defconfig1
-rw-r--r--arch/arm/configs/msmfalcon_defconfig1
-rw-r--r--arch/arm64/configs/msmcortex-perf_defconfig1
-rw-r--r--arch/arm64/configs/msmcortex_defconfig2
-rw-r--r--arch/arm64/include/asm/arch_gicv3.h4
10 files changed, 397 insertions, 8 deletions
diff --git a/arch/arm/boot/dts/qcom/msmcobalt-qrd.dtsi b/arch/arm/boot/dts/qcom/msmcobalt-qrd.dtsi
index 425a902568ae..e0ae9a8873a7 100644
--- a/arch/arm/boot/dts/qcom/msmcobalt-qrd.dtsi
+++ b/arch/arm/boot/dts/qcom/msmcobalt-qrd.dtsi
@@ -69,3 +69,16 @@
qcom,mdss-dsi-mode-sel-gpio-state = "dual_port";
qcom,panel-supply-entries = <&dsi_panel_pwr_supply>;
};
+
+&soc {
+ sound-tavil {
+ qcom,msm-mbhc-hphl-swh = <1>;
+ /delete-property/ qcom,us-euro-gpios;
+ };
+
+ sound-9335 {
+ qcom,msm-mbhc-hphl-swh = <1>;
+ /delete-property/ qcom,us-euro-gpios;
+ };
+};
+
diff --git a/arch/arm/boot/dts/qcom/msmcobalt-v2.dtsi b/arch/arm/boot/dts/qcom/msmcobalt-v2.dtsi
index 7e1b47ddf17a..48a23b44b5b2 100644
--- a/arch/arm/boot/dts/qcom/msmcobalt-v2.dtsi
+++ b/arch/arm/boot/dts/qcom/msmcobalt-v2.dtsi
@@ -24,6 +24,8 @@
};
&clock_cpu {
+ compatible = "qcom,cpu-clock-osm-msmcobalt-v2";
+ /delete-property/ qcom,llm-sw-overr;
qcom,pwrcl-speedbin0-v0 =
< 300000000 0x0004000f 0x01200020 0x1 >,
< 364800000 0x05040013 0x01200020 0x1 >,
@@ -222,6 +224,7 @@
&apc0_cpr {
compatible = "qcom,cprh-msmcobalt-v2-kbss-regulator";
+ qcom,cpr-corner-switch-delay-time = <1042>;
};
&apc0_pwrcl_vreg {
@@ -367,6 +370,7 @@
&apc1_cpr {
compatible = "qcom,cprh-msmcobalt-v2-kbss-regulator";
+ qcom,cpr-corner-switch-delay-time = <1042>;
};
&apc1_perfcl_vreg {
diff --git a/arch/arm/boot/dts/qcom/msmcobalt.dtsi b/arch/arm/boot/dts/qcom/msmcobalt.dtsi
index 8f4dc00101c5..6da429d72a23 100644
--- a/arch/arm/boot/dts/qcom/msmcobalt.dtsi
+++ b/arch/arm/boot/dts/qcom/msmcobalt.dtsi
@@ -803,14 +803,15 @@
};
clock_cpu: qcom,cpu-clock-cobalt@179c0000 {
- compatible = "qcom,cpu-clock-osm";
+ compatible = "qcom,cpu-clock-osm-msmcobalt-v1";
reg = <0x179c0000 0x4000>,
<0x17916000 0x1000>,
<0x17816000 0x1000>,
<0x179d1000 0x1000>,
- <0x00784130 0x8>;
+ <0x00784130 0x8>,
+ <0x1791101c 0x8>;
reg-names = "osm", "pwrcl_pll", "perfcl_pll",
- "apcs_common", "perfcl_efuse";
+ "apcs_common", "perfcl_efuse", "debug";
vdd-pwrcl-supply = <&apc0_pwrcl_vreg>;
vdd-perfcl-supply = <&apc1_perfcl_vreg>;
@@ -943,10 +944,11 @@
reg = <0x162000 0x4>;
reg-names = "cc_base";
clock-names = "debug_gpu_clk", "debug_gfx_clk",
- "debug_mmss_clk";
+ "debug_mmss_clk", "debug_cpu_clk";
clocks = <&clock_gpu clk_gpucc_gcc_dbg_clk>,
<&clock_gfx clk_gfxcc_dbg_clk>,
- <&clock_mmss clk_mmss_debug_mux>;
+ <&clock_mmss clk_mmss_debug_mux>,
+ <&clock_cpu clk_cpu_debug_mux>;
#clock-cells = <1>;
};
@@ -2583,7 +2585,12 @@
"iface_clk", "noc_axi_clk", "bus_clk", "maxi_clk";
qcom,pas-id = <9>;
- qcom,proxy-timeout-ms = <10000>;
+ qcom,msm-bus,num-cases = <2>;
+ qcom,msm-bus,num-paths = <1>;
+ qcom,msm-bus,vectors-KBps =
+ <63 512 0 0>,
+ <63 512 0 304000>;
+ qcom,proxy-timeout-ms = <100>;
qcom,firmware-name = "venus";
memory-region = <&pil_video_mem>;
status = "ok";
diff --git a/arch/arm/boot/dts/qcom/msmfalcon-regulator.dtsi b/arch/arm/boot/dts/qcom/msmfalcon-regulator.dtsi
new file mode 100644
index 000000000000..2c09774c1391
--- /dev/null
+++ b/arch/arm/boot/dts/qcom/msmfalcon-regulator.dtsi
@@ -0,0 +1,358 @@
+/* Copyright (c) 2016, The Linux Foundation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
+/* Stub regulators */
+
+/ {
+ /* PM660A S1 - VDD_APC0 supply */
+ pm660_s1a: regulator-pm660-s1a {
+ compatible = "qcom,stub-regulator";
+ regulator-name = "pm660_s1a";
+ qcom,hpm-min-load = <100000>;
+ regulator-min-microvolt = <565000>;
+ regulator-max-microvolt = <1170000>;
+ };
+
+ /* PM660A S2 + S3 = VDD_APC1 supply */
+ pm660_s2a: regulator-pm660-s2a {
+ compatible = "qcom,stub-regulator";
+ regulator-name = "pm660_s2a";
+ qcom,hpm-min-load = <100000>;
+ regulator-min-microvolt = <565000>;
+ regulator-max-microvolt = <1170000>;
+ };
+
+ pm660_s4a: regulator-pm660-s4a {
+ compatible = "qcom,stub-regulator";
+ regulator-name = "pm660_s4a";
+ qcom,hpm-min-load = <100000>;
+ regulator-min-microvolt = <1805000>;
+ regulator-max-microvolt = <2040000>;
+ };
+
+ pm660_s5a: regulator-pm660-s5a {
+ compatible = "qcom,stub-regulator";
+ regulator-name = "pm660_s5a";
+ qcom,hpm-min-load = <100000>;
+ regulator-min-microvolt = <1350000>;
+ regulator-max-microvolt = <1350000>;
+ };
+
+ pm660_s6a: regulator-pm660-s6a {
+ compatible = "qcom,stub-regulator";
+ regulator-name = "pm660_s6a";
+ qcom,hpm-min-load = <100000>;
+ regulator-min-microvolt = <504000>;
+ regulator-max-microvolt = <992000>;
+ };
+
+ pm660_s1b: regulator-pm660-s1b {
+ compatible = "qcom,stub-regulator";
+ regulator-name = "pm660_s1b";
+ qcom,hpm-min-load = <100000>;
+ regulator-min-microvolt = <1125000>;
+ regulator-max-microvolt = <1125000>;
+ };
+
+ pm660_s2b: regulator-pm660-s2b {
+ compatible = "qcom,stub-regulator";
+ regulator-name = "pm660_s2b";
+ qcom,hpm-min-load = <100000>;
+ regulator-min-microvolt = <1050000>;
+ regulator-max-microvolt = <1050000>;
+ };
+
+ /* PM660B S3 + S4 - VDD_CX supply */
+ pm660_s3b_level: regulator-pm660-s3b-level {
+ compatible = "qcom,stub-regulator";
+ regulator-name = "pm660_s3b_level";
+ qcom,hpm-min-load = <100000>;
+ regulator-min-microvolt = <RPM_SMD_REGULATOR_LEVEL_RETENTION>;
+ regulator-max-microvolt = <RPM_SMD_REGULATOR_LEVEL_TURBO>;
+ };
+
+ pm660_s3b_floor_level: regulator-pm660-s3b-floor-level {
+ compatible = "qcom,stub-regulator";
+ regulator-name = "pm660_s3b_floor_level";
+ qcom,hpm-min-load = <100000>;
+ regulator-min-microvolt = <RPM_SMD_REGULATOR_LEVEL_RETENTION>;
+ regulator-max-microvolt = <RPM_SMD_REGULATOR_LEVEL_TURBO>;
+ };
+
+ pm660_s3b_level_ao: regulator-pm660-s3b-level-ao {
+ compatible = "qcom,stub-regulator";
+ regulator-name = "pm660_s3b_level_ao";
+ qcom,hpm-min-load = <100000>;
+ regulator-min-microvolt = <RPM_SMD_REGULATOR_LEVEL_RETENTION>;
+ regulator-max-microvolt = <RPM_SMD_REGULATOR_LEVEL_TURBO>;
+ };
+
+ /* PM660B S5 - VDD_MX supply */
+ pm660_s5b_level: regulator-pm660-s5b-level {
+ compatible = "qcom,stub-regulator";
+ regulator-name = "pm660_s5b_level";
+ qcom,hpm-min-load = <100000>;
+ regulator-min-microvolt = <RPM_SMD_REGULATOR_LEVEL_RETENTION>;
+ regulator-max-microvolt = <RPM_SMD_REGULATOR_LEVEL_TURBO>;
+ };
+
+ pm660_s5b_floor_level: regulator-pm660-s5b-floor-level {
+ compatible = "qcom,stub-regulator";
+ regulator-name = "pm660_s5b_floor_level";
+ qcom,hpm-min-load = <100000>;
+ regulator-min-microvolt = <RPM_SMD_REGULATOR_LEVEL_RETENTION>;
+ regulator-max-microvolt = <RPM_SMD_REGULATOR_LEVEL_TURBO>;
+ };
+
+ pm660_s5b_level_ao: regulator-pm660-s5b-level-ao {
+ compatible = "qcom,stub-regulator";
+ regulator-name = "pm660_s5b_level_ao";
+ qcom,hpm-min-load = <100000>;
+ regulator-min-microvolt = <RPM_SMD_REGULATOR_LEVEL_RETENTION>;
+ regulator-max-microvolt = <RPM_SMD_REGULATOR_LEVEL_TURBO>;
+ };
+
+ pm660_l1a: regulator-pm660-l1a {
+ compatible = "qcom,stub-regulator";
+ regulator-name = "pm660_l1a";
+ qcom,hpm-min-load = <10000>;
+ regulator-min-microvolt = <1150000>;
+ regulator-max-microvolt = <1250000>;
+ };
+
+ pm660_l2a: regulator-pm660-l2a {
+ compatible = "qcom,stub-regulator";
+ regulator-name = "pm660_l2a";
+ qcom,hpm-min-load = <10000>;
+ regulator-min-microvolt = <950000>;
+ regulator-max-microvolt = <1010000>;
+ };
+
+ pm660_l3a: regulator-pm660-l3a {
+ compatible = "qcom,stub-regulator";
+ regulator-name = "pm660_l3a";
+ qcom,hpm-min-load = <10000>;
+ regulator-min-microvolt = <950000>;
+ regulator-max-microvolt = <1010000>;
+ };
+
+ /* TODO: remove if ADRASTEA CX/MX not voted from APPS */
+ pm660_l5a: regulator-pm660-l5a {
+ compatible = "qcom,stub-regulator";
+ regulator-name = "pm660_l5a";
+ qcom,hpm-min-load = <10000>;
+ regulator-min-microvolt = <525000>;
+ regulator-max-microvolt = <950000>;
+ };
+
+ pm660_l6a: regulator-pm660-l6a {
+ compatible = "qcom,stub-regulator";
+ regulator-name = "pm660_l6a";
+ qcom,hpm-min-load = <10000>;
+ regulator-min-microvolt = <1200000>;
+ regulator-max-microvolt = <1370000>;
+ };
+
+ pm660_l7a: regulator-pm660-l7a {
+ compatible = "qcom,stub-regulator";
+ regulator-name = "pm660_l7a";
+ qcom,hpm-min-load = <10000>;
+ regulator-min-microvolt = <1200000>;
+ regulator-max-microvolt = <1200000>;
+ };
+
+ pm660_l8a: regulator-pm660-l8a {
+ compatible = "qcom,stub-regulator";
+ regulator-name = "pm660_l8a";
+ qcom,hpm-min-load = <10000>;
+ regulator-min-microvolt = <1750000>;
+ regulator-max-microvolt = <1900000>;
+ };
+
+ pm660_l9a: regulator-pm660-l9a {
+ compatible = "qcom,stub-regulator";
+ regulator-name = "pm660_l9a";
+ qcom,hpm-min-load = <10000>;
+ regulator-min-microvolt = <1750000>;
+ regulator-max-microvolt = <1900000>;
+ };
+
+ pm660_l10a: regulator-pm660-l10a {
+ compatible = "qcom,stub-regulator";
+ regulator-name = "pm660_l10a";
+ qcom,hpm-min-load = <10000>;
+ regulator-min-microvolt = <1780000>;
+ regulator-max-microvolt = <1950000>;
+ };
+
+ pm660_l11a: regulator-pm660-l11a {
+ compatible = "qcom,stub-regulator";
+ regulator-name = "pm660_l11a";
+ qcom,hpm-min-load = <10000>;
+ regulator-min-microvolt = <1780000>;
+ regulator-max-microvolt = <1950000>;
+ };
+
+ pm660_l12a: regulator-pm660-l12a {
+ compatible = "qcom,stub-regulator";
+ regulator-name = "pm660_l12a";
+ qcom,hpm-min-load = <10000>;
+ regulator-min-microvolt = <1780000>;
+ regulator-max-microvolt = <1950000>;
+ };
+
+ pm660_l13a: regulator-pm660-l13a {
+ compatible = "qcom,stub-regulator";
+ regulator-name = "pm660_l13a";
+ qcom,hpm-min-load = <10000>;
+ regulator-min-microvolt = <1750000>;
+ regulator-max-microvolt = <1950000>;
+ };
+
+ pm660_l14a: regulator-pm660-l14a {
+ compatible = "qcom,stub-regulator";
+ regulator-name = "pm660_l14a";
+ qcom,hpm-min-load = <10000>;
+ regulator-min-microvolt = <1710000>;
+ regulator-max-microvolt = <1900000>;
+ };
+
+ pm660_l15a: regulator-pm660-l15a {
+ compatible = "qcom,stub-regulator";
+ regulator-name = "pm660_l15a";
+ qcom,hpm-min-load = <10000>;
+ regulator-min-microvolt = <1650000>;
+ regulator-max-microvolt = <2950000>;
+ };
+
+ pm660_l17a: regulator-pm660-l17a {
+ compatible = "qcom,stub-regulator";
+ regulator-name = "pm660_l17a";
+ qcom,hpm-min-load = <10000>;
+ regulator-min-microvolt = <1650000>;
+ regulator-max-microvolt = <2950000>;
+ };
+
+ pm660_l19a: regulator-pm660-l19a {
+ compatible = "qcom,stub-regulator";
+ regulator-name = "pm660_l19a";
+ qcom,hpm-min-load = <10000>;
+ regulator-min-microvolt = <3200000>;
+ regulator-max-microvolt = <3400000>;
+ };
+
+ pm660_l1b: regulator-pm660-l1b {
+ compatible = "qcom,stub-regulator";
+ regulator-name = "pm660_l1b";
+ qcom,hpm-min-load = <10000>;
+ regulator-min-microvolt = <800000>;
+ regulator-max-microvolt = <925000>;
+ };
+
+ pm660_l2b: regulator-pm660-l2b {
+ compatible = "qcom,stub-regulator";
+ regulator-name = "pm660_l2b";
+ qcom,hpm-min-load = <5000>;
+ regulator-min-microvolt = <350000>;
+ regulator-max-microvolt = <3100000>;
+ };
+
+ pm660_l3b: regulator-pm660-l3b {
+ compatible = "qcom,stub-regulator";
+ regulator-name = "pm660_l3b";
+ qcom,hpm-min-load = <10000>;
+ regulator-min-microvolt = <1710000>;
+ regulator-max-microvolt = <3600000>;
+ };
+
+ pm660_l4b: regulator-pm660-l4b {
+ compatible = "qcom,stub-regulator";
+ regulator-name = "pm660_l4b";
+ qcom,hpm-min-load = <10000>;
+ regulator-min-microvolt = <1700000>;
+ regulator-max-microvolt = <2950000>;
+ };
+
+ pm660_l5b: regulator-pm660-l5b {
+ compatible = "qcom,stub-regulator";
+ regulator-name = "pm660_l5b";
+ qcom,hpm-min-load = <10000>;
+ regulator-min-microvolt = <1721000>;
+ regulator-max-microvolt = <3600000>;
+ };
+
+ pm660_l6b: regulator-pm660-l6b {
+ compatible = "qcom,stub-regulator";
+ regulator-name = "pm660_l6b";
+ qcom,hpm-min-load = <5000>;
+ regulator-min-microvolt = <1700000>;
+ regulator-max-microvolt = <3300000>;
+ };
+
+ pm660_l7b: regulator-pm660-l7b {
+ compatible = "qcom,stub-regulator";
+ regulator-name = "pm660_l7b";
+ qcom,hpm-min-load = <10000>;
+ regulator-min-microvolt = <2700000>;
+ regulator-max-microvolt = <3125000>;
+ };
+
+ pm660_l8b: regulator-pm660-l8b {
+ compatible = "qcom,stub-regulator";
+ regulator-name = "pm660_l8b";
+ qcom,hpm-min-load = <10000>;
+ regulator-min-microvolt = <3200000>;
+ regulator-max-microvolt = <3400000>;
+ };
+
+ /* PM660B L9 = VDD_SSC_CX supply */
+ pm660_l9b_level: regulator-pm660-l9b-level {
+ compatible = "qcom,stub-regulator";
+ regulator-name = "pm660_l9b_level";
+ qcom,hpm-min-load = <10000>;
+ regulator-min-microvolt = <RPM_SMD_REGULATOR_LEVEL_RETENTION>;
+ regulator-max-microvolt = <RPM_SMD_REGULATOR_LEVEL_TURBO>;
+ };
+
+ pm660_l9b_floor_level: regulator-pm660-l9b-floor-level {
+ compatible = "qcom,stub-regulator";
+ regulator-name = "pm660_l9b_floor_level";
+ qcom,hpm-min-load = <10000>;
+ regulator-min-microvolt = <RPM_SMD_REGULATOR_LEVEL_RETENTION>;
+ regulator-max-microvolt = <RPM_SMD_REGULATOR_LEVEL_TURBO>;
+ };
+
+ /* PM660B L10 = VDD_SSC_MX supply */
+ pm660_l10b_level: regulator-pm660-l10b-level {
+ compatible = "qcom,stub-regulator";
+ regulator-name = "pm660_l10b_level";
+ qcom,hpm-min-load = <10000>;
+ regulator-min-microvolt = <RPM_SMD_REGULATOR_LEVEL_RETENTION>;
+ regulator-max-microvolt = <RPM_SMD_REGULATOR_LEVEL_TURBO>;
+ };
+
+ pm660_l10b_floor_level: regulator-pm660-l10b-floor-level {
+ compatible = "qcom,stub-regulator";
+ regulator-name = "pm660_l10b_floor_level";
+ qcom,hpm-min-load = <10000>;
+ regulator-min-microvolt = <RPM_SMD_REGULATOR_LEVEL_RETENTION>;
+ regulator-max-microvolt = <RPM_SMD_REGULATOR_LEVEL_TURBO>;
+ };
+
+ /* GFX Supply */
+ gfx_vreg_corner: regulator-gfx-corner {
+ compatible = "qcom,stub-regulator";
+ regulator-name = "gfx_corner";
+ regulator-min-microvolt = <1>;
+ regulator-max-microvolt = <7>;
+ };
+};
diff --git a/arch/arm/boot/dts/qcom/msmfalcon.dtsi b/arch/arm/boot/dts/qcom/msmfalcon.dtsi
index 44d8e089837c..11700b5b69ba 100644
--- a/arch/arm/boot/dts/qcom/msmfalcon.dtsi
+++ b/arch/arm/boot/dts/qcom/msmfalcon.dtsi
@@ -15,6 +15,7 @@
#include <dt-bindings/clock/qcom,gpu-msmfalcon.h>
#include <dt-bindings/clock/qcom,mmcc-msmfalcon.h>
#include <dt-bindings/interrupt-controller/arm-gic.h>
+#include <dt-bindings/regulator/qcom,rpm-smd-regulator.h>
/ {
model = "Qualcomm Technologies, Inc. MSM FALCON";
@@ -542,3 +543,4 @@
};
#include "msmfalcon-ion.dtsi"
+#include "msmfalcon-regulator.dtsi"
diff --git a/arch/arm/configs/msmcortex_defconfig b/arch/arm/configs/msmcortex_defconfig
index 1e6a1c66ed82..0a20c52bd3b2 100644
--- a/arch/arm/configs/msmcortex_defconfig
+++ b/arch/arm/configs/msmcortex_defconfig
@@ -460,6 +460,7 @@ CONFIG_QCOM_FORCE_WDOG_BITE_ON_PANIC=y
CONFIG_MSM_MPM_OF=y
CONFIG_MSM_EVENT_TIMER=y
CONFIG_MSM_CORE_CTL_HELPER=y
+CONFIG_QCOM_REMOTEQDSS=y
CONFIG_MSM_SERVICE_NOTIFIER=y
CONFIG_MEM_SHARE_QMI_SERVICE=y
CONFIG_QCOM_BIMC_BWMON=y
diff --git a/arch/arm/configs/msmfalcon_defconfig b/arch/arm/configs/msmfalcon_defconfig
index 1e6a1c66ed82..0a20c52bd3b2 100644
--- a/arch/arm/configs/msmfalcon_defconfig
+++ b/arch/arm/configs/msmfalcon_defconfig
@@ -460,6 +460,7 @@ CONFIG_QCOM_FORCE_WDOG_BITE_ON_PANIC=y
CONFIG_MSM_MPM_OF=y
CONFIG_MSM_EVENT_TIMER=y
CONFIG_MSM_CORE_CTL_HELPER=y
+CONFIG_QCOM_REMOTEQDSS=y
CONFIG_MSM_SERVICE_NOTIFIER=y
CONFIG_MEM_SHARE_QMI_SERVICE=y
CONFIG_QCOM_BIMC_BWMON=y
diff --git a/arch/arm64/configs/msmcortex-perf_defconfig b/arch/arm64/configs/msmcortex-perf_defconfig
index 3adda1fc4109..5d76e41d4fed 100644
--- a/arch/arm64/configs/msmcortex-perf_defconfig
+++ b/arch/arm64/configs/msmcortex-perf_defconfig
@@ -380,6 +380,7 @@ CONFIG_MSM_VIDC_V4L2=m
CONFIG_MSM_VIDC_VMEM=m
CONFIG_MSM_VIDC_GOVERNORS=m
CONFIG_MSM_SDE_ROTATOR=y
+CONFIG_MSM_SDE_ROTATOR_EVTLOG_DEBUG=y
CONFIG_QCOM_KGSL=y
CONFIG_FB=y
CONFIG_FB_ARMCLCD=y
diff --git a/arch/arm64/configs/msmcortex_defconfig b/arch/arm64/configs/msmcortex_defconfig
index 686e1c22c5ae..367822dd0a94 100644
--- a/arch/arm64/configs/msmcortex_defconfig
+++ b/arch/arm64/configs/msmcortex_defconfig
@@ -383,6 +383,7 @@ CONFIG_MSM_VIDC_V4L2=m
CONFIG_MSM_VIDC_VMEM=m
CONFIG_MSM_VIDC_GOVERNORS=m
CONFIG_MSM_SDE_ROTATOR=y
+CONFIG_MSM_SDE_ROTATOR_EVTLOG_DEBUG=y
CONFIG_QCOM_KGSL=y
CONFIG_FB=y
CONFIG_FB_VIRTUAL=y
@@ -523,6 +524,7 @@ CONFIG_QCOM_WATCHDOG_V2=y
CONFIG_QCOM_IRQ_HELPER=y
CONFIG_QCOM_MEMORY_DUMP_V2=y
CONFIG_ICNSS=y
+CONFIG_ICNSS_DEBUG=y
CONFIG_MSM_GLADIATOR_ERP_V2=y
CONFIG_PANIC_ON_GLADIATOR_ERROR_V2=y
CONFIG_MSM_GLADIATOR_HANG_DETECT=y
diff --git a/arch/arm64/include/asm/arch_gicv3.h b/arch/arm64/include/asm/arch_gicv3.h
index d925715c822f..30cf6f5961ef 100644
--- a/arch/arm64/include/asm/arch_gicv3.h
+++ b/arch/arm64/include/asm/arch_gicv3.h
@@ -172,8 +172,8 @@ static inline void gic_write_sre(u32 val)
isb();
}
-#define gic_read_typer(c) readq_relaxed(c)
-#define gic_write_irouter(v, c) writeq_relaxed(v, c)
+#define gic_read_typer(c) readq_relaxed_no_log(c)
+#define gic_write_irouter(v, c) writeq_relaxed_no_log(v, c)
#endif /* __ASSEMBLY__ */
#endif /* __ASM_ARCH_GICV3_H */
generated by cgit v1.2.3 (git 2.25.1) at 2026-01-06 01:44:30 +0000