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

Commit 3aa0e3d3 authored by Lingutla Chandrasekhar's avatar Lingutla Chandrasekhar Committed by Gaurav Kohli
Browse files

ARM: dts: msm: Add SDM845 Interposer SDM670 support



Add initial Interposer support on SDM845 for SDM670.
This also adds the PM660/PM660L nodes and deletes all
occurrences of PM8998.

Change-Id: I9f7d4a4f3f54eeef9b35b7e9fb572c368e888a62
Signed-off-by: default avatarLingutla Chandrasekhar <clingutla@codeaurora.org>
Signed-off-by: default avatarTirupathi Reddy <tirupath@codeaurora.org>
parent 89d42a92
Loading
Loading
Loading
Loading
+8 −2
Original line number Diff line number Diff line
@@ -12,7 +12,9 @@ ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)
		sdm845-v2-qrd-overlay.dtbo \
		sdm845-4k-panel-mtp-overlay.dtbo \
		sdm845-4k-panel-cdp-overlay.dtbo \
		sdm845-4k-panel-qrd-overlay.dtbo
		sdm845-4k-panel-qrd-overlay.dtbo \
		sdm845-interposer-sdm670-cdp-overlay.dtbo \
		sdm845-interposer-sdm670-mtp-overlay.dtbo

sdm845-cdp-overlay.dtbo-base := sdm845.dtb
sdm845-mtp-overlay.dtbo-base := sdm845.dtb
@@ -23,6 +25,8 @@ sdm845-v2-qrd-overlay.dtbo-base := sdm845-v2.dtb
sdm845-4k-panel-mtp-overlay.dtbo-base := sdm845.dtb
sdm845-4k-panel-cdp-overlay.dtbo-base := sdm845.dtb
sdm845-4k-panel-qrd-overlay.dtbo-base := sdm845.dtb
sdm845-interposer-sdm670-cdp-overlay.dtbo-base := sdm845-interposer-sdm670.dtb
sdm845-interposer-sdm670-mtp-overlay.dtbo-base := sdm845-interposer-sdm670.dtb
else
dtb-$(CONFIG_ARCH_SDM845) += sdm845-sim.dtb \
	sdm845-rumi.dtb \
@@ -35,7 +39,9 @@ dtb-$(CONFIG_ARCH_SDM845) += sdm845-sim.dtb \
	sdm845-v2-qrd.dtb \
	sdm845-4k-panel-mtp.dtb \
	sdm845-4k-panel-cdp.dtb \
	sdm845-4k-panel-qrd.dtb
	sdm845-4k-panel-qrd.dtb \
	sdm845-interposer-sdm670-mtp.dtb \
	sdm845-interposer-sdm670-cdp.dtb
endif

dtb-$(CONFIG_ARCH_SDM670) += sdm670-rumi.dtb \
+376 −0
Original line number Diff line number Diff line
/* Copyright (c) 2016-2017, 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.
 */

/ {
	/delete-node/regulator-pm8998-s4;
};

&dsi_sharp_4k_dsc_video_display {
	/delete-property/ vddio-supply;
};

&dsi_sharp_4k_dsc_cmd_display {
	/delete-property/ vddio-supply;
};

&dsi_sharp_1080_cmd_display {
	/delete-property/ vddio-supply;
};

&dsi_dual_sharp_1080_120hz_cmd_display {
	/delete-property/ vddio-supply;
};

&dsi_dual_nt35597_truly_video_display {
	/delete-property/ vddio-supply;
};

&dsi_dual_nt35597_truly_cmd_display {
	/delete-property/ vddio-supply;
};

&dsi_nt35597_truly_dsc_cmd_display {
	/delete-property/ vddio-supply;
};

&dsi_nt35597_truly_dsc_video_display {
	/delete-property/ vddio-supply;
};

&sde_dp {
	/delete-property/ vdda-1p2-supply;
	/delete-property/ vdda-0p9-supply;
	/delete-property/ qcom,dp-usbpd-detection;
};

&bluetooth {
	/delete-property/ qca,bt-vdd-io-supply;
	/delete-property/ qca,bt-vdd-xtal-supply;
	/delete-property/ qca,bt-vdd-core-supply;
	/delete-property/ qca,bt-vdd-pa-supply;
	/delete-property/ qca,bt-vdd-ldo-supply;
};

&ufsphy_mem {
	/delete-property/ vdda-phy-supply;
	/delete-property/ vdda-pll-supply;
};

&ufshc_mem {
	/delete-property/ vcc-supply;
	/delete-property/ vccq2-supply;
	/delete-property/ qcom,vddp-ref-clk-supply;
};

&ufsphy_card {
	/delete-property/ vdda-phy-supply;
	/delete-property/ vdda-pll-supply;
};

&ufshc_card {
	/delete-property/ vcc-supply;
	/delete-property/ vccq2-supply;
	/delete-property/ qcom,vddp-ref-clk-supply;
};

&sdhc_2 {
	/delete-property/ vdd-supply;
	/delete-property/ vdd-io-supply;
};

&vendor {
	extcon_usb1 {
		/delete-property/ id-gpio;
		/delete-property/ vbus-gpio;
		/delete-property/ pinctrl-names;
		/delete-property/ pinctrl-0;
	};

	usb1_vbus_vreg {
		/delete-property/ gpio;
		/delete-property/ pinctrl-names;
		/delete-property/ pinctrl-0;
	};
};

&qupv3_se3_i2c {
	nq@28 {
		/delete-property/ qcom,nq-clkreq;
		/* delete "nfc_clk_default" -- PMIC GPIO */
		pinctrl-0 = <&nfc_int_active &nfc_enable_active>;
	};
};

&pcie0 {
	/delete-property/ vreg-1.8-supply;
	/delete-property/ vreg-0.9-supply;
	/delete-property/ vreg-cx-supply;
};

&cam_csiphy0 {
	/delete-property/ mipi-csi-vdd-supply;
};

&cam_csiphy1 {
	/delete-property/ mipi-csi-vdd-supply;
};

&cam_csiphy2 {
	/delete-property/ mipi-csi-vdd-supply;
};

&led_flash_rear {
	/delete-property/ flash-source;
	/delete-property/ torch-source;
	/delete-property/ switch-source;
};

&led_flash_front {
	/delete-property/ flash-source;
	/delete-property/ torch-source;
	/delete-property/ switch-source;
};

&actuator_regulator {
	/delete-property/ vin-supply;
};


&eeprom_rear {
	/delete-property/ cam_vio-supply;
	/delete-property/ cam_vana-supply;
};

&eeprom_rear_aux {
	/delete-property/ cam_vio-supply;
	/delete-property/ cam_vana-supply;
};

&eeprom_front {
	/delete-property/ cam_vio-supply;
	/delete-property/ cam_vana-supply;
};

&cam_cci {
	qcom,cam-sensor@0 {
		/delete-property/ cam_vio-supply;
		/delete-property/ cam_vana-supply;
	};

	qcom,cam-sensor@1 {
		/delete-property/ cam_vio-supply;
		/delete-property/ cam_vana-supply;
	};

	qcom,cam-sensor@2 {
		/delete-property/ cam_vio-supply;
		/delete-property/ cam_vana-supply;
	};
};

&clock_gcc {
	/delete-property/ vdd_cx-supply;
	/delete-property/ vdd_cx_ao-supply;
};

&clock_videocc {
	/delete-property/ vdd_cx-supply;
};

&clock_camcc {
	/delete-property/ vdd_cx-supply;
	/delete-property/ vdd_mx-supply;
};

&clock_dispcc {
	/delete-property/ vdd_cx-supply;
};

&clock_gpucc {
	/delete-property/ vdd_cx-supply;
};

&clock_gfx {
	/delete-property/ vdd_gfx-supply;
	/delete-property/ vdd_mx-supply;
};

&pil_modem {
	/delete-property/ vdd_cx-supply;
	/delete-property/ vdd_mx-supply;
};

&gpu_gx_gdsc {
	/delete-property/ parent-supply;
};

&soc {
	/delete-node/ gpio_keys;

	qcom,lpass@17300000 {
		/delete-property/ vdd_cx-supply;
	};

	qcom,ssc@5c00000 {
		/delete-property/ vdd_cx-supply;
	};

	qcom,spss@1880000 {
		/delete-property/ vdd_cx-supply;
		/delete-property/ vdd_mx-supply;
	};

	qcom,turing@8300000 {
		/delete-property/ vdd_cx-supply;
	};

	qcom,qbt1000 {
		/delete-property/ qcom,finger-detect-gpio;
	};

	qcom,icnss@18800000 {
		/delete-property/ vdd-0.8-cx-mx-supply;
		/delete-property/ vdd-1.8-xo-supply;
		/delete-property/ vdd-1.3-rfa-supply;
		/delete-property/ vdd-3.3-ch0-supply;
	};

	qcom,mdss_dsi_ctrl0@ae94000 {
		/delete-property/ vdda-1p2-supply;
	};

	qcom,mdss_dsi_ctrl1@ae96000 {
		/delete-property/ vdda-1p2-supply;
	};

	qcom,mdss_dsi_phy0@ae94400 {
		/delete-property/ vdda-0p9-supply;
	};

	qcom,mdss_dsi_phy0@ae96400 {
		/delete-property/ vdda-0p9-supply;
	};

	gpio-regulator@1 {
		/delete-property/ gpio;
		/delete-property/ vin-supply;
		/delete-property/ pinctrl-names;
		/delete-property/ pinctrl-0;
	};

	gpio-regulator@2 {
		/delete-property/ gpio;
		/delete-property/ vin-supply;
		/delete-property/ pinctrl-names;
		/delete-property/ pinctrl-0;
	};

	/delete-node/ qcom,spmi-debug@6b22000;

};

&wil6210 {
	/delete-property/ vdd-supply;
	/delete-property/ vddio-supply;
};

&usb0 {
	/delete-property/ extcon;
};

&qusb_phy0 {
	/delete-property/ vdd-supply;
	/delete-property/ vdda18-supply;
	/delete-property/ vdda33-supply;
};

&usb_qmp_dp_phy {
	/delete-property/ vdd-supply;
	/delete-property/ core-supply;
};

&qusb_phy1 {
	/delete-property/ vdd-supply;
	/delete-property/ vdda18-supply;
	/delete-property/ vdda33-supply;
};

&usb_qmp_phy {
	/delete-property/ vdd-supply;
	/delete-property/ core-supply;
};

&soc {
	/* Delete all regulators */
	/delete-node/ cprh-ctrl@17dc0000;
	/delete-node/ cprh-ctrl@17db0000;
	/delete-node/ rpmh-regulator-ebilvl;
	/delete-node/ rpmh-regulator-smpa2;
	/delete-node/ rpmh-regulator-smpa3;
	/delete-node/ rpmh-regulator-smpa5;
	/delete-node/ rpmh-regulator-mxlvl;
	/delete-node/ rpmh-regulator-smpa7;
	/delete-node/ rpmh-regulator-cxlvl;
	/delete-node/ rpmh-regulator-ldoa1;
	/delete-node/ rpmh-regulator-ldoa2;
	/delete-node/ rpmh-regulator-ldoa3;
	/delete-node/ rpmh-regulator-lmxlvl;
	/delete-node/ rpmh-regulator-ldoa5;
	/delete-node/ rpmh-regulator-ldoa6;
	/delete-node/ rpmh-regulator-ldoa7;
	/delete-node/ rpmh-regulator-ldoa8;
	/delete-node/ rpmh-regulator-ldoa9;
	/delete-node/ rpmh-regulator-ldoa10;
	/delete-node/ rpmh-regulator-ldoa11;
	/delete-node/ rpmh-regulator-ldoa12;
	/delete-node/ rpmh-regulator-ldoa13;
	/delete-node/ rpmh-regulator-ldoa14;
	/delete-node/ rpmh-regulator-ldoa15;
	/delete-node/ rpmh-regulator-ldoa16;
	/delete-node/ rpmh-regulator-ldoa17;
	/delete-node/ rpmh-regulator-ldoa18;
	/delete-node/ rpmh-regulator-ldoa19;
	/delete-node/ rpmh-regulator-ldoa20;
	/delete-node/ rpmh-regulator-ldoa21;
	/delete-node/ rpmh-regulator-ldoa22;
	/delete-node/ rpmh-regulator-ldoa23;
	/delete-node/ rpmh-regulator-ldoa24;
	/delete-node/ rpmh-regulator-ldoa25;
	/delete-node/ rpmh-regulator-ldoa26;
	/delete-node/ rpmh-regulator-lcxlvl;
	/delete-node/ rpmh-regulator-ldoa28;
	/delete-node/ rpmh-regulator-vsa1;
	/delete-node/ rpmh-regulator-vsa2;
	/delete-node/ rpmh-regulator-bobb1;
	/delete-node/ rpmh-regulator-gfxlvl;
	/delete-node/ rpmh-regulator-msslvl;
	/delete-node/ rpmh-regulator-smpc3;
	/delete-node/ ext_5v_boost;
};

&spmi_bus {
	/delete-node/ qcom,pm8998@0;
	/delete-node/ qcom,pm8998@1;
	/delete-node/ qcom,pmi8998@2;
	/delete-node/ qcom,pmi8998@3;
	/delete-node/ qcom,pm8005@4;
	/delete-node/ qcom,pm8005@5;
};


#include "pm660.dtsi"
#include "pm660l.dtsi"
#include "sdm670-regulator.dtsi"

&soc {
	/delete-node/ thermal-zones;
};
+30 −0
Original line number Diff line number Diff line
/* Copyright (c) 2017, 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 <dt-bindings/clock/qcom,gcc-sdm845.h>
#include <dt-bindings/clock/qcom,camcc-sdm845.h>
#include <dt-bindings/clock/qcom,dispcc-sdm845.h>
#include <dt-bindings/clock/qcom,rpmh.h>
#include <dt-bindings/interrupt-controller/arm-gic.h>

#include "sdm845-sde-display.dtsi"
#include "sdm845-interposer-sdm670-cdp.dtsi"

/ {
	model = "Qualcomm Technologies, Inc. SDM845 v1 Interposer SDM670 CDP";
	compatible = "qcom,sdm845-cdp", "qcom,sdm845", "qcom,cdp";
	qcom,msm-id = <321 0x0>;
	qcom,board-id = <1 4>;
};
+24 −0
Original line number Diff line number Diff line
/* Copyright (c) 2017, 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 "sdm845-interposer-sdm670.dtsi"
#include "sdm845-sde-display.dtsi"
#include "sdm845-interposer-sdm670-cdp.dtsi"

/ {
	model = "Qualcomm Technologies, Inc. MSM sdm845 v1 Interposer SDM670 CDP";
	compatible = "qcom,sdm845-cdp", "qcom,sdm845", "qcom,cdp";
	qcom,board-id = <1 4>;
};
+14 −0
Original line number Diff line number Diff line
/* Copyright (c) 2017, 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 "sdm845-cdp.dtsi"
#include "sdm845-interposer-pm660.dtsi"
Loading