Skip to content

Commit 69876bc

Browse files
konradybcioandersson
authored andcommitted
arm64: dts: qcom: msm8992-libra: Fix the memory map
The memory map was wrong. Fix it to prevent the device from randomly rebooting. Fixes: 0f5cdb3 ("arm64: dts: qcom: Add Xiaomi Libra (Mi 4C) device tree") Signed-off-by: Konrad Dybcio <[email protected]> Signed-off-by: Bjorn Andersson <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 2bd5ab9 commit 69876bc

File tree

1 file changed

+60
-17
lines changed

1 file changed

+60
-17
lines changed

arch/arm64/boot/dts/qcom/msm8992-xiaomi-libra.dts

Lines changed: 60 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,12 @@
1111
#include <dt-bindings/gpio/gpio.h>
1212
#include <dt-bindings/input/gpio-keys.h>
1313

14+
/delete-node/ &adsp_mem;
15+
/delete-node/ &audio_mem;
16+
/delete-node/ &mpss_mem;
17+
/delete-node/ &peripheral_region;
18+
/delete-node/ &rmtfs_mem;
19+
1420
/ {
1521
model = "Xiaomi Mi 4C";
1622
compatible = "xiaomi,libra", "qcom,msm8992";
@@ -70,25 +76,67 @@
7076
#size-cells = <2>;
7177
ranges;
7278

73-
/* This is for getting crash logs using Android downstream kernels */
74-
ramoops@dfc00000 {
75-
compatible = "ramoops";
76-
reg = <0x0 0xdfc00000 0x0 0x40000>;
77-
console-size = <0x10000>;
78-
record-size = <0x10000>;
79-
ftrace-size = <0x10000>;
80-
pmsg-size = <0x20000>;
79+
memory_hole: hole@6400000 {
80+
reg = <0 0x06400000 0 0x600000>;
81+
no-map;
82+
};
83+
84+
memory_hole2: hole2@6c00000 {
85+
reg = <0 0x06c00000 0 0x2400000>;
86+
no-map;
87+
};
88+
89+
mpss_mem: mpss@9000000 {
90+
reg = <0 0x09000000 0 0x5a00000>;
91+
no-map;
92+
};
93+
94+
tzapp: tzapp@ea00000 {
95+
reg = <0 0x0ea00000 0 0x1900000>;
96+
no-map;
97+
};
98+
99+
mdm_rfsa_mem: mdm-rfsa@ca0b0000 {
100+
reg = <0 0xca0b0000 0 0x10000>;
101+
no-map;
102+
};
103+
104+
rmtfs_mem: rmtfs@ca100000 {
105+
compatible = "qcom,rmtfs-mem";
106+
reg = <0 0xca100000 0 0x180000>;
107+
no-map;
108+
109+
qcom,client-id = <1>;
81110
};
82111

83-
modem_region: modem_region@9000000 {
84-
reg = <0x0 0x9000000 0x0 0x5a00000>;
112+
audio_mem: audio@cb400000 {
113+
reg = <0 0xcb000000 0 0x400000>;
114+
no-mem;
115+
};
116+
117+
qseecom_mem: qseecom@cb400000 {
118+
reg = <0 0xcb400000 0 0x1c00000>;
119+
no-mem;
120+
};
121+
122+
adsp_rfsa_mem: adsp-rfsa@cd000000 {
123+
reg = <0 0xcd000000 0 0x10000>;
85124
no-map;
86125
};
87126

88-
tzapp: modem_region@ea00000 {
89-
reg = <0x0 0xea00000 0x0 0x1900000>;
127+
sensor_rfsa_mem: sensor-rfsa@cd010000 {
128+
reg = <0 0xcd010000 0 0x10000>;
90129
no-map;
91130
};
131+
132+
ramoops@dfc00000 {
133+
compatible = "ramoops";
134+
reg = <0 0xdfc00000 0 0x40000>;
135+
console-size = <0x10000>;
136+
record-size = <0x10000>;
137+
ftrace-size = <0x10000>;
138+
pmsg-size = <0x20000>;
139+
};
92140
};
93141
};
94142

@@ -130,11 +178,6 @@
130178
status = "okay";
131179
};
132180

133-
&peripheral_region {
134-
reg = <0x0 0x7400000 0x0 0x1c00000>;
135-
no-map;
136-
};
137-
138181
&pm8994_spmi_regulators {
139182
VDD_APC0: s8 {
140183
regulator-min-microvolt = <680000>;

0 commit comments

Comments
 (0)