Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1e625ec1 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: update to memory map v2 for sdx24 on 512MB variant"

parents c030c6a2 95468291

arch/arm/boot/dts/qcom/sdxpoorwills-cdp-256.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
 */



#include "sdxpoorwills-cdp.dtsi"

#include "sdxpoorwills-memory-256.dtsi"



&soc {

	vreg_sd_mmc: vreg_sd_mmc {

arch/arm/boot/dts/qcom/sdxpoorwills-memory-256.dtsi

0 → 100644
+19 −0
Original line number Diff line number Diff line 
/* Copyright (c) 2018, 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.

 */



&peripheral2_mem {

	reg = <0x8fe00000 0x200000>;

};



&mss_mem {

	reg = <0x87000000 0x8300000>;

};

arch/arm/boot/dts/qcom/sdxpoorwills-mtp-256.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
 */



#include "sdxpoorwills-mtp.dtsi"

#include "sdxpoorwills-memory-256.dtsi"



&soc {

	vreg_sd_mmc: vreg_sd_mmc {

arch/arm/boot/dts/qcom/sdxpoorwills.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 
		peripheral2_mem: peripheral2_region@8fe00000 {

			compatible = "removed-dma-pool";

			no-map;

			reg = <0x8fe00000 0x200000>;

			reg = <0x8fe00000 0xe00000>;

			label = "peripheral2_mem";

		};
@@ -65,7 +65,7 @@ 
		mss_mem: mss_region@87400000 {

			compatible = "removed-dma-pool";

			no-map;

			reg = <0x87400000 0x8300000>;

			reg = <0x87000000 0x8700000>;

			label = "mss_mem";

		};