Merge "ARM: dts: msm: Add support for SA8155 V2 ADP AIR" (76b4d54a) · Commits · e / devices / android_kernel_xiaomi_sm6125

Documentation/devicetree/bindings/arm/msm/msm.txt

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -175,6 +175,9 @@ compatible = "qcom,qcs403-iot"
	compatible = "qcom,sa8155-adp-star"		compatible = "qcom,sa8155-adp-star"
	compatible = "qcom,sa8155p-adp-star"		compatible = "qcom,sa8155p-adp-star"
	compatible = "qcom,adp-star"		compatible = "qcom,adp-star"
			compatible = "qcom,sa8155-v2-adp-air"
			compatible = "qcom,sa8155p-v2-adp-air"
			compatible = "qcom,adp-air"
	compatible = "qcom,sdxprairie-rumi"		compatible = "qcom,sdxprairie-rumi"
	compatible = "qcom,sdxprairie-mtp"		compatible = "qcom,sdxprairie-mtp"
	compatible = "qcom,sdxprairie-cdp"		compatible = "qcom,sdxprairie-cdp"

arch/arm64/boot/dts/qcom/Makefile

+10 −4

Original line number	Original line	Diff line number	Diff line
	@@ -33,6 +33,8 @@ ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)
	sm8150-qrd-dvt-overlay.dtbo \		sm8150-qrd-dvt-overlay.dtbo \
	sa8155-adp-star-overlay.dtbo \		sa8155-adp-star-overlay.dtbo \
	sa8155p-adp-star-overlay.dtbo \		sa8155p-adp-star-overlay.dtbo \
			sa8155-adp-air-overlay.dtbo \
			sa8155p-adp-air-overlay.dtbo \
	sm8150-sdx50m-cdp-overlay.dtbo \		sm8150-sdx50m-cdp-overlay.dtbo \
	sm8150-sdx50m-mtp-overlay.dtbo \		sm8150-sdx50m-mtp-overlay.dtbo \
	sm8150-sdx50m-mtp-2.5k-panel-overlay.dtbo \		sm8150-sdx50m-mtp-2.5k-panel-overlay.dtbo \
	@@ -45,6 +47,8 @@ sm8150-qrd-overlay.dtbo-base := sm8150.dtb sm8150-v2.dtb sm8150p.dtb sm8150p-v2.
	sm8150-qrd-dvt-overlay.dtbo-base := sm8150-v2.dtb sm8150p-v2.dtb		sm8150-qrd-dvt-overlay.dtbo-base := sm8150-v2.dtb sm8150p-v2.dtb
	sa8155-adp-star-overlay.dtbo-base := sa8155.dtb sa8155-v2.dtb		sa8155-adp-star-overlay.dtbo-base := sa8155.dtb sa8155-v2.dtb
	sa8155p-adp-star-overlay.dtbo-base := sa8155p.dtb sa8155p-v2.dtb		sa8155p-adp-star-overlay.dtbo-base := sa8155p.dtb sa8155p-v2.dtb
			sa8155-adp-air-overlay.dtbo-base := sa8155.dtb sa8155-v2.dtb
			sa8155p-adp-air-overlay.dtbo-base := sa8155p.dtb sa8155p-v2.dtb
	sm8150-sdx50m-cdp-overlay.dtbo-base := sm8150.dtb sm8150-v2.dtb sm8150p.dtb sm8150p-v2.dtb		sm8150-sdx50m-cdp-overlay.dtbo-base := sm8150.dtb sm8150-v2.dtb sm8150p.dtb sm8150p-v2.dtb
	sm8150-sdx50m-mtp-overlay.dtbo-base := sm8150.dtb sm8150-v2.dtb sm8150p.dtb sm8150p-v2.dtb		sm8150-sdx50m-mtp-overlay.dtbo-base := sm8150.dtb sm8150-v2.dtb sm8150p.dtb sm8150p-v2.dtb
	sm8150-sdx50m-mtp-2.5k-panel-overlay.dtbo-base := sm8150.dtb sm8150-v2.dtb sm8150p.dtb sm8150p-v2.dtb		sm8150-sdx50m-mtp-2.5k-panel-overlay.dtbo-base := sm8150.dtb sm8150-v2.dtb sm8150p.dtb sm8150p-v2.dtb
	@@ -58,6 +62,8 @@ dtb-$(CONFIG_ARCH_SM8150) += sm8150-rumi.dtb \
	sa8155p-adp-star.dtb \		sa8155p-adp-star.dtb \
	sa8155-v2-adp-star.dtb \		sa8155-v2-adp-star.dtb \
	sa8155p-v2-adp-star.dtb \		sa8155p-v2-adp-star.dtb \
			sa8155-v2-adp-air.dtb \
			sa8155p-v2-adp-air.dtb \
	sm8150-v2-rumi.dtb \		sm8150-v2-rumi.dtb \
	sm8150-v2-mtp.dtb \		sm8150-v2-mtp.dtb \
	sm8150-v2-cdp.dtb \		sm8150-v2-cdp.dtb \

arch/arm64/boot/dts/qcom/sa8155-v2-adp-air-overlay.dts

0 → 100644

+23 −0

Original line number	Original line	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/;
			/plugin/;

			#include "sa8155-adp-star.dtsi"

			/ {
			model = "ADP-AIR";
			compatible = "qcom,sa8155-v2-adp-air", "qcom,sa8155",
			"qcom,adp-air";
			qcom,board-id = <0X01000019 0>;
			};

arch/arm64/boot/dts/qcom/sa8155-v2-adp-air.dts

0 → 100644

+22 −0

Original line number	Original line	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 "sa8155-v2.dtsi"
			#include "sa8155-adp-star.dtsi"

			/ {
			model = "Qualcomm Technologies, Inc. SA8155 V2 ADP AIR";
			compatible = "qcom,sa8155-v2-adp-air", "qcom,sa8155", "qcom,adp-air";
			qcom,board-id = <0x01000019 0>;
			};

arch/arm64/boot/dts/qcom/sa8155p-v2-adp-air-overlay.dts

0 → 100644

+23 −0

Original line number	Original line	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/;
			/plugin/;

			#include "sa8155-adp-star.dtsi"

			/ {
			model = "ADP-AIR";
			compatible = "qcom,sa8155p-v2-adp-air", "qcom,sa8155p",
			"qcom,adp-air";
			qcom,board-id = <0x01000019 0>;
			};