Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 004a90d2 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: add DTBO support for MSM ADP LITE board"

parents 1a60823a 2a865869
Loading
Loading
Loading
Loading
+7 −1
Original line number Diff line number Diff line
ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)
dtbo-$(CONFIG_ARCH_MSM8996) += \
	msm8996-mtp-overlay.dtbo \
	apq8096pro-v1.1-auto-adp-overlay.dtbo
	apq8096pro-v1.1-auto-adp-overlay.dtbo \
	apq8096pro-v1.1-auto-adp-lite-overlay.dtbo \
	msm8996pro-auto-adp-overlay.dtbo \
	msm8996pro-auto-adp-lite-overlay.dtbo

msm8996-mtp-overlay.dtbo-base :=  msm8996pro-v1.1-pmi8996.dtb \
				msm8996-v3-pmi8996.dtb \
				msm8996pro-v1.1-pmi8994.dtb
apq8096pro-v1.1-auto-adp-overlay.dtbo-base := apq8096pro-v1.1-auto.dtb
apq8096pro-v1.1-auto-adp-lite-overlay.dtbo-base := apq8096pro-v1.1-auto.dtb
msm8996pro-auto-adp-overlay.dtbo-base := msm8996pro-auto.dtb
msm8996pro-auto-adp-lite-overlay.dtbo-base := msm8996pro-auto.dtb
else
dtb-$(CONFIG_ARCH_MSM8996) += msm8996-v2-pmi8994-cdp.dtb \
	msm8996-v2-pmi8994-mtp.dtb \
+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/;
/plugin/;

#include "apq8096pro-v1.1-auto-adp-lite.dtsi"

/ {
	model = "Qualcomm Technologies, Inc. APQ 8096pro V1.1 AUTO ADP LITE";
	compatible = "qcom,apq8096-adp", "qcom,msm8996", "qcom,adp";
	qcom,msm-id = <316 0x10001>;
	qcom,board-id = <0x03010019 0>;
};
+95 −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.
 */

#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/clock/msm-clocks-8996.h>
#include "msm8996-pm8994.dtsi"
#include "msm8996-agave-adp.dtsi"

&spi_9 {
	status = "disabled";
};

&soc {
	qcom,msm-ssc-sensors {
		status = "disabled";
	};

	qcom,msm-thermal {
		qcom,hotplug-temp = <115>;
		qcom,hotplug-temp-hysteresis = <25>;
		qcom,therm-reset-temp = <119>;
	};

	i2c@75b6000 { /* BLSP8 */
		/* ADV7533 HDMI Bridge Chip removed on ADP Lite */
		adv7533@39 {
			status = "disabled";
		};
	};

	qcom,adv7481@70 {
		status = "disabled";
	};

	qcom,msm-ba {
		status = "disabled";
	};

	qcom,tv-tuner {
		status = "disabled";
	};
};

&dsi_adv_7533_2 {
	/delete-property/ qcom,dsi-display-active;
};

&sde_kms {
	connectors = <&sde_hdmi_tx &sde_hdmi &dsi_adv_7533_1>;
};

&pil_modem {
	pinctrl-names = "default";
	pinctrl-0 = <&modem_mux>;
};

&slim_msm {
	status = "disabled";
};

&pm8994_mpps {
	mpp@a500 { /* MPP 6 */
		qcom,mode = <1>;		/* Digital output */
		qcom,output-type = <0>;		/* CMOS logic */
		qcom,vin-sel = <2>;		/* S4 1.8V */
		qcom,src-sel = <0>;		/* Constant */
		qcom,master-en = <1>;		/* Enable GPIO */
		status = "okay";
	};
};

&sdhc_2 {
	cd-gpios = <&tlmm 38 GPIO_ACTIVE_LOW>;
	pinctrl-0 = <&sdc2_clk_on &sdc2_cmd_on &sdc2_data_on &sdc2_cd_on_sbc>;
	pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off
			&sdc2_cd_on_sbc>;
};

&i2c_7 {
	silabs4705@11 { /* SiLabs FM chip, slave id 0x11*/
		status = "disabled";
	};
};

/delete-node/ &qcom_pmi8994_3;
/delete-node/ &qcom_pm8004_5;
+72 −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.
 */

#include "msm8996pro.dtsi"
#include "msm8996pro-auto.dtsi"
#include "msm8996-auto.dtsi"

&spmi_bus {
	/delete-node/ qcom,pmi8994@2;
	/delete-node/ qcom,pmi8994@3;
	/delete-node/ qcom,pm8004@5;
};

&rpm_bus {
	/delete-node/ rpm-regulator-bstb;
	/delete-node/ rpm-regulator-bbyb;
	/delete-node/ rpm-regulator-smpb1;
};

&pcie0 {
	/delete-property/ qcom,l1-supported;
	/delete-property/ qcom,l1ss-supported;
	/delete-property/ qcom,aux-clk-sync;
};

&pcie1 {
	/delete-property/ qcom,l1-supported;
	/delete-property/ qcom,l1ss-supported;
	/delete-property/ qcom,aux-clk-sync;
};

&pcie2 {
	/delete-property/ qcom,l1-supported;
	/delete-property/ qcom,l1ss-supported;
	/delete-property/ qcom,aux-clk-sync;
};

&mdss_hdmi_tx {
	/delete-property/ qcom,pluggable;
};

&slim_msm {
	status = "disabled";
};

&mdss_dsi0 {
	/delete-property/ lab-supply;
	/delete-property/ ibb-supply;
};

&mdss_dsi1 {
	/delete-property/ lab-supply;
	/delete-property/ ibb-supply;
};

&usb_otg_switch {
	/delete-property/ vin-supply;
	/delete-property/ gpio;
};

&usb3 {
	/delete-property/ vbus_dwc3-supply;
};
+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/;
/plugin/;

#include "msm8996pro-auto-adp-lite.dtsi"

/ {
	model = "Qualcomm Technologies, Inc. MSM 8996pro AUTO ADP LITE";
	compatible = "qcom,msm8996-adp", "qcom,msm8996", "qcom,adp";
	qcom,msm-id = <315 0x10000>;
	qcom,board-id = <0x03010019 0>;
};
Loading