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

Commit e03df10c 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 new dts for msm8939 SKUL"

parents 88505149 03f29f9d

Documentation/devicetree/bindings/arm/msm/msm.txt

+1 −0
Original line number Diff line number Diff line
@@ -168,6 +168,7 @@ compatible = "qcom,msm8936-mtp" 
compatible = "qcom,msm8939-cdp"

compatible = "qcom,msm8939-mtp"

compatible = "qcom,msm8939-qrd-skuk"

compatible = "qcom,msm8939-qrd-skul"

compatible = "qcom,msm8939-rumi"

compatible = "qcom,msm8939-sim"

compatible = "qcom,msm8960-cdp"

arch/arm/boot/dts/qcom/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -86,6 +86,7 @@ dtb-$(CONFIG_ARCH_MSM8916) += msm8916-sim.dtb \ 
	msm8939-sim.dtb \

	msm8939-rumi.dtb \

	msm8939-qrd-skuk.dtb \

	msm8939-qrd-skul.dtb \

	msm8939-cdp.dtb \

	msm8939-cdp-jdi.dtb \

	msm8939-mtp.dtb \

arch/arm/boot/dts/qcom/msm8939-qrd-skul.dts

0 → 100644
+23 −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 "msm8939.dtsi"

#include "msm8939-qrd-skul.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. MSM8939 QRD SKUL";

	compatible = "qcom,msm8939-qrd-skul", "qcom,msm8939-qrd", "qcom,msm8939", "qcom,qrd";

	qcom,board-id = <0x11000b 5>;

};

arch/arm/boot/dts/qcom/msm8939-qrd-skul.dtsi

0 → 100644
+15 −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 "msm8939-qrd-skuk.dtsi"