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

Commit 5b414ce5 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: Memory map changes for APQ8009"

parents 0c4cacce e33bf9bb
Loading
Loading
Loading
Loading
+1 −8
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 "apq8009-memory.dtsi"

/ {
	model = "Qualcomm Technologies, Inc. APQ8009 WCD9326 512MB Ref Board";
@@ -52,14 +53,6 @@
	};
};

&modem_adsp_mem {
	reg = <0x0 0x88000000 0x0 0x1e00000>;
};

&peripheral_mem {
	reg = <0x0 0x89e00000 0x0 0x0500000>;
};

&i2c_4 {
	smb1360_otg_supply: smb1360-chg-fg@14 {
		compatible = "qcom,smb1360-chg-fg";
+24 −0
Original line number Diff line number Diff line
/*
 * Copyright (c) 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 0x01e00000>;
};

&peripheral_mem {
	reg = <0x0 0x89e00000 0x0 0x0700000>;
};
+1 −8
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 "apq8009-memory.dtsi"

/ {
	model = "Qualcomm Technologies, Inc. APQ8009 WCD9326 Reference Board";
@@ -52,14 +53,6 @@
	};
};

&modem_adsp_mem {
	reg = <0x0 0x88000000 0x0 0x1e00000>;
};

&peripheral_mem {
	reg = <0x0 0x89e00000 0x0 0x0500000>;
};

&i2c_4 {
	smb1360_otg_supply: smb1360-chg-fg@14 {
		compatible = "qcom,smb1360-chg-fg";
+1 −9
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@
#include "msm8909-pm8916.dtsi"
#include "msm8909-pm8916-mtp.dtsi"
#include "apq8009-audio-external_codec.dtsi"
#include "apq8009w-memory.dtsi"
#include "apq8009-memory.dtsi"

/ {
	model = "Qualcomm Technologies, Inc. APQ8009 WCD9326 MTP";
@@ -25,11 +25,3 @@
	qcom,msm-id = <265 0>;
	qcom,board-id= <8 0x105>;
};

&modem_adsp_mem {
	reg = <0x0 0x88000000 0x0 0x1e00000>;
};

&peripheral_mem {
	reg = <0x0 0x89e00000 0x0 0x0500000>;
};