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

Commit 9ca41f2b 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 dt files for sdxpoorwills v2 dualwifi"

parents a27ef60f 6c8f7dca
Loading
Loading
Loading
Loading
+3 −1
Original line number Diff line number Diff line
@@ -13,7 +13,9 @@ dtb-$(CONFIG_ARCH_SDXPOORWILLS) += sdxpoorwills-rumi.dtb \
	sdxpoorwills-pcie-ep-cdp.dtb \
	sdxpoorwills-pcie-ep-mtp.dtb \
	sdxpoorwills-v2-mtp.dtb \
	sdxpoorwills-v2-cdp.dtb
	sdxpoorwills-v2-cdp.dtb \
	sdxpoorwills-v2-dualwifi-mtp.dtb \
	sdxpoorwills-v2-dualwifi-cdp.dtb

dtb-$(CONFIG_ARCH_MDM9650) += mdm9650-nand-mtp.dtb \
	mdm9650-ttp.dtb \
+35 −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 "sdxpoorwills-dualwifi-cdp.dtsi"
#include "sdxpoorwills-v2.dtsi"

/ {
	model = "Qualcomm Technologies, Inc. SDXPOORWILLS V2 DUALWIFI CDP";
	compatible = "qcom,sdxpoorwills-cdp",
		"qcom,sdxpoorwills", "qcom,cdp";
	qcom,board-id = <1 0x105>;
};

&cnss_pcie {
	qcom,is-dual-wifi-enabled;
};

&cnss_sdio {
	status = "okay";
};

&blsp1_uart2b_hs {
	status = "okay";
};
+38 −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.
 */

#include "sdxpoorwills-cdp.dtsi"

&sdhc_1 {
	qcom,vdd-io-voltage-level = <1800000 1800000>;

	qcom,core_3_0v_support;
	qcom,nonremovable;

	pinctrl-0 = <&sdc1_clk_on &sdc1_cmd_on &sdc1_data_on
					&sdc1_wlan_gpio_active>;
	pinctrl-1 = <&sdc1_clk_off &sdc1_cmd_off &sdc1_data_off
					&sdc1_wlan_gpio_sleep>;

	#address-cells = <0>;
	interrupt-parent = <&sdhc_1>;
	interrupts = <0 1 2>;
	#interrupt-cells = <1>;
	interrupt-map-mask = <0xffffffff>;
	interrupt-map = <0 &intc 0 210 0
			1 &intc 0 227 0
			2 &tlmm 82 0x4>;
	interrupt-names = "hc_irq", "pwr_irq", "sdiowakeup_irq";

	/delete-property/ qcom,devfreq,freq-table;
	/delete-property/ cd-gpios;
};
+35 −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 "sdxpoorwills-dualwifi-mtp.dtsi"
#include "sdxpoorwills-v2.dtsi"

/ {
	model = "Qualcomm Technologies, Inc. SDXPOORWILLS V2 DUALWIFI MTP";
	compatible = "qcom,sdxpoorwills-mtp",
		"qcom,sdxpoorwills", "qcom,mtp";
	qcom,board-id = <8 0x104>;
};

&cnss_pcie {
	qcom,is-dual-wifi-enabled;
};

&cnss_sdio {
	status = "okay";
};

&blsp1_uart2b_hs {
	status = "okay";
};
+38 −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.
 */

#include "sdxpoorwills-mtp.dtsi"

&sdhc_1 {
	qcom,vdd-io-voltage-level = <1800000 1800000>;

	qcom,core_3_0v_support;
	qcom,nonremovable;

	pinctrl-0 = <&sdc1_clk_on &sdc1_cmd_on &sdc1_data_on
					&sdc1_wlan_gpio_active>;
	pinctrl-1 = <&sdc1_clk_off &sdc1_cmd_off &sdc1_data_off
					&sdc1_wlan_gpio_sleep>;

	#address-cells = <0>;
	interrupt-parent = <&sdhc_1>;
	interrupts = <0 1 2>;
	#interrupt-cells = <1>;
	interrupt-map-mask = <0xffffffff>;
	interrupt-map = <0 &intc 0 210 0
			1 &intc 0 227 0
			2 &tlmm 82 0x4>;
	interrupt-names = "hc_irq", "pwr_irq", "sdiowakeup_irq";

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