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

Commit 3650b9f1 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 the CDP and MTP dt files for mdmcalifornium"

parents 714ab4bb 755d1225
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -236,3 +236,5 @@ compatible = "qcom,mdmfermium-cdp"
compatible = "qcom,mdmfermium-mtp"
compatible = "qcom,mdmcalifornium-rumi"
compatible = "qcom,mdmcalifornium-sim"
compatible = "qcom,mdmcalifornium-cdp"
compatible = "qcom,mdmcalifornium-mtp"
+5 −1
Original line number Diff line number Diff line
@@ -44,8 +44,12 @@ dtb-$(CONFIG_ARCH_MDM9640) += mdm9640-sim.dtb \
	mdm9640-emmc-cdp.dtb \
	mdm9640-nand-cdp.dtb \
	mdm9640-mtp.dtb

dtb-$(CONFIG_ARCH_MDMCALIFORNIUM) += mdmcalifornium-sim.dtb \
	mdmcalifornium-rumi.dtb
	mdmcalifornium-rumi.dtb \
	mdmcalifornium-emmc-cdp.dtb \
	mdmcalifornium-nand-cdp.dtb \
	mdmcalifornium-mtp.dtb

dtb-$(CONFIG_ARCH_MSMTHORIUM) += msmthorium-rumi.dtb

+27 −0
Original line number Diff line number Diff line
/* Copyright (c) 2015, 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 "mdmcalifornium.dtsi"
#include "mdmcalifornium-pinctrl.dtsi"

&blsp1_uart3 {
	status = "ok";
	pinctrl-names = "default";
	pinctrl-0 = <&uart3_console_active>;
};

&blsp1_uart2 {
	status = "ok";
	pinctrl-names = "default";
	pinctrl-0 = <&uart2_console_active>;

};
+22 −0
Original line number Diff line number Diff line
/* Copyright (c) 2015, 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 "mdmcalifornium-cdp.dtsi"

/ {
	model = "Qualcomm Technologies, Inc. MDM CALIFORNIUM CDP";
	compatible = "qcom,mdmcalifornium-cdp", "qcom,mdmcalifornium",
		     "qcom,cdp";
	qcom,board-id = <1 0x00030000>;
};
+22 −0
Original line number Diff line number Diff line
/* Copyright (c) 2015, 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 "mdmcalifornium-mtp.dtsi"

/ {
	model = "Qualcomm Technologies, Inc. MDM CALIFORNIUM MTP";
	compatible = "qcom,mdmcalifornium-mtp", "qcom,mdmcalifornium",
		     "qcom,mtp";
	qcom,board-id = <8 0>;
};
Loading