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

Commit d5fcbf32 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: re-structure fsm9900 dts files"

parents 0d91a6c3 520278a7

arch/arm/boot/dts/qcom/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -102,7 +102,8 @@ dtb-$(CONFIG_ARCH_MSM8610) += msm8610-rumi.dtb \ 
dtb-$(CONFIG_ARCH_FSM9900) += fsm9900-rumi.dtb \

	fsm9900-sim.dtb \

	fsm9900-cdp.dtb \

	fsm9900-mtp.dtb

	fsm9900-mtp-v1.0.dtb \

	fsm9900-mtp-v1.1.dtb

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

	mdm9630-v1-cdp.dtb \

	mdm9630-v1-mtp.dtb \

arch/arm/boot/dts/qcom/fsm9900-cdp.dts

+1 −55
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 


/dts-v1/;



#include "fsm9900.dtsi"

#include "fsm9900-cdp.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. FSM9900 CDP";
@@ -25,58 +25,4 @@ 
		      <193 0x10000>;

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



	aliases {

		serial0 = &uart0;

	};

};



&soc {

	uart0: serial@f9960000 {

		status = "ok";

	};



	uim0: qcom,uim@f995d000 {

		status = "ok";

		qcom,uim-1v8;

	};



	qcom,wdt@f9017000 {

		status = "disabled";

	};



	qcom,qfpfuse@fc4b8000 {

		status = "ok";

		vdd-blow-supply = <&pma8084_lvs1>;

	};



	emac1:qcom,emac@feb00000 {

		status = "ok";

	};



	pcie0: qcom,pcie@fc520000 {

		qcom,ext-ref-clk;

		status = "ok";

	};



	pcie1: qcom,pcie@fc528000 {

		qcom,ext-ref-clk;

		status = "ok";

	};

};



&sdhc_1 {

	vdd-supply = <&pma8084_l20>;

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

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



	vdd-io-supply = <&pma8084_s4>;

	qcom,vdd-io-always-on;

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

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



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

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

	qcom,nonremovable;



	status = "ok";

};

arch/arm/boot/dts/qcom/fsm9900-cdp.dtsi

0 → 100644
+70 −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.

 */



#include "fsm9900.dtsi"



/ {

	aliases {

		serial0 = &uart0;

	};

};



&soc {

	uart0: serial@f9960000 {

		status = "ok";

	};



	uim0: qcom,uim@f995d000 {

		status = "ok";

		qcom,uim-1v8;

	};



	qcom,wdt@f9017000 {

		status = "disabled";

	};



	qcom,qfpfuse@fc4b8000 {

		status = "ok";

		vdd-blow-supply = <&pma8084_lvs1>;

	};



	emac1:qcom,emac@feb00000 {

		status = "ok";

	};



	pcie0: qcom,pcie@fc520000 {

		qcom,ext-ref-clk;

		status = "ok";

	};



	pcie1: qcom,pcie@fc528000 {

		qcom,ext-ref-clk;

		status = "ok";

	};

};



&sdhc_1 {

	vdd-supply = <&pma8084_l20>;

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

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



	vdd-io-supply = <&pma8084_s4>;

	qcom,vdd-io-always-on;

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

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



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

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

	qcom,nonremovable;



	status = "ok";

};

arch/arm/boot/dts/qcom/fsm9900-mtp-v1.0.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 "fsm9900-mtp.dtsi"



/ {

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

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

	qcom,msm-id = <188 0x10000>,

		      <189 0x10000>,

		      <190 0x10000>,

		      <191 0x10000>,

		      <192 0x10000>,

		      <193 0x10000>;

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

};



&soc {

	pcie0: qcom,pcie@fc520000 {

		qcom,ext-ref-clk;

	};



	pcie1: qcom,pcie@fc528000 {

		qcom,ext-ref-clk;

	};



	emac1:qcom,emac@feb00000 {

		qcom,no-external-phy;

	};

};

arch/arm/boot/dts/qcom/fsm9900-mtp-v1.1.dts

0 → 100644
+33 −0
Original line number Diff line number Diff line 
/* Copyright (c) 2013-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 "fsm9900-mtp.dtsi"



/ {

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

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

	qcom,msm-id = <188 0x10000>,

		      <189 0x10000>,

		      <190 0x10000>,

		      <191 0x10000>,

		      <192 0x10000>,

		      <193 0x10000>;

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

};



&soc {

	emac1:qcom,emac@feb00000 {

		qcom,no-external-phy;

	};

};