Merge "ARM: dts: msm: Refactor IOT memory map configuration for apq8053" (b56dcb8e) · Commits · e / devices / android_kernel_xiaomi_markw

arch/arm/boot/dts/qcom/apq8053-iot-memory.dtsi

0 → 100644

+25 −0

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

			&modem_mem {
			reg = <0x0 0x86c00000 0x0 0x1e00000>;
			};

			&adsp_fw_mem {
			reg = <0x0 0x88a00000 0x0 0x1100000>;
			};

			&wcnss_fw_mem {
			reg = <0x0 0x89b00000 0x0 0x700000>;
			};

+1 −12

Original line number	Original line	Diff line number	Diff line
	@@ -15,6 +15,7 @@

	#include "apq8053.dtsi"		#include "apq8053.dtsi"
	#include "msm-pmi8950.dtsi"		#include "msm-pmi8950.dtsi"
			#include "apq8053-iot-memory.dtsi"
	#include "msm8953-mtp.dtsi"		#include "msm8953-mtp.dtsi"
	#include "msm8953-pmi8950.dtsi"		#include "msm8953-pmi8950.dtsi"
	#include "msm8953-camera-sensor-mtp.dtsi"		#include "msm8953-camera-sensor-mtp.dtsi"
	@@ -148,18 +149,6 @@
	status = "okay";		status = "okay";
	};		};

	&modem_mem {
	reg = <0x0 0x86c00000 0x0 0x1e00000>;
	};

	&adsp_fw_mem {
	reg = <0x0 0x88a00000 0x0 0x1100000>;
	};

	&wcnss_fw_mem {
	reg = <0x0 0x89b00000 0x0 0x700000>;
	};

	&gpio_key_suspend {		&gpio_key_suspend {
	config {		config {
	/delete-property/ bias-pull-up;		/delete-property/ bias-pull-up;

+1 −0