Merge "Revert "ARM: dts: msm: Add no-pmi632 support for sdm450 and msm8953"" (df0e580d) · Commits · e / devices / android_kernel_fairphone_FP3

arch/arm64/boot/dts/qcom/Makefile

+4 −14

Original line number	Diff line number	Diff line
		@@ -364,8 +364,7 @@ dtbo-$(CONFIG_ARCH_MSM8953) += msm8953-mtp-overlay.dtbo \
		msm8953-iot-mtp-overlay.dtbo \
		msm8953-ext-codec-mtp-overlay.dtbo \
		msm8953-ext-codec-rcm-overlay.dtbo \
		msm8953-cdp-1200p-overlay.dtbo \
		msm8953-no-pmi-overlay.dtbo
		msm8953-cdp-1200p-overlay.dtbo

		dtbo-$(CONFIG_ARCH_SDM450) += msm8953-mtp-overlay.dtbo \
		msm8953-cdp-overlay.dtbo \
		@@ -374,8 +373,7 @@ dtbo-$(CONFIG_ARCH_SDM450) += msm8953-mtp-overlay.dtbo \
		msm8953-iot-mtp-overlay.dtbo \
		sdm450-cdp-s2-overlay.dtbo \
		sdm450-mtp-s3-overlay.dtbo \
		sdm450-qrd-sku4-overlay.dtbo\
		sdm450-no-pmi-mtp-overlay.dtbo
		sdm450-qrd-sku4-overlay.dtbo

		dtbo-$(CONFIG_ARCH_SDM632) += sdm632-rumi-overlay.dtbo \
		sdm450-cdp-s2-overlay.dtbo \
		@@ -475,9 +473,6 @@ msm8953-ext-codec-mtp-overlay.dtbo-base := msm8953.dtb \
		msm8953-ext-codec-rcm-overlay.dtbo-base := msm8953.dtb \
		apq8053.dtb
		msm8953-cdp-1200p-overlay.dtbo-base := msm8953.dtb

		msm8953-no-pmi-overlay.dtbo-base := msm8953-no-pmi.dtb

		sdm450-cdp-s2-overlay.dtbo-base := sdm450-pmi632.dtb \
		sdm632.dtb \
		sdm632-pm8004.dtb \
		@@ -490,9 +485,6 @@ sdm450-mtp-s3-overlay.dtbo-base := sdm450-pmi632.dtb \
		sdm450-qrd-sku4-overlay.dtbo-base := sdm450-pmi632.dtb \
		sdm632.dtb \
		sdm632-pm8004.dtb

		sdm450-no-pmi-mtp-overlay.dtbo-base := sdm450-no-pmi.dtb

		sdm632-rumi-overlay.dtbo-base := sdm632.dtb
		sdm632-ext-codec-cdp-s3-overlay.dtbo-base := sdm632.dtb \
		sdm632-pm8004.dtb
		@@ -563,8 +555,7 @@ dtb-$(CONFIG_ARCH_MSM8953) += msm8953-cdp.dtb \
		msm8953-pmi8940-ext-codec-mtp.dtb \
		msm8953-pmi8937-ext-codec-mtp.dtb \
		msm8953-pmi632-cdp-s2.dtb \
		apq8053-batcam.dtb \
		msm8953-no-pmi.dtb
		apq8053-batcam.dtb

		dtb-$(CONFIG_ARCH_MSM8937) += msm8937-pmi8950-mtp.dtb \
		msm8937-interposer-sdm439-cdp.dtb \
		@@ -628,8 +619,7 @@ dtb-$(CONFIG_ARCH_SDM450) += sdm450-rcm.dtb \
		sdm450-pmi632-cdp-s2.dtb \
		sdm450-pmi632-mtp-s3.dtb \
		sda450-pmi632-cdp-s2.dtb \
		sda450-pmi632-mtp-s3.dtb \
		sdm450-no-pmi-mtp.dtb
		sda450-pmi632-mtp-s3.dtb

		dtb-$(CONFIG_ARCH_SDM632) += sdm632-rumi.dtb \
		sdm632-cdp-s2.dtb \

arch/arm64/boot/dts/qcom/msm8953-camera-sensor-mtp.dtsi

+1 −0

Original line number	Diff line number	Diff line
		@@ -159,6 +159,7 @@
		qcom,csiphy-sd-index = <0>;
		qcom,csid-sd-index = <0>;
		qcom,mount-angle = <270>;
		qcom,led-flash-src = <&led_flash0>;
		qcom,eeprom-src = <&eeprom0>;
		qcom,actuator-src = <&actuator0>;
		cam_vio-supply = <&pm8953_l6>;

arch/arm64/boot/dts/qcom/msm8953-mtp.dts

+0 −5

Original line number	Diff line number	Diff line
		@@ -50,8 +50,3 @@
		qcom,chg-led-support;
		qcom,usbin-vadc = <&pmi8950_vadc>;
		};
		&cci {
		qcom,camera@0 {
		qcom,led-flash-src = <&led_flash0>;
		};
		};

arch/arm64/boot/dts/qcom/msm8953-no-pmi.dts

deleted100644 → 0

+0 −23

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2019, 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 "msm8953.dtsi"
		#include "msm8953-mtp.dtsi"

		/ {
		model = "Qualcomm Technologies, Inc. msm8953 + NO PMI SOC";
		compatible = "qcom,msm8953";
		qcom,pmic-id = <0x010016 0x0 0x0 0x0>;
		};

arch/arm64/boot/dts/qcom/sdm450-no-pmi-mtp-overlay.dts

deleted100644 → 0

+0 −21

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

		/ {
		model = " SDM450 NOPMI MTP";
		qcom,board-id = <8 3>;
		};