diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2017-01-04 16:10:38 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2017-01-04 16:10:38 +0100 |
| commit | cb2cc43681dacbd74f3c1f96fde5ee21524fed54 (patch) | |
| tree | 5f80aa4130165999bb6517707ef1a58809bb2118 /arch/arm64 | |
| parent | 84cc8ca1fd7b966830d2d904e914d7d3a33ef02e (diff) | |
| parent | e9112936f240856c925321fd2bd91adc7c00399c (diff) | |
| download | talos-obmc-linux-cb2cc43681dacbd74f3c1f96fde5ee21524fed54.tar.gz talos-obmc-linux-cb2cc43681dacbd74f3c1f96fde5ee21524fed54.zip | |
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
Diffstat (limited to 'arch/arm64')
| -rw-r--r-- | arch/arm64/boot/dts/qcom/msm8996.dtsi | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi index 9d1d7ad9b075..29ed6b61c737 100644 --- a/arch/arm64/boot/dts/qcom/msm8996.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi @@ -64,6 +64,16 @@ reg = <0x0 0x86000000 0x0 0x200000>; no-map; }; + + memory@85800000 { + reg = <0x0 0x85800000 0x0 0x800000>; + no-map; + }; + + memory@86200000 { + reg = <0x0 0x86200000 0x0 0x2600000>; + no-map; + }; }; cpus { |
