Merge "ARM: dts: msm: add device tree overlay support for sdm450/msm8953" (2bdd043d) · Commits · e / devices / android_kernel_fairphone_FP3

Documentation/devicetree/bindings/arm/msm/msm-machine-name.txt

0 → 100644

+63 −0

Original line number	Diff line number	Diff line
		Msm Machine Name

		Machine name is used to:
		1. show up in the beginning of kernel message.
		Example:
		[ 0.000000] Machine: Qualcomm Technologies, Inc. MSM8953 PMI8950 MTP
		2. show up as arch description when do dump stack.
		Example:
		[ 1.222319] WARNING: CPU: 2 PID: 1 at kernel/lib/debugobjects.c:263 debug_print_object+0xa8/0xb0
		[ 1.222334] Modules linked in:
		[ 1.222362] CPU: 2 PID: 1 Comm: swapper/0 Not tainted 4.9.65+ #71
		[ 1.222376] Hardware name: Qualcomm Technologies, Inc. MSM8953 PMI8950 MTP (DT)
		[ 1.222392] task: ffffffc0ed1b0080 task.stack: ffffffc0ed1b8000
		[ 1.222408] PC is at debug_print_object+0xa8/0xb0
		[ 1.222424] LR is at debug_print_object+0xa8/0xb0

		Msm machine name is a string concatenated from:
		1. constant string contain msm information: "Qualcomm Technologies, Inc.".
		2. string of device tree property "qcom,msm-name".
		3. string of device tree property "qcom,pmic-name".
		4. string of device tree property "model".

		The reason for using msm machine Name is single board overlay device tree
		may applied to multiple soc device trees. The "model" property in soc device
		tree is overwritten with board overlay device tree. So the final string in
		"model" property can only contain Board information. And "qcom,msm-name"
		and "qcom,pmic-name" property is introduced.

		Optional properties:
		- qcom,msm-name: The name string of MSM SoC chip
		- qcom,pmic-name: The name string of MSM Pmic chip

		Required properties:
		- model: in soc device tree
		Contain the soc and pmic information.
		Will be overwritten by model string in board overlay device tree.
		It will be used in bootloader for debug purpose.
		- model: in board overlay device tree
		Contain the board information. It is the final model string that
		kernel can see.

		Note:
		When device tree property qcom,msm-name and qcom,pmic-name exist, it will
		use concatenated msm machine name string for final machine name.
		When device tree property qcom,msm-name and qcom,pmic-name doesn't exist,
		it will use model property string for final machine name.

		Example:
		* In soc device tree:
		/ {
		model = "Qualcomm Technologies, Inc. APQ 8953 + PMI8950 SOC";
		compatible = "qcom,apq8053";
		qcom,pmic-id = <0x010016 0x010011 0x0 0x0>;
		qcom,pmic-name = "PMI8950";
		qcom,msm-id = <293 0x0>;
		qcom,msm-name = "APQ8053";
		};
		* In board overlay device tree:
		/ {
		model = "MTP";
		compatible = "qcom,mtp";
		};

arch/arm/include/asm/system_misc.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@ extern void (*arm_pm_idle)(void);

		extern unsigned int user_debug;
		extern char* (*arch_read_hardware_id)(void);
		const char * __init arch_read_machine_name(void);

		#endif /* !__ASSEMBLY__ */

arch/arm64/boot/dts/qcom/Makefile

+46 −0

Original line number	Diff line number	Diff line
		@@ -203,6 +203,52 @@ dtb-$(CONFIG_ARCH_SDM670) += sdm670-rumi.dtb \
		endif

		ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)
		dtbo-$(CONFIG_ARCH_MSM8953) += msm8953-mtp-overlay.dtbo \
		msm8953-cdp-overlay.dtbo \
		msm8953-rcm-overlay.dtbo \
		msm8953-ipc-overlay.dtbo \
		msm8953-qrd-overlay.dtbo \
		msm8953-iot-mtp-overlay.dtbo \
		msm8953-ext-codec-mtp-overlay.dtbo \
		msm8953-ext-codec-rcm-overlay.dtbo \
		msm8953-cdp-1200p-overlay.dtbo

		dtbo-$(CONFIG_ARCH_SDM450) += msm8953-mtp-overlay.dtbo \
		msm8953-cdp-overlay.dtbo \
		msm8953-rcm-overlay.dtbo \
		msm8953-qrd-overlay.dtbo \
		msm8953-iot-mtp-overlay.dtbo

		msm8953-mtp-overlay.dtbo-base := sdm450.dtb \
		msm8953.dtb \
		apq8053.dtb \
		msm8953-pmi8940.dtb \
		msm8953-pmi8937.dtb \
		sdm450-pmi8940.dtb \
		sdm450-pmi8937.dtb
		msm8953-cdp-overlay.dtbo-base := sdm450.dtb \
		msm8953.dtb \
		apq8053.dtb \
		msm8953-pmi8940.dtb \
		msm8953-pmi8937.dtb
		msm8953-rcm-overlay.dtbo-base := sdm450.dtb \
		msm8953.dtb \
		apq8053.dtb
		msm8953-ipc-overlay.dtbo-base := msm8953.dtb \
		apq8053.dtb
		msm8953-qrd-overlay.dtbo-base := sdm450.dtb \
		msm8953.dtb
		msm8953-iot-mtp-overlay.dtbo-base := sdm450.dtb \
		msm8953.dtb \
		apq8053.dtb
		msm8953-ext-codec-mtp-overlay.dtbo-base := msm8953.dtb \
		apq8053.dtb \
		msm8953-pmi8940.dtb \
		msm8953-pmi8937.dtb
		msm8953-ext-codec-rcm-overlay.dtbo-base := msm8953.dtb \
		apq8053.dtb
		msm8953-cdp-1200p-overlay.dtbo-base := msm8953.dtb

		else
		dtb-$(CONFIG_ARCH_MSM8953) += msm8953-cdp.dtb \
		msm8953-mtp.dtb \

arch/arm64/boot/dts/qcom/apq8053.dts

0 → 100644

+23 −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.
		*/

		/dts-v1/;

		#include "apq8053.dtsi"

		/ {
		model = "Qualcomm Technologies, Inc. APQ8053 + PMI8950 SOC";
		compatible = "qcom,apq8053";
		qcom,pmic-id = <0x010016 0x010011 0x0 0x0>;
		qcom,pmic-name = "PMI8950";
		};

arch/arm64/boot/dts/qcom/apq8053.dtsi

+3 −2

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2015-2017, The Linux Foundation. All rights reserved.
		* Copyright (c) 2015-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
		@@ -12,9 +12,10 @@
		*/
		#include "msm8953.dtsi"
		/ {
		model = "Qualcomm Technologies, Inc. APQ 8953";
		model = "Qualcomm Technologies, Inc. APQ8053";
		compatible = "qcom,apq8053";
		qcom,msm-id = <304 0x0>;
		qcom,msm-name = "APQ8053";
		};

		&secure_mem {