Merge "ARM: dts: msm: Add no-pmi632 support for sdm450 and msm8953" into kernel.lnx.4.9.r27-rel (5d3c6ba4) · Commits · e / devices / android_kernel_fairphone_FP3

arch/arm64/boot/dts/qcom/Makefile

+3 −1

Original line number	Diff line number	Diff line
		@@ -464,6 +464,7 @@ 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

		sdm450-cdp-s2-overlay.dtbo-base := sdm450-pmi632.dtb \
		sdm632.dtb \
		sdm632-pm8004.dtb \
		@@ -543,7 +544,8 @@ 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
		apq8053-batcam.dtb \
		msm8953-no-pmi.dtb

		dtb-$(CONFIG_ARCH_MSM8937) += msm8937-pmi8950-mtp.dtb \
		msm8937-interposer-sdm439-cdp.dtb \

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

+1 −2

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2015-2018, The Linux Foundation. All rights reserved.
		* Copyright (c) 2015-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
		@@ -159,7 +159,6 @@
		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

+6 −1

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2015-2018, The Linux Foundation. All rights reserved.
		* Copyright (c) 2015-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
		@@ -49,3 +49,8 @@
		qcom,chg-led-sw-controls;
		qcom,chg-led-support;
		};
		&cci {
		qcom,camera@0 {
		qcom,led-flash-src = <&led_flash0>;
		};
		};

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

0 → 100644

+23 −0

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.dts

0 → 100644

+68 −0

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 "sdm450.dtsi"
		#include "msm8953-mtp.dtsi"
		/ {
		model = "Qualcomm Technologies, Inc. SDM450 + NO PMI MTP S3";
		compatible = "qcom,sdm450-mtp", "qcom,sdm450", "qcom,mtp";
		qcom,pmic-id = <0x010016 0x0 0x0 0x0>;
		};

		&eeprom0 {
		cam_vdig-supply = <&pm8953_l23>;
		};

		&camera0 {
		cam_vdig-supply = <&pm8953_l23>;
		};

		&pm8953_gpios {
		bklt_en {
		bklt_en_default: bklt_en_default {
		pins = "gpio4";
		function = "normal";
		power-source = <0>;
		output-high;
		};
		};
		};

		&pm8953_pwm {
		status = "ok";
		};

		&mdss_dsi0 {
		qcom,dsi-pref-prim-pan = <&dsi_hx8399c_truly_vid>;
		pinctrl-names = "mdss_default", "mdss_sleep";
		pinctrl-0 = <&mdss_dsi_active &mdss_te_active &bklt_en_default>;
		pinctrl-1 = <&mdss_dsi_suspend &mdss_te_suspend>;
		qcom,platform-bklight-en-gpio = <&pm8953_gpios 4 0>;

		};

		&dsi_truly_1080_vid {
		qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_pwm";
		qcom,mdss-dsi-bl-pmic-pwm-frequency = <100>;
		qcom,mdss-dsi-bl-pmic-bank-select = <0>;
		qcom,mdss-dsi-pwm-gpio = <&pm8953_gpios 8 0>;
		};

		&dsi_hx8399c_truly_vid {
		qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_pwm";
		qcom,mdss-dsi-bl-pmic-pwm-frequency = <100>;
		qcom,mdss-dsi-bl-pmic-bank-select = <0>;
		qcom,mdss-dsi-pwm-gpio = <&pm8953_gpios 8 0>;
		};