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

Commit 1c0f1d30 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 device tree support for sdm429 bg variants"

parents 4ca4aa4e 70212fe8
Loading
Loading
Loading
Loading
+10 −2
Original line number Diff line number Diff line
@@ -398,7 +398,11 @@ dtbo-$(CONFIG_ARCH_SDM429) += sdm429-mtp-overlay.dtbo \
	sdm429-spyro-qrd-evt-overlay.dtbo \
	sdm429-spyro-qrd-dvt-overlay.dtbo \
	sda429-spyro-qrd-dvt-overlay.dtbo \
	sdm429-spyro-qrd-wdp-overlay.dtbo
	sdm429-spyro-qrd-wdp-overlay.dtbo \
	sdm429-bg-wtp-overlay.dtbo \
	sdm429-bg-wdp-overlay.dtbo \
	sda429-bg-wdp-overlay.dtbo \
	sda429-bg-wtp-overlay.dtbo

msm8940-mtp-overlay.dtbo-base := msm8940-pmi8950.dtb \
	msm8940-pmi8937.dtb \
@@ -522,6 +526,10 @@ sdm429-spyro-qrd-evt-overlay.dtbo-base := sdm429-spyro.dtb
sdm429-spyro-qrd-dvt-overlay.dtbo-base := sdm429-spyro-dvt.dtb
sda429-spyro-qrd-dvt-overlay.dtbo-base := sda429-spyro-dvt.dtb
sdm429-spyro-qrd-wdp-overlay.dtbo-base := sdm429-spyro-wdp.dtb
sdm429-bg-wtp-overlay.dtbo-base := sdm429-bg-wtp.dtb
sda429-bg-wtp-overlay.dtbo-base := sda429-bg-wtp.dtb
sdm429-bg-wdp-overlay.dtbo-base := sdm429-bg-wdp.dtb
sda429-bg-wdp-overlay.dtbo-base := sda429-bg-wdp.dtb
else
dtb-$(CONFIG_ARCH_MSM8953) += msm8953-cdp.dtb \
	msm8953-mtp.dtb \
@@ -659,7 +667,7 @@ dtb-$(CONFIG_ARCH_SDM429) += sdm429-mtp.dtb \
	sdm429-spyro-dvt.dtb \
	sdm429-spyro-wdp.dtb \
	sda429-spyro-dvt.dtb \
	sdw3300-bg-1gb-wtp.dtb
	sdm429-bg-iot-wtp.dtb

endif

+112 −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 "sdm429-spyro-qrd-evt.dtsi"

/ {
	model = "Qualcomm Technologies, Inc. SDA429 QRD Spyro BG WDP Overlay";
	compatible = "qcom,sdm429w-qrd", "qcom,sdm429w", "qcom,qrd";
	qcom,msm-id = <437 0x0>;
	qcom,board-id = <0x01000b 9>;
	qcom,pmic-id = <0x0002001b 0x0 0x0 0x0>;
};

&usb_otg {
	HSUSB_3p3-supply = <&L16A>;
};

&msm_dig_codec {
	cdc-vdd-digital-supply = <&pm660_l11>;
};

&ext_smart_pa {
	dvdd-supply = <&pm660_l11>;
};

&sdhc_2 {
	cd-gpios = <&tlmm 67 0x1>;
};

&mdss_dsi {
	vddio-supply = <&L12A>; /* 1.8v */
};

&mdss_dsi0_pll {
	vddio-supply = <&L12A>; /* 1.8V */
};

&mdss_dsi1_pll {
	vddio-supply = <&L12A>; /* 1.8V */
};

&mdss_dsi0 {
	qcom,platform-enable-gpio = <&pm660_gpios 12 0>;
	/delete-property/ vdd-supply;
	qcom,dsi-pref-prim-pan = <&dsi_truly_rm69090_qvga_cmd>;
};
&dsi_pm660_panel_pwr_supply {
	/delete-node/ qcom,panel-supply-entry@0;
};

&pm660_gpios {
	gpio@cb00 {
		status = "ok";
		qcom,mode = <1>;
		qcom,vin-sel = <0>;
		qcom,src-sel = <0>;
		qcom,master-en = <1>;
		qcom,out-strength = <2>;
	};
};

&i2c_4 {
	status = "ok";

	tsc@24 {
		cy,core {
			cy,mt {
				cy,name = "cyttsp5_mt";

				cy,inp_dev_name = "cyttsp5_mt";
				cy,flags = <0x8>;
				cy,abs =
					<0x35 0 368 0 0
					 0x36 0 448 0 0
					 0x3a 0 255 0 0
					 0xffff 0 255 0 0
					 0x39 0 15 0 0
					 0x30 0 255 0 0
					 0x31 0 255 0 0
					 0x34 0xffffff81 127 0 0
					 0x37 0 1 0 0
					 0x3b 0 255 0 0>;

			};

		};
	};

};

&firmware {
	android {
		fstab {
			system {
				status = "disabled";
			};
		};
	};
};
+24 −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 "sdm429-spyro.dtsi"

/ {
	model = "Qualcomm Technologies, Inc. SDA429 QRD BG WDP Spyro";
	compatible = "qcom,sdm429w-qrd","qcom,sdm429w","qcom,sda429w";
	qcom,msm-id = <437 0x0>;
	qcom,board-id = <0x00010b 9>;
	qcom,pmic-id = <0x0002001b 0x0 0x0 0x0>;
};
+47 −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 "sdm429-spyro-qrd-evt.dtsi"

/ {
	model = "Qualcomm Technologies, Inc. SDA429 QRD BG WTP Overlay";
	compatible = "qcom,sdm429w-qrd", "qcom,sdm429w", "qcom,qrd";
	qcom,msm-id = <437 0x0>;
	qcom,board-id = <0x00010b 8>;
	qcom,pmic-id = <0x0002001b 0x0 0x0 0x0>;
};

&usb_otg {
	HSUSB_3p3-supply = <&L16A>;
};

&msm_dig_codec {
	cdc-vdd-digital-supply = <&pm660_l11>;
};

&ext_smart_pa {
	dvdd-supply = <&pm660_l11>;
};

&firmware {
	android {
		fstab {
			system {
				status = "disabled";
			};
		};
	};
};
+24 −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 "sdm429-spyro.dtsi"

/ {
	model = "Qualcomm Technologies, Inc. SDM429 QRD DVT Spyro";
	compatible = "qcom,sdm429w-qrd", "qcom,sdm429w", "qcom,qrd";
	qcom,msm-id = <437 0x0>;
	qcom,board-id = <0x00010b 8>;
	qcom,pmic-id = <0x0002001b 0x0 0x0 0x0>;
};
Loading