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

Commit d1ac8cc8 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 8917"

parents afd4290f da05f3bf
Loading
Loading
Loading
Loading
+15 −1
Original line number Diff line number Diff line
@@ -424,9 +424,23 @@ dtb-$(CONFIG_ARCH_MSM8937) += msm8937-pmi8950-mtp.dtb \
	msm8937-interposer-sdm429-mtp.dtb

dtb-$(CONFIG_ARCH_MSM8917) += msm8917-pmi8950-mtp.dtb \
	msm8917-pmi8950-cdp.dtb \
	msm8917-pmi8950-rcm.dtb \
	msm8917-pmi8950-ext-codec-cdp.dtb \
	msm8917-pmi8950-cdp-mirror-lake-touch.dtb \
	apq8017-pmi8950-cdp-wcd-rome.dtb \
	apq8017-pmi8950-mtp.dtb \
	apq8017-pmi8950-cdp.dtb \
	msm8917-pmi8937-qrd-sku5.dtb \
	msm8917-pmi8937-mtp.dtb \
	msm8917-pmi8937-cdp.dtb \
	msm8917-pmi8937-rcm.dtb \
	apq8017-pmi8937-mtp.dtb \
	apq8017-pmi8937-cdp.dtb \
	apq8017-pmi8937-cdp-wcd-rome.dtb \
	msm8917-pmi8940-mtp.dtb \
	msm8917-pmi8937-mtp.dtb
	msm8917-pmi8940-cdp.dtb \
	msm8917-pmi8940-rcm.dtb

dtb-$(CONFIG_ARCH_MSM8909) += msm8909w-bg-wtp-v2.dtb \
	apq8009w-bg-wtp-v2.dtb \
+345 −0
Original line number Diff line number Diff line
/*
 * Copyright (c) 2017-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.
 */

&wsa881x_211 {
	qcom,spkr-sd-n-gpio = <&tlmm 92 0>;
};

&wsa881x_212 {
	qcom,spkr-sd-n-gpio = <&tlmm 92 0>;
};

&wsa881x_213 {
	qcom,spkr-sd-n-gpio = <&tlmm 92 0>;
};

&wsa881x_214 {
	qcom,spkr-sd-n-gpio = <&tlmm 92 0>;
};

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

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

&slim_msm {
	status = "okay";
};

&wcd9xxx_intc {
	status = "okay";
};

&clock_audio {
	status = "okay";
};

&wcd9335 {
	status = "okay";
	cdc-vdd-mic-bias-supply = <&pm8937_l9>;
	qcom,cdc-vdd-mic-bias-voltage = <3300000 3300000>;
	qcom,cdc-vdd-mic-bias-current = <15000>;
};

&wcd_rst_gpio {
	status = "okay";
};

&ext_codec {
	status = "okay";
	qcom,msm-mbhc-hphl-swh = <1>;
	qcom,msm-mbhc-gnd-swh = <1>;
	qcom,tdm-audio-intf;
	qcom,afe-rxtx-lb;
	reg = <0xc051000 0x4>,
		<0xc051004 0x4>,
		<0xc055000 0x4>,
		<0xc052000 0x4>,
		<0x0c056000 0x4>,
		<0x0c054000 0x4>,
		<0x0c053000 0x4>;
	reg-names = "csr_gp_io_mux_mic_ctl",
		"csr_gp_io_mux_spkr_ctl",
		"csr_gp_io_lpaif_pri_pcm_pri_mode_muxsel",
		"csr_gp_io_mux_quin_ctl",
		"csr_gp_io_lpaif_qui_pcm_sec_mode_muxsel",
		"csr_gp_io_mux_mic_ext_clk_ctl",
		"csr_gp_io_mux_sec_tlmm_ctl";
	qcom,audio-routing =
		"AIF4 VI", "MCLK",
		"AIF4 VI", "MICBIAS_REGULATOR",
		"RX_BIAS", "MCLK",
		"BRIDGE RX OUT", "MCLK",
		"BRIDGE TX IN", "MCLK",
		"MADINPUT", "MCLK",
		"AIF4 MAD", "MICBIAS_REGULATOR",
		"AMIC1", "MIC BIAS3",
		"MIC BIAS3", "Handset Mic",
		"AMIC2", "MIC BIAS2",
		"MIC BIAS2", "Headset Mic",
		"AMIC3", "MIC BIAS3",
		"MIC BIAS3", "Secondary Mic",
		"AMIC4", "MIC BIAS3",
		"MIC BIAS3", "Analog Mic4",
		"AMIC5", "MIC BIAS4",
		"MIC BIAS4", "Analog Mic7",
		"AMIC6", "MIC BIAS4",
		"MIC BIAS4", "Analog Mic6",
		"DMIC0", "MIC BIAS1",
		"MIC BIAS1", "Digital Mic0",
		"DMIC1", "MIC BIAS1",
		"MIC BIAS1", "Digital Mic1",
		"DMIC2", "MIC BIAS3",
		"MIC BIAS3", "Digital Mic2",
		"DMIC3", "MIC BIAS3",
		"MIC BIAS3", "Digital Mic3",
		"DMIC4", "MIC BIAS4",
		"MIC BIAS4", "Digital Mic4",
		"DMIC5", "MIC BIAS4",
		"MIC BIAS4", "Digital Mic5",
		"MIC BIAS3", "MICBIAS_REGULATOR",
		"MIC BIAS4", "MICBIAS_REGULATOR",
		"SpkrLeft IN", "SPK1 OUT",
		"SpkrRight IN", "SPK2 OUT";
	asoc-cpu = <&dai_pri_auxpcm>,
		<&dai_mi2s2>, <&dai_mi2s3>, <&dai_mi2s5>,
		<&sb_0_rx>, <&sb_0_tx>, <&sb_1_rx>, <&sb_1_tx>,
		<&sb_2_rx>, <&sb_2_tx>, <&sb_3_rx>, <&sb_3_tx>,
		<&sb_4_rx>, <&sb_4_tx>, <&sb_5_tx>,
		<&afe_pcm_rx>, <&afe_pcm_tx>,
		<&afe_proxy_rx>, <&afe_proxy_tx>,
		<&incall_record_rx>, <&incall_record_tx>,
		<&incall_music_rx>, <&incall_music_2_rx>,
		<&sb_5_rx>,  <&bt_sco_rx>,
		<&bt_sco_tx>, <&int_fm_rx>, <&int_fm_tx>,
		<&sb_6_rx>, <&dai_pri_tdm_rx_0>, <&dai_pri_tdm_tx_0>,
		<&dai_sec_tdm_rx_0>, <&dai_sec_tdm_tx_0>, <&afe_loopback_tx>;
	asoc-cpu-names = "msm-dai-q6-auxpcm.1",
			"msm-dai-q6-mi2s.2",
			"msm-dai-q6-mi2s.3", "msm-dai-q6-mi2s.5",
			"msm-dai-q6-dev.16384", "msm-dai-q6-dev.16385",
			"msm-dai-q6-dev.16386", "msm-dai-q6-dev.16387",
			"msm-dai-q6-dev.16388", "msm-dai-q6-dev.16389",
			"msm-dai-q6-dev.16390", "msm-dai-q6-dev.16391",
			"msm-dai-q6-dev.16392", "msm-dai-q6-dev.16393",
			"msm-dai-q6-dev.16395", "msm-dai-q6-dev.224",
			"msm-dai-q6-dev.225", "msm-dai-q6-dev.241",
			"msm-dai-q6-dev.240", "msm-dai-q6-dev.32771",
			"msm-dai-q6-dev.32772", "msm-dai-q6-dev.32773",
			"msm-dai-q6-dev.32770", "msm-dai-q6-dev.16394",
			"msm-dai-q6-dev.12288", "msm-dai-q6-dev.12289",
			"msm-dai-q6-dev.12292", "msm-dai-q6-dev.12293",
			"msm-dai-q6-dev.16396", "msm-dai-q6-tdm.36864",
			"msm-dai-q6-tdm.36865", "msm-dai-q6-tdm.36880",
			"msm-dai-q6-tdm.36881", "msm-dai-q6-dev.24577";
	qcom,msm-gpios =
		"quin_i2s",
		"us_eu_gpio",
		"quat_i2s";
	qcom,pinctrl-names =
		"all_off",
		"quin_i2s_act",
		"us_eu_gpio_act",
		"quin_i2s_us_eu_gpio_act",
		"quat_i2s_act",
		"quat_i2s_quin_i2s_act",
		"quat_i2s_us_eu_gpio_act",
		"quat_i2s_us_eu_gpio_quin_i2s_act";
	pinctrl-names =
		"all_off",
		"quin_i2s_act",
		"us_eu_gpio_act",
		"quin_i2s_us_eu_gpio_act",
		"quat_i2s_act",
		"quat_i2s_quin_i2s_act",
		"quat_i2s_us_eu_gpio_act",
		"quat_i2s_us_eu_gpio_quin_i2s_act";

	pinctrl-0 = <&pri_tlmm_ws_sus
		&cross_conn_det_sus &pri_mi2s_sd0_sleep
		&pri_mi2s_sck_sleep &pri_mi2s_sd1_sleep
		&sec_mi2s_ws_sleep &sec_mi2s_sck_sleep
		&sec_mi2s_sd1_sleep &sec_mi2s_sd0_sleep>;
	pinctrl-1 = <&pri_tlmm_ws_act
		&cross_conn_det_sus &pri_mi2s_sd0_active
		&pri_mi2s_sck_active &pri_mi2s_sd1_active
		&sec_mi2s_ws_sleep &sec_mi2s_sck_sleep
		&sec_mi2s_sd1_sleep &sec_mi2s_sd0_sleep>;
	pinctrl-2 = <&pri_tlmm_ws_sus
		&cross_conn_det_act &pri_mi2s_sd0_sleep
		&pri_mi2s_sck_sleep &pri_mi2s_sd1_sleep
		&sec_mi2s_ws_sleep &sec_mi2s_sck_sleep
		&sec_mi2s_sd1_sleep &sec_mi2s_sd0_sleep>;
	pinctrl-3 = <&pri_tlmm_ws_act
		&cross_conn_det_act &pri_mi2s_sd0_active
		&pri_mi2s_sck_active &pri_mi2s_sd1_active
		&sec_mi2s_ws_sleep &sec_mi2s_sck_sleep
		&sec_mi2s_sd1_sleep &sec_mi2s_sd0_sleep>;
	pinctrl-4 = <&pri_tlmm_ws_sus
		&cross_conn_det_sus &pri_mi2s_sd0_sleep
		&pri_mi2s_sck_sleep &pri_mi2s_sd1_sleep
		&sec_mi2s_ws_active &sec_mi2s_sck_active
		&sec_mi2s_sd1_active &sec_mi2s_sd0_active>;
	pinctrl-5 = <&pri_tlmm_ws_act
		&cross_conn_det_sus &pri_mi2s_sd0_active
		&pri_mi2s_sck_active &pri_mi2s_sd1_active
		&sec_mi2s_ws_active &sec_mi2s_sck_active
		&sec_mi2s_sd1_active &sec_mi2s_sd0_active>;
	pinctrl-6 = <&pri_tlmm_ws_sus
		&cross_conn_det_act &pri_mi2s_sd0_sleep
		&pri_mi2s_sck_sleep &pri_mi2s_sd1_sleep
		&sec_mi2s_ws_active &sec_mi2s_sck_active
		&sec_mi2s_sd1_active &sec_mi2s_sd0_active>;
	pinctrl-7 = <&pri_tlmm_ws_act
		&cross_conn_det_act &pri_mi2s_sd0_active
		&pri_mi2s_sck_active &pri_mi2s_sd1_active
		&sec_mi2s_ws_active &sec_mi2s_sck_active
		&sec_mi2s_sd1_active &sec_mi2s_sd0_active>;
};

&int_codec {
	status = "disabled";
};

&wsa881x_i2c_f {
	status = "disabled";
};

&wsa881x_i2c_45 {
	status = "disabled";
};

&soc {
	qcom,msm-dai-tdm-pri-rx {
		compatible = "qcom,msm-dai-tdm";
		qcom,msm-cpudai-tdm-group-id = <37120>;
		qcom,msm-cpudai-tdm-group-num-ports = <1>;
		qcom,msm-cpudai-tdm-group-port-id = <36864>;
		qcom,msm-cpudai-tdm-clk-rate = <12288000>;
		qcom,msm-cpudai-tdm-clk-attribute = /bits/ 16 <1>;
		dai_pri_tdm_rx_0: qcom,msm-dai-q6-tdm-pri-rx-0 {
			compatible = "qcom,msm-dai-q6-tdm";
			qcom,msm-cpudai-tdm-dev-id = <36864>;
			qcom,msm-cpudai-tdm-sync-mode = <0>;
			qcom,msm-cpudai-tdm-sync-src = <1>;
			qcom,msm-cpudai-tdm-data-out = <0>;
			qcom,msm-cpudai-tdm-invert-sync = <0>;
			qcom,msm-cpudai-tdm-data-delay = <1>;
			qcom,msm-cpudai-tdm-data-align = <0>;
		};
	};

	qcom,msm-dai-tdm-pri-tx {
		compatible = "qcom,msm-dai-tdm";
		qcom,msm-cpudai-tdm-group-id = <37121>;
		qcom,msm-cpudai-tdm-group-num-ports = <1>;
		qcom,msm-cpudai-tdm-group-port-id = <36865>;
		qcom,msm-cpudai-tdm-clk-rate = <12288000>;
		qcom,msm-cpudai-tdm-clk-attribute = /bits/ 16 <1>;
		dai_pri_tdm_tx_0: qcom,msm-dai-q6-tdm-pri-tx-0 {
			compatible = "qcom,msm-dai-q6-tdm";
			qcom,msm-cpudai-tdm-dev-id = <36865>;
			qcom,msm-cpudai-tdm-sync-mode = <0>;
			qcom,msm-cpudai-tdm-sync-src = <1>;
			qcom,msm-cpudai-tdm-data-out = <0>;
			qcom,msm-cpudai-tdm-invert-sync = <0>;
			qcom,msm-cpudai-tdm-data-delay = <1>;
			qcom,msm-cpudai-tdm-data-align = <0>;
		};
	};

	qcom,msm-dai-tdm-sec-rx {
		compatible = "qcom,msm-dai-tdm";
		qcom,msm-cpudai-tdm-group-id = <37136>;
		qcom,msm-cpudai-tdm-group-num-ports = <1>;
		qcom,msm-cpudai-tdm-group-port-id = <36880>;
		qcom,msm-cpudai-tdm-clk-rate = <12288000>;
		qcom,msm-cpudai-tdm-clk-attribute = /bits/ 16 <1>;
		dai_sec_tdm_rx_0: qcom,msm-dai-q6-tdm-sec-rx-0 {
			compatible = "qcom,msm-dai-q6-tdm";
			qcom,msm-cpudai-tdm-dev-id = <36880>;
			qcom,msm-cpudai-tdm-sync-mode = <0>;
			qcom,msm-cpudai-tdm-sync-src = <1>;
			qcom,msm-cpudai-tdm-data-out = <0>;
			qcom,msm-cpudai-tdm-invert-sync = <0>;
			qcom,msm-cpudai-tdm-data-delay = <1>;
			qcom,msm-cpudai-tdm-data-align = <0>;
		};
	};

	qcom,msm-dai-tdm-sec-tx {
		compatible = "qcom,msm-dai-tdm";
		qcom,msm-cpudai-tdm-group-id = <37137>;
		qcom,msm-cpudai-tdm-group-num-ports = <1>;
		qcom,msm-cpudai-tdm-group-port-id = <36881>;
		qcom,msm-cpudai-tdm-clk-rate = <12288000>;
		qcom,msm-cpudai-tdm-clk-attribute = /bits/ 16 <1>;
		dai_sec_tdm_tx_0: qcom,msm-dai-q6-tdm-sec-tx-0 {
			compatible = "qcom,msm-dai-q6-tdm";
			qcom,msm-cpudai-tdm-dev-id = <36881>;
			qcom,msm-cpudai-tdm-sync-mode = <0>;
			qcom,msm-cpudai-tdm-sync-src = <1>;
			qcom,msm-cpudai-tdm-data-out = <0>;
			qcom,msm-cpudai-tdm-invert-sync = <0>;
			qcom,msm-cpudai-tdm-data-delay = <1>;
			qcom,msm-cpudai-tdm-data-align = <0>;
		};
	};
};

&dai_pri_auxpcm {
	qcom,msm-cpudai-afe-clk-ver = <2>;
};

&tlmm {
	tlmm_gpio_key {
		gpio_key_active: gpio_key_active {
			mux {
				pins = "gpio91", "gpio127", "gpio128";
				function = "gpio";
			};

			config {
				pins = "gpio91", "gpio127", "gpio128";
			};
		};

		gpio_key_suspend: gpio_key_suspend {
			mux {
				pins = "gpio91", "gpio127", "gpio128";
				function = "gpio";
			};

			config {
				pins = "gpio91", "gpio127", "gpio128";
			};
		};
	};
};
+98 −0
Original line number Diff line number Diff line
/*
 * Copyright (c) 2016-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-cdp.dtsi"
#include "msm8917-pmi8937.dtsi"
#include "apq8017-rome.dtsi"
#include "apq8017-audio.dtsi"

/ {
	model = "Qualcomm Technologies, Inc. APQ8017-PMI8937 CDP \
						with WCD codec/Rome card";
	compatible = "qcom,apq8017-cdp", "qcom,apq8017", "qcom,cdp";
	qcom,board-id= <1 2>;
	qcom,pmic-id = <0x10019 0x020037 0x0 0x0>;
};

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

};

&mdss_fb0 {
	/delete-node/ qcom,cont-splash-memory;
};

/delete-node/ &cont_splash_mem;

&soc {
	gpio_keys {
		/delete-node/ home;
	};
};

&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";
};
+25 −0
Original line number Diff line number Diff line
/*
 * Copyright (c) 2015-2016, 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-cdp.dtsi"
#include "msm8917-pmi8937.dtsi"

/ {
	model = "Qualcomm Technologies, Inc. APQ8017-PMI8937 CDP";
	compatible = "qcom,apq8017-cdp", "qcom,apq8017", "qcom,cdp";
	qcom,board-id= <1 0>;
	qcom,pmic-id = <0x10019 0x020037 0x0 0x0>;
};
+45 −0
Original line number Diff line number Diff line
/*
 * Copyright (c) 2015-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-mtp.dtsi"
#include "msm8917-pmi8937.dtsi"

/ {
	model = "Qualcomm Technologies, Inc. APQ8017-PMI8937 MTP";
	compatible = "qcom,apq8017-mtp", "qcom,apq8017", "qcom,mtp";
	qcom,board-id= <8 0>;
	qcom,pmic-id = <0x10019 0x020037 0x0 0x0>;
};

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