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

Commit 68c9d68d 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 initial support for mdmcalifornium CCARD board"

parents ea2d4e4c f48d1fb1
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -159,7 +159,8 @@ dtb-$(CONFIG_ARCH_MDMCALIFORNIUM) += mdmcalifornium-sim.dtb \
	mdmcalifornium-v1.1-nand-cdp.dtb \
	mdmcalifornium-v1.1-emmc-mtp.dtb \
	mdmcalifornium-v1.1-nand-mtp.dtb \
	mdmcalifornium-v1.1-nand-dualwifi-mtp.dtb
	mdmcalifornium-v1.1-nand-dualwifi-mtp.dtb \
	mdmcalifornium-v1.1-nand-ccard.dtb

dtb-$(CONFIG_ARCH_SDXHEDGEHOG) += sdxhedgehog-emmc-cdp.dtb \
	sdxhedgehog-emmc-mtp.dtb \
+15 −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.
 */

#include <dt-bindings/interrupt-controller/irq.h>
#include "mdmcalifornium-v1.1.dtsi"
#include "mdmcalifornium-pinctrl.dtsi"
+22 −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 "mdmcalifornium-ccard.dtsi"

/ {
	model = "Qualcomm Technologies, Inc. MDM CALIFORNIUM v1.1 CCARD (NAND)";
	compatible = "qcom,mdmcalifornium-mtp", "qcom,mdmcalifornium",
		     "qcom,mtp";
	qcom,board-id = <8 0x6>, <8 0x106>;
};