Merge "ARM: dts: msm: add DTBO support for MSM8996pro CDP board" (12719925) · Commits · e / devices / android_kernel_sony_msm8998

arch/arm/boot/dts/qcom/Makefile

+5 −1

Original line number	Diff line number	Diff line
		@@ -4,7 +4,9 @@ dtbo-$(CONFIG_ARCH_MSM8996) += \
		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
		msm8996pro-auto-adp-lite-overlay.dtbo \
		apq8096pro-auto-cdp-overlay.dtbo \
		msm8996pro-v1.1-auto-cdp-overlay.dtbo

		msm8996-mtp-overlay.dtbo-base := msm8996pro-v1.1-pmi8996.dtb \
		msm8996-v3-pmi8996.dtb \
		@@ -13,6 +15,8 @@ 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
		apq8096pro-auto-cdp-overlay.dtbo-base := apq8096pro-auto.dtb
		msm8996pro-v1.1-auto-cdp-overlay.dtbo-base := msm8996pro-v1.1-auto.dtb
		else
		dtb-$(CONFIG_ARCH_MSM8996) += msm8996-v2-pmi8994-cdp.dtb \
		msm8996-v2-pmi8994-mtp.dtb \

arch/arm/boot/dts/qcom/apq8096pro-auto-cdp-overlay.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/;
		/plugin/;

		#include "apq8096pro-auto-cdp.dtsi"

		/ {
		model = "Qualcomm Technologies, Inc. APQ 8096 pro AUTO CDP";
		compatible = "qcom,apq8096-cdp", "qcom,apq8096", "qcom,cdp";
		qcom,msm-id = <387 0x10000>, <316 0x10000>;
		qcom,board-id = <0x03010001 0>;
		};

arch/arm/boot/dts/qcom/apq8096pro-auto-cdp.dtsi

0 → 100644

+37 −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/clock/msm-clocks-8996.h>
		#include "msm8996-pm8994.dtsi"
		#include "msm8996-auto-cdp.dtsi"

		&spi_9 {
		status = "ok";
		can-controller@0 {
		compatible = "renesas,rh850";
		reg = <0>;
		interrupt-parent = <&tlmm>;
		interrupts = <122 0>;
		spi-max-frequency = <5000000>;
		};
		};

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

		/delete-node/ &qcom_pmi8994_3;
		/delete-node/ &qcom_pm8004_5;

arch/arm/boot/dts/qcom/apq8096pro-auto.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 "apq8096pro-auto.dtsi"

		/ {
		model = "Qualcomm Technologies, Inc. APQ 8096pro AUTO SoC";
		compatible = "qcom,apq8096-cdp", "qcom,apq8096", "qcom,cdp";
		qcom,msm-id = <387 0x10000>, <316 0x10000>;
		qcom,pmic-id = <0x20009 0x0 0x0 0x0>;
		qcom,board-id = <0 0>;
		};

arch/arm/boot/dts/qcom/apq8096pro-auto.dtsi

0 → 100644

+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 "apq8096pro.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;
		};

		&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;
		};

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

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

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