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

Commit 6289b1e3 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 fsm9010 cdp and mtp"

parents 80bc255a 91273a39

arch/arm/boot/dts/qcom/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -157,7 +157,9 @@ dtb-$(CONFIG_ARCH_FSM9900) += fsm9900-rumi.dtb \ 
	fsm9900-mtp-v1.0.dtb \

	fsm9900-mtp-v1.1.dtb \

	fsm9900-mtp-v2.0.dtb

dtb-$(CONFIG_ARCH_FSM9010) += fsm9010-rumi.dtb

dtb-$(CONFIG_ARCH_FSM9010) += fsm9010-rumi.dtb \

	fsm9010-v1.0-mtp.dtb  \

	fsm9010-v1.0-cdp.dtb

dtb-$(CONFIG_ARCH_MDM9630) += mdm9630-sim.dtb \

	mdm9630-v1-cdp.dtb \

	mdm9630-v1-mtp.dtb \

arch/arm/boot/dts/qcom/fsm9010-regulator.dtsi

0 → 100644
+53 −0
Original line number Diff line number Diff line 
/* Copyright (c) 2014, 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.

 */



/* Stub Regulator */

/ {

	/* PCIE1/2_0P9_VDDA; */

	stub_regulator_1v: stubr_1v {

		compatible = "qcom,stub-regulator";

		regulator-name = "stub-regulator-1v";

		regulator-min-microvolt = <1000000>;

		regulator-max-microvolt = <1000000>;

		status = "okay";

	};



	/* pcie LDO12 */

	stub_regulator_1p8v: stub_1p8v {

		compatible = "qcom,stub-regulator";

		regulator-name = "stub-regulator-1.8v";

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <1800000>;

		status = "okay";

	};

};



&soc {

	dummy_vreg: dummy_vreg {

		compatible = "regulator-fixed";

		status = "ok";

		regulator-name = "dummy_vreg";

		regulator-always-on;

	};



	gdsc_pcie_0:gdsc_pcie_0 {

		compatible = "qcom,stub-regulator";

		regulator-name = "gdsc_pcie_0";

		status = "ok";

	};



	gdsc_pcie_1:gdsc_pcie_1 {

		compatible = "qcom,stub-regulator";

		regulator-name = "gdsc_pcie_1";

		status = "ok";

	};

};

arch/arm/boot/dts/qcom/fsm9010-rumi.dts

+1 −57
Original line number Diff line number Diff line
@@ -22,16 +22,10 @@ 


&soc {

	serial@f991f000 {

		qcom,bus-speed-mode = "";

		status = "ok";

	};



	dummy_vreg: dummy_vreg {

		compatible = "regulator-fixed";

		status = "ok";

		regulator-name = "dummy_vreg";

		regulator-always-on;

	};



	qcom,qfpfuse@fc4b8000 {

		status = "ok";

		vdd-blow-supply = <&dummy_vreg>;
@@ -44,59 +38,9 @@ 
	pcie1: qcom,pcie@fc528000 {

		status = "disabled";

	};



	gdsc_pcie_0:gdsc_pcie_0 {

		compatible = "qcom,stub-regulator";

		regulator-name = "gdsc_pcie_0";

		status = "ok";

	};



	gdsc_pcie_1:gdsc_pcie_1 {

		compatible = "qcom,stub-regulator";

		regulator-name = "gdsc_pcie_1";

		status = "ok";

	};

};



&sdhc_1 {

	vdd-supply = <&dummy_vreg>;

	qcom,vdd-voltage-level = <2950000 2950000>;

	qcom,vdd-current-level = <200 500000>;



	vdd-io-supply = <&dummy_vreg>;

	qcom,vdd-io-always-on;

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

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



	qcom,clk-rates = <400000>;

	qcom,bus-speed-mode = "";

	qcom,nonremovable;



	status = "ok";

};

/* Stub Regulator */

/ {

	/* PCIE1/2_0P9_VDDA; */

	summit_l3: summit_l3 {

		compatible = "qcom,stub-regulator";

		regulator-name = "summit_l3";

		regulator-min-microvolt = <950000>;

		regulator-max-microvolt = <950000>;

		qcom,enable-time = <200>;

		qcom,pull-down-enable = <1>;

		status = "okay";

	};



	/* pcie LDO12 */

	summit_l12: summit_l12 {

		compatible = "qcom,stub-regulator";

		regulator-name = "summit_l12";

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <1800000>;

		qcom,enable-time = <500>;

		qcom,pull-down-enable = <1>;

		regulator-always-on;

		status = "okay";

	};

};

arch/arm/boot/dts/qcom/fsm9010-v1.0-cdp.dts

0 → 100644
+44 −0
Original line number Diff line number Diff line 
/* Copyright (c) 2014, 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 "fsm9010.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. FSM9010 CDP";

	compatible = "qcom,fsm9010-cdp", "qcom,fsm9010", "qcom,cdp";

	qcom,board-id = <0x00010001 0>;

};



&sdhc_1 {

	status = "ok";

};



&soc {

	serial@f991f000 {

		status = "ok";

	};



	qcom,qfpfuse@fc4b8000 {

		status = "ok";

		vdd-blow-supply = <&dummy_vreg>;

	};



	pcie0: qcom,pcie@fc520000 {

		status = "ok";

	};



	pcie1: qcom,pcie@fc528000 {

		status = "ok";

	};

};

arch/arm/boot/dts/qcom/fsm9010-v1.0-mtp.dts

0 → 100644
+41 −0
Original line number Diff line number Diff line 
/* Copyright (c) 2014, 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 "fsm9010.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. FSM9010 MTP";

	compatible = "qcom,fsm9010-mtp", "qcom,fsm9010", "qcom,mtp";

	qcom,board-id = <0x00010008 0>;

};





&soc {

	serial@f991f000 {

		status = "ok";

	};



	qcom,qfpfuse@fc4b8000 {

		status = "ok";

		vdd-blow-supply = <&dummy_vreg>;

	};



	pcie0: qcom,pcie@fc520000 {

		status = "ok";

	};



	pcie1: qcom,pcie@fc528000 {

		status = "ok";

	};

};