Commit cb2cc436 authored by Arnd Bergmann's avatar Arnd Bergmann

Merge tag 'qcom-fixes-for-4.10-rc1' of...

Merge tag 'qcom-fixes-for-4.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux into fixes

Qualcomm ARM64 Fixes for v4.10-rc1

* Fix instability in MSM8996 due to incorrect carveouts

* tag 'qcom-fixes-for-4.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux:
  arm64: dts: msm8996: Add required memory carveouts
parents 84cc8ca1 e9112936
...@@ -64,6 +64,16 @@ smem_mem: smem-mem@86000000 { ...@@ -64,6 +64,16 @@ smem_mem: smem-mem@86000000 {
reg = <0x0 0x86000000 0x0 0x200000>; reg = <0x0 0x86000000 0x0 0x200000>;
no-map; no-map;
}; };
memory@85800000 {
reg = <0x0 0x85800000 0x0 0x800000>;
no-map;
};
memory@86200000 {
reg = <0x0 0x86200000 0x0 0x2600000>;
no-map;
};
}; };
cpus { cpus {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment