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

Commit 68b5ec7e 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: enable PCIe EP mode and disable PCIe RC and WiFi for MDM9650"

parents ce076ef0 1d335f11

arch/arm/boot/dts/qcom/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -164,7 +164,9 @@ dtb-$(CONFIG_ARCH_MDM9650) += mdm9650-sim.dtb \ 
	mdm9650-v1.1-nand-mtp.dtb \

	mdm9650-v1.1-nand-dualwifi-mtp.dtb \

	mdm9650-v1.1-nand-ccard.dtb \

	mdm9650-v1.1-nand-ccard-v2.dtb

	mdm9650-v1.1-nand-ccard-v2.dtb \

	mdm9650-v1.1-emmc-pcie-ep-mtp.dtb \

	mdm9650-v1.1-nand-pcie-ep-mtp.dtb



dtb-$(CONFIG_ARCH_SDX20) += sdx20-emmc-cdp.dtb \

	sdx20-emmc-mtp.dtb \

arch/arm/boot/dts/qcom/mdm9650-v1.1-emmc-pcie-ep-mtp.dts

0 → 100644
+58 −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 "mdm9650-v1.1-mtp.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. MDM 9650 v1.1 PCIE EP MTP (eMMC)";

	compatible = "qcom,mdm9650-mtp", "qcom,mdm9650",

		     "qcom,mtp";

	qcom,board-id = <8 0x00030007>, <8 0x00030107>;



	qcom,rmtfs_sharedmem@0 {

		compatible = "qcom,sharedmem-uio";

		reg = <0x0 0x00100000>;

		reg-names = "rmtfs";

		qcom,client-id = <0x00000001>;

	};

};



&sdhc_1 {

	vdd-io-supply = <&pmd9650_l6>;

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

	qcom,vdd-io-current-level = <100 200000>;



	pinctrl-names = "active", "sleep";

	pinctrl-0 = <&sdc1_clk_on &sdc1_cmd_on &sdc1_data_on>;

	pinctrl-1 = <&sdc1_clk_off &sdc1_cmd_off &sdc1_data_off>;



	qcom,bus-width = <8>;

	qcom,clk-rates = <400000 20000000 25000000 50000000 100000000>;

	qcom,bus-speed-mode = "HS200_1p8v", "DDR_1p8v";

	qcom,nonremovable;



	status = "ok";

};



&pcie_ep {

	status = "ok";

};



&pcie0 {

	status = "disabled";

};



&cnss_pcie {

	status = "disabled";

};

arch/arm/boot/dts/qcom/mdm9650-v1.1-nand-pcie-ep-mtp.dts

0 → 100644
+52 −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 "mdm9650-v1.1-mtp.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. MDM 9650 v1.1 MTP PCIE EP (NAND)";

	compatible = "qcom,mdm9650-mtp", "qcom,mdm9650",

		     "qcom,mtp";

	qcom,board-id = <8 7>, <8 0x107>;

};



&sdhc_1 {

	vdd-supply = <&sdc_vreg>;



	vdd-io-supply = <&pmd9650_l7>;

	qcom,vdd-io-voltage-level = <1800000 2848000>;

	qcom,vdd-io-current-level = <200 10000>;



	pinctrl-names = "active", "sleep";

	pinctrl-0 = <&sdc1_clk_on &sdc1_cmd_on &sdc1_data_on>;

	pinctrl-1 = <&sdc1_clk_off &sdc1_cmd_off &sdc1_data_off>;



	qcom,bus-width = <4>;

	qcom,clk-rates = <400000 20000000 25000000

			50000000 100000000 200000000>;



	status = "ok";

};



&pcie_ep {

	status = "ok";

};



&pcie0 {

	status = "disabled";

};



&cnss_pcie {

	status = "disabled";

};

arch/arm/boot/dts/qcom/mdm9650.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -513,6 +513,7 @@ 
		qcom,pcie-active-config;

		qcom,pcie-aggregated-irq;

		qcom,pcie-perst-enum;

		status = "disabled";

	};



	qcom,msm_gsi {

arch/arm/configs/mdm-perf_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -341,6 +341,8 @@ CONFIG_BUS_TOPOLOGY_ADHOC=y 
CONFIG_QPNP_POWER_ON=y

CONFIG_QPNP_REVID=y

CONFIG_SPS=y

CONFIG_EP_PCIE=y

CONFIG_EP_PCIE_HW=y

CONFIG_USB_BAM=y

CONFIG_SPS_SUPPORT_NDP_BAM=y

CONFIG_IPA=y