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

Commit 886cf112 authored by Kyle Yan's avatar Kyle Yan Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Add mtp and cdp device trees for msmskunk" into msm-4.8

parents 5bc4406a 782dc7f7
Loading
Loading
Loading
Loading
+4 −2
Original line number Diff line number Diff line
@@ -2,8 +2,10 @@ dtb-$(CONFIG_ARCH_QCOM) += apq8016-sbc.dtb msm8916-mtp.dtb
dtb-$(CONFIG_ARCH_QCOM)	+= msm8996-mtp.dtb
dtb-$(CONFIG_ARCH_QCOM)	+= apq8096-db820c.dtb

dtb-$(CONFIG_ARCH_QCOM) += msmskunk-sim.dtb
dtb-$(CONFIG_ARCH_QCOM) += msmskunk-rumi.dtb
dtb-$(CONFIG_ARCH_MSMSKUNK) += msmskunk-sim.dtb \
	msmskunk-rumi.dtb \
	msmskunk-mtp.dtb \
	msmskunk-cdp.dtb

always		:= $(dtb-y)
subdir-y	:= $(dts-dirs)
+23 −0
Original line number Diff line number Diff line
/* Copyright (c) 2016, 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 "msmskunk.dtsi"
#include "msmskunk-cdp.dtsi"

/ {
	model = "Qualcomm Technologies, Inc. MSM skunk v1 CDP";
	compatible = "qcom,msmskunk-cdp", "qcom,msmskunk", "qcom,cdp";
	qcom,board-id = <1 0>;
};
+14 −0
Original line number Diff line number Diff line
/* Copyright (c) 2016, 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 "msmskunk-pinctrl.dtsi"
+23 −0
Original line number Diff line number Diff line
/* Copyright (c) 2016, 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 "msmskunk.dtsi"
#include "msmskunk-mtp.dtsi"

/ {
	model = "Qualcomm Technologies, Inc. MSM skunk v1 MTP";
	compatible = "qcom,msmskunk-mtp", "qcom,msmskunk", "qcom,mtp";
	qcom,board-id = <8 0>;
};
+14 −0
Original line number Diff line number Diff line
/* Copyright (c) 2016, 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 "msmskunk-pinctrl.dtsi"