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

Commit 8e06c07b 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: apq: add apq8096 Liquid device support"

parents 97ed37d8 f8348d31

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

+4 −0
Original line number Diff line number Diff line
@@ -38,6 +38,9 @@ SoCs: 
- APQ8094

  compatible = "qcom,apq8094"



- APQ8096

  compatible = "qcom,apq8096"



- MDM9630

  compatible = "qcom,mdm9630"
@@ -130,6 +133,7 @@ compatible = "qcom,apq8094-fluid" 
compatible = "qcom,apq8094-liquid"

compatible = "qcom,apq8094-mtp"

compatible = "qcom,apq8094-dragonboard"

compatible = "qcom,apq8096-liquid"

compatible = "qcom,mdm9630-cdp"

compatible = "qcom,mdm9630-mtp"

compatible = "qcom,mdm9630-sim"

arch/arm/boot/dts/qcom/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -26,7 +26,9 @@ dtb-$(CONFIG_ARCH_MSM8996) += msm8996-v2-sim.dtb \ 
	msm8996-v2.0-pmi8994-pm8004-cdp.dtb \

	msm8996-v2.0-pmi8994-pm8004-mtp.dtb \

	msm8996-v2.0-fluid.dtb \

	msm8996-v2.0-liquid.dtb

	msm8996-v2.0-liquid.dtb \

	apq8096-v2-liquid.dtb \

	apq8096-v3-liquid.dtb



dtb-$(CONFIG_ARCH_MSMCOBALT) += msmcobalt-sim.dtb

arch/arm/boot/dts/qcom/apq8096-v2-liquid.dts

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

#include "msm8996-liquid.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. APQ 8096 v2 LiQUID";

	compatible = "qcom,apq8096-liquid", "qcom,apq8096", "qcom,liquid";

	qcom,board-id = <9 0>;

};

arch/arm/boot/dts/qcom/apq8096-v2.dtsi

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

 */



/*

 * As a general rule, only version-specific property overrides should be placed

 * inside this file. Common device definitions should be placed inside the

 * msm8996.dtsi file.

 */



#include "msm8996-v2.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. APQ 8096 v2";

	qcom,msm-id = <291 0x20001>;

};

arch/arm/boot/dts/qcom/apq8096-v3-liquid.dts

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

#include "msm8996-liquid.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. APQ 8096 v3 LiQUID";

	compatible = "qcom,apq8096-liquid", "qcom,apq8096", "qcom,liquid";

	qcom,board-id = <9 0>;

};