diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2019-03-01 15:08:16 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2019-03-01 15:08:16 +0100 |
| commit | 6089e65618dca3fc0e7ccd7a6315de62ebf893a4 (patch) | |
| tree | 8e6fc60fa52aa0ef66718780dac3aeb6429830d3 | |
| parent | Merge tag 'tee-fix-for-v5.0' of https://git.linaro.org/people/jens.wiklander/linux-tee into arm/fixes (diff) | |
| parent | arm64: dts: qcom: msm8998: Extend TZ reserved memory area (diff) | |
| download | linux-dev-6089e65618dca3fc0e7ccd7a6315de62ebf893a4.tar.xz linux-dev-6089e65618dca3fc0e7ccd7a6315de62ebf893a4.zip | |
Merge tag 'qcom-fixes-for-5.0-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux into arm/fixes
Qualcomm ARM64 Fixes for 5.0-rc8
* Fix TZ memory area size to avoid crashes during boot
* tag 'qcom-fixes-for-5.0-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux:
arm64: dts: qcom: msm8998: Extend TZ reserved memory area
| -rw-r--r-- | arch/arm64/boot/dts/qcom/msm8998.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/boot/dts/qcom/msm8998.dtsi b/arch/arm64/boot/dts/qcom/msm8998.dtsi index 8d41b69ec2da..99bccaac31ad 100644 --- a/arch/arm64/boot/dts/qcom/msm8998.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8998.dtsi @@ -37,7 +37,7 @@ }; memory@86200000 { - reg = <0x0 0x86200000 0x0 0x2600000>; + reg = <0x0 0x86200000 0x0 0x2d00000>; no-map; }; |