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

Commit 1a150345 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 support for PCI EP mode for sdx20"

parents 45ce8151 f5b190d3
Loading
Loading
Loading
Loading
+5 −1
Original line number Diff line number Diff line
@@ -179,7 +179,11 @@ dtb-$(CONFIG_ARCH_SDX20) += sdx20-emmc-cdp.dtb \
	sdx20-v2-nand-cdp.dtb \
	sdx20-v2-nand-mtp.dtb \
	sdx20-v2-nand-dualwifi-mtp.dtb \
	sdx20-v2-nand-dualwifi-cdp.dtb
	sdx20-v2-nand-dualwifi-cdp.dtb \
	sdx20-emmc-pcie-ep-mtp.dtb \
	sdx20-nand-pcie-ep-mtp.dtb \
	sdx20-v2-emmc-pcie-ep-mtp.dtb \
	sdx20-v2-nand-pcie-ep-mtp.dtb

dtb-$(CONFIG_ARCH_MSM8937) += msm8937-rumi.dtb \
	msm8937-pmi8950-cdp.dtb \
+54 −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 "sdx20-mtp.dtsi"

/ {
	model = "Qualcomm Technologies, Inc. SDX20 PCIE EP MTP (eMMC)";
	compatible = "qcom,sdx20-mtp", "qcom,sdx20",
		     "qcom,mtp";
	qcom,board-id = <8 0x00030004>, <8 0x00030104>;

	qcom,rmtfs_sharedmem@0 {
		compatible = "qcom,sharedmem-uio";
		reg = <0x0 0x00100000>;
		reg-names = "rmtfs";
		qcom,client-id = <0x00000001>;
	};
};

&qnand_1 {
	status = "disabled";
};

&sdhc_1 {
	vdd-supply = <&sdc_vreg>;

	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
			  200000000>;
	qcom,devfreq,freq-table = <50000000 200000000>;
	qcom,bus-speed-mode = "HS200_1p8v", "DDR_1p8v";
	qcom,nonremovable;

	status = "ok";
};
+43 −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 "sdx20-mtp.dtsi"

/ {
	model = "Qualcomm Technologies, Inc. SDX20 PCIE EP MTP (NAND)";
	compatible = "qcom,sdx20-mtp", "qcom,sdx20",
		     "qcom,mtp";
	qcom,board-id = <8 4>, <8 0x104>;
};

&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>;
	qcom,devfreq,freq-table = <50000000 200000000>;

	/* TODO: Add card detect GPIO */

	status = "ok";
};
+55 −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 "sdx20-mtp.dtsi"
#include "sdx20-v2.dtsi"

/ {
	model = "Qualcomm Technologies, Inc. SDX20 V2 PCIE EP MTP (eMMC)";
	compatible = "qcom,sdx20-mtp", "qcom,sdx20",
		     "qcom,mtp";
	qcom,board-id = <8 0x00030004>, <8 0x00030104>;

	qcom,rmtfs_sharedmem@0 {
		compatible = "qcom,sharedmem-uio";
		reg = <0x0 0x00100000>;
		reg-names = "rmtfs";
		qcom,client-id = <0x00000001>;
	};
};

&qnand_1 {
	status = "disabled";
};

&sdhc_1 {
	vdd-supply = <&sdc_vreg>;

	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
			  200000000>;
	qcom,devfreq,freq-table = <50000000 200000000>;
	qcom,bus-speed-mode = "HS200_1p8v", "DDR_1p8v";
	qcom,nonremovable;

	status = "ok";
};
+44 −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 "sdx20-mtp.dtsi"
#include "sdx20-v2.dtsi"

/ {
	model = "Qualcomm Technologies, Inc. SDX20 V2 PCIE EP MTP (NAND)";
	compatible = "qcom,sdx20-mtp", "qcom,sdx20",
		     "qcom,mtp";
	qcom,board-id = <8 4>, <8 0x104>;
};

&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>;
	qcom,devfreq,freq-table = <50000000 200000000>;

	/* TODO: Add card detect GPIO */

	status = "ok";
};