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

Commit b17385ed 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 new samarium variants"

parents ed890a38 206ecb9c

arch/arm/boot/dts/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -161,7 +161,9 @@ dtb-$(CONFIG_ARCH_MSMKRYPTON) += msmkrypton-sim.dtb 
dtb-$(CONFIG_ARCH_MSMSAMARIUM) += msmsamarium-sim.dtb \

	msmsamarium-rumi.dtb \

	msmsamarium-cdp-interposer.dtb \

	msmsamarium-cdp.dtb

	msmsamarium-cdp.dtb \

	msmsamarium-mtp.dtb \

	apqsamarium-mtp.dtb

dtb-$(CONFIG_ARCH_MPQ8092) += mpq8092-sim.dtb \

	mpq8092-rumi.dtb

dtb-$(CONFIG_ARCH_APQ8084) += apq8084-sim.dtb \

arch/arm/boot/dts/apqsamarium-mtp.dts

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

/include/ "msmsamarium-mtp.dtsi"



/ {

	model = "Qualcomm APQ SAMARIUM MTP";

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

	qcom,board-id = <8 0>;

};

arch/arm/boot/dts/apqsamarium.dtsi

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

 */



/*

 * Only samarium APQ-specific property overrides should be placed inside this

 * file. Device definitions should be placed inside the msmsamarium.dtsi file.

 */



/include/ "msmsamarium.dtsi"



/ {

	model = "Qualcomm APQ SAMARIUM";

	compatible = "qcom,apqsamarium";

	qcom,msm-id = <197 0>;

};

arch/arm/boot/dts/msmsamarium-mtp.dts

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

/include/ "msmsamarium-mtp.dtsi"



/ {

	model = "Qualcomm MSM SAMARIUM MTP";

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

	qcom,board-id = <8 0>;

};

arch/arm/boot/dts/msmsamarium-mtp.dtsi

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

*/



/ {

	aliases {

		serial0 = &blsp1_uart1;

	};

};



&soc {

};



&blsp1_uart1 {

	status = "ok";

};