Merge "ARM: dts: msm: Reduce WCNSS carveout to 5MB for msm8909 512MB devices" (15dafae6) · Commits · e / devices / android_kernel_sony_msm8994

arch/arm/boot/dts/qcom/msm8909-512mb-mtp-smb1360.dts

+2 −1

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2014, The Linux Foundation. All rights reserved.
		* Copyright (c) 2014-2015, 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
		@@ -17,6 +17,7 @@
		#include "msm8909-camera-sensor-cdp.dtsi"
		#include "msm8909-pm8909.dtsi"
		#include "msm8909-pm8909-mtp.dtsi"
		#include "msm8909-memory.dtsi"

		/ {
		model = "Qualcomm Technologies, Inc. MSM8909-PM8909 SMB1360 512MB MTP";

+2 −1

Original line number	Diff line number	Diff line
		/* Copyright (c) 2014, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2014-2015, 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
		@@ -15,6 +15,7 @@
		#include "msm8909-cdp.dtsi"
		#include "msm8909-pm8909.dtsi"
		#include "msm8909-pm8909-cdp.dtsi"
		#include "msm8909-memory.dtsi"

		/ {
		model = "Qualcomm Technologies, Inc. MSM8909-PM8909 CDP";

0 → 100644

+27 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2014-2015, 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.
		*/

		#include "skeleton64.dtsi"

		/{
		memory {
		peripheral_mem {
		linux,reserve-contiguous-region;
		linux,reserve-region;
		linux,remove-completely;
		reg = <0x0 0x8d500000 0x0 0x0500000>;
		label = "peripheral_mem";
		};
		};
		};

+3 −1

Original line number	Diff line number	Diff line
		/* Copyright (c) 2014, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2014-2015, 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
		@@ -15,6 +15,8 @@
		#include "msm8909-mtp.dtsi"
		#include "msm8909-pm8909.dtsi"
		#include "msm8909-pm8909-mtp.dtsi"
		#include "msm8909-memory.dtsi"

		/ {
		model = "Qualcomm Technologies, Inc. MSM8909-PM8909 MTP";
		compatible = "qcom,msm8909-mtp", "qcom,msm8909", "qcom,mtp";

+1 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@
		#include "msm8909-cdp.dtsi"
		#include "msm8909-pm8916-cdp.dtsi"
		#include "msm8909-gpu-qhd.dtsi"
		#include "msm8909-memory.dtsi"

		/ {
		model = "Qualcomm Technologies, Inc. MSM8909-PM8916 512MB QHD RCM";