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

Commit 3fece6fe 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: Extract out apq8009w and msm8909w memory map"

parents 19c935b4 a9ced49c

arch/arm/boot/dts/qcom/apq8009-mtp-wcd9326.dts

+1 −12
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include "msm8909-pm8916.dtsi"

#include "msm8909-pm8916-mtp.dtsi"

#include "apq8009-audio-external_codec.dtsi"

#include "apq8009w-memory.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. APQ8009 WCD9326 MTP";
@@ -24,15 +25,3 @@ 
	qcom,msm-id = <265 0>;

	qcom,board-id= <8 0x105>;

};
 


&external_image_mem {

	reg = <0x0 0x87a00000 0x0 0x0600000>;

};



&modem_adsp_mem {

	reg = <0x0 0x88000000 0x0 0x02c00000>;

};



&peripheral_mem {

	reg = <0x0 0x8ac00000 0x0 0x0500000>;

};

arch/arm/boot/dts/qcom/apq8009w-cdp.dts

+1 −12
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include "msm8909w-gpu.dtsi"

#include "msm8909-pm8916-cdp.dtsi"

#include "msm8909w.dtsi"

#include "apq8009w-memory.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. APQ8009W-PM8916 CDP";
@@ -26,18 +27,6 @@ 
	qcom,board-id= <1 0x103>;

};



&external_image_mem {

	reg = <0x0 0x87a00000 0x0 0x0600000>;

};



&modem_adsp_mem {

	reg = <0x0 0x88000000 0x0 0x02c00000>;

};



&peripheral_mem {

	reg = <0x0 0x8ac00000 0x0 0x0500000>;

};



&mdss_dsi0 {

	qcom,dsi-pref-prim-pan = <&dsi_hx8394d_480_vid>;

};

arch/arm/boot/dts/qcom/apq8009w-memory.dtsi

0 → 100644
+24 −0
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2015-2016, 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.

 */



&external_image_mem {

	reg = <0x0 0x87a00000 0x0 0x0600000>;

};



&modem_adsp_mem {

	reg = <0x0 0x88000000 0x0 0x02c00000>;

};



&peripheral_mem {

	reg = <0x0 0x8ac00000 0x0 0x0500000>;

};

arch/arm/boot/dts/qcom/apq8009w-swoctp.dtsi

+1 −12
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include "msm8909-pm8916.dtsi"

#include "msm8909-pm8916-mtp.dtsi"

#include "msm8909w.dtsi"

#include "msm8909w-memory.dtsi"



&soc {

	i2c@78b9000 { /* BLSP1 QUP5 */
@@ -50,18 +51,6 @@ 
	};

};



&external_image_mem {

	reg = <0x0 0x87a00000 0x0 0x0600000>;

};



&modem_adsp_mem {

	reg = <0x0 0x88000000 0x0 0x05200000>;

};



&peripheral_mem {

	reg = <0x0 0x8d200000 0x0 0x0500000>;

};



&blsp1_uart1 {

	status = "ok";

	pinctrl-names = "default";

arch/arm/boot/dts/qcom/apq8009w-wtp.dts

+1 −12
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include "msm8909-pm8916.dtsi"

#include "msm8909-pm8916-mtp.dtsi"

#include "msm8909w.dtsi"

#include "apq8009w-memory.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. APQ8009W-PM8916 MTP";
@@ -27,18 +28,6 @@ 
	qcom,board-id= <8 0x105>;

};



&external_image_mem {

	reg = <0x0 0x87a00000 0x0 0x0600000>;

};



&modem_adsp_mem {

	reg = <0x0 0x88000000 0x0 0x02c00000>;

};



&peripheral_mem {

	reg = <0x0 0x8ac00000 0x0 0x0500000>;

};



&soc {

	i2c@78b9000 { /* BLSP1 QUP5 */

		synaptics@20 {