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

Commit 71347bff 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: Mount system and vendor for 8917"

parents e9a57bee 0182aeee
Loading
Loading
Loading
Loading
+37 −0
Original line number Diff line number Diff line
@@ -296,6 +296,16 @@ dtb-$(CONFIG_ARCH_SDM670) += sdm670-rumi.dtb \
endif

ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)
dtbo-$(CONFIG_ARCH_MSM8917) += msm8917-mtp-overlay.dtbo \
	msm8917-qrd-overlay.dtbo \
	msm8917-cdp-overlay.dtbo \
	msm8917-cdp-ext-codec-overlay.dtbo \
	msm8917-cdp-ml-touch-overlay.dtbo \
	msm8917-rcm-overlay.dtbo \
	apq8017-mtp-overlay.dtbo \
	apq8017-cdp-overlay.dtbo \
	apq8017-cdp-wcd-rome-overlay.dtbo

dtbo-$(CONFIG_ARCH_MSM8953) += msm8953-mtp-overlay.dtbo \
	msm8953-cdp-overlay.dtbo \
	msm8953-rcm-overlay.dtbo \
@@ -334,6 +344,33 @@ dtbo-$(CONFIG_ARCH_SDM429) += sdm429-mtp-overlay.dtbo \
	sdm429-cdp-overlay.dtbo \
	sdm429-qrd-overlay.dtbo

msm8917-mtp-overlay.dtbo-base := msm8917-pmi8950.dtb \
	msm8917-pmi8937.dtb \
	msm8917-pmi8940.dtb

msm8917-qrd-overlay.dtbo-base := msm8917-pmi8937.dtb

msm8917-cdp-ext-codec-overlay.dtbo-base := msm8917-pmi8950.dtb

msm8917-cdp-ml-touch-overlay.dtbo-base := msm8917-pmi8950.dtb

msm8917-cdp-overlay.dtbo-base := msm8917-pmi8950.dtb \
	msm8917-pmi8937.dtb \
	msm8917-pmi8940.dtb

msm8917-rcm-overlay.dtbo-base := msm8917-pmi8950.dtb \
	msm8917-pmi8937.dtb \
	msm8917-pmi8940.dtb

apq8017-mtp-overlay.dtbo-base := apq8017-pmi8950.dtb \
	apq8017-pmi8937.dtb

apq8017-cdp-overlay.dtbo-base := apq8017-pmi8950.dtb \
	apq8017-pmi8937.dtb

apq8017-cdp-wcd-rome-overlay.dtbo-base := apq8017-pmi8950.dtb \
	apq8017-pmi8937.dtb

msm8953-mtp-overlay.dtbo-base := sdm450.dtb \
	msm8953.dtb \
	apq8053.dtb \
+26 −0
Original line number Diff line number Diff line
/*
 * Copyright (c) 2018, 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 "msm8917-cdp.dtsi"

/ {
	model = "Qualcomm Technologies, Inc. APQ8017-CDP";
	qcom,board-id = <1 0>;
};

&mdss_fb0 {
	/delete-node/ qcom,cont-splash-memory;
};
+82 −0
Original line number Diff line number Diff line
/*
 * Copyright (c) 2018, 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 "msm8917-cdp.dtsi"
#include "apq8017-rome.dtsi"

/ {
	model = "Qualcomm Technologies, Inc. APQ8017-CDP \
					with WCD codec/Rome card";
	qcom,board-id = <1 2>;
};

&blsp1_uart1 {
	status = "ok";
};

&sdhc_2 {
	/* device core power supply */
	/delete-property/vdd-supply;
	/delete-property/qcom,vdd-voltage-level;
	/delete-property/qcom,vdd-current-level;

	/* device communication power supply */
	vdd-io-supply = <&pm8937_l5>;
	qcom,vdd-io-always-on;
	qcom,vdd-io-voltage-level = <1800000 1800000>;
	qcom,vdd-io-current-level = <200 325000>;

	qcom,core_3_0v_support;
	qcom,nonremovable;

	pinctrl-names = "active", "sleep";
	pinctrl-0 = <&sdc2_clk_on &sdc2_cmd_on &sdc2_data_on
			&sdc2_wlan_gpio_active>;
	pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off
			&sdc2_wlan_gpio_sleep>;

	#address-cells = <0>;
	interrupt-parent = <&sdhc_2>;
	interrupts = <0 1 2>;
	#interrupt-cells = <1>;
	interrupt-map-mask = <0xffffffff>;
	interrupt-map = <0 &intc 0 125 0
		1 &intc 0 221 0
		2 &tlmm 124 0x4>;
	interrupt-names = "hc_irq", "pwr_irq", "sdiowakeup_irq";

	/delete-property/cd-gpios;
	/delete-property/qcom,devfreq,freq-table;

	status = "ok";

};

&modem_mem {
	reg = <0x0 0x86800000 0x0 0x1500000>;
};

&adsp_fw_mem {
	reg = <0x0 0x87d00000 0x0 0x1100000>;
};

&wcnss_fw_mem {
	reg = <0x0 0x88e00000 0x0 0x700000>;
};

&secure_mem {
	status = "disabled";
};
+78 −0
Original line number Diff line number Diff line
/*
 * Copyright (c) 2018, 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 "msm8917-mtp.dtsi"

/ {
	model = "Qualcomm Technologies, Inc. APQ8017-MTP";
	qcom,board-id = <8 0>;
};

&blsp1_uart1 {
	status = "ok";
};

&vendor {
	mtp_batterydata: qcom,battery-data {
		qcom,batt-id-range-pct = <15>;
		#include "batterydata-itech-3000mah.dtsi"
		#include "batterydata-ascent-3450mAh.dtsi"
	};
};

&qpnp_fg {
	qcom,battery-data = <&mtp_batterydata>;
};

&qpnp_smbcharger {
	qcom,battery-data = <&mtp_batterydata>;
};

&i2c_2 {
	/* DSI_TO_HDMI I2C configuration */
	adv7533@39 {
		compatible = "adv7533";
		reg = <0x39>;
		instance_id = <0>;
		adi,video-mode = <3>; /* 3 = 1080p */
		adi,main-addr = <0x39>;
		adi,cec-dsi-addr = <0x3C>;
		adi,enable-audio;
		adi,irq-gpio = <&tlmm 0x29 0x2002>;
		adi,power-down-gpio = <&tlmm 0x7D 0x0>;
		adi,switch-gpio = <&pm8937_gpios 0x8 0x1>;
		pinctrl-names = "pmx_adv7533_active",
					"pmx_adv7533_suspend";
		pinctrl-0 = <&adv7533_int_active>;
		pinctrl-1 = <&adv7533_int_suspend>;
	};
};

&mdss_dsi {
	hw-config = "single_dsi";
};

&mdss_dsi0 {
	qcom,dsi-pref-prim-pan = <&dsi_adv7533_1080p>;
	qcom,platform-intf-mux-gpio = <&tlmm 115 0>;
	status = "ok";
	qcom,bridge-index = <0>;
	qcom,pluggable;
};

&dsi_adv7533_1080p {
	qcom,panel-supply-entries = <&dsi_panel_pwr_supply>;
};
+24 −0
Original line number Diff line number Diff line
/*
 * Copyright (c) 2018, 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 "apq8017.dtsi"
#include "msm8917-pmi8937.dtsi"

/ {
	model = "Qualcomm Technologies, Inc. MSM8917 + PMI8937 SOC";
	compatible = "qcom,msm8917";
	qcom,pmic-id = <0x10019 0x020037 0x0 0x0>;
	qcom,pmic-name = "PMI8937";
};
Loading