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

Commit 575c4bd0 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 cdp and apq8096 v3.0 devices support"

parents a24417c5 342517df

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

+1 −0
Original line number Diff line number Diff line
@@ -147,6 +147,7 @@ compatible = "qcom,apq8094-fluid" 
compatible = "qcom,apq8094-liquid"

compatible = "qcom,apq8094-mtp"

compatible = "qcom,apq8094-dragonboard"

compatible = "qcom,apq8096-cdp"

compatible = "qcom,apq8096-dragonboard"

compatible = "qcom,apq8096-liquid"

compatible = "qcom,mdm9630-cdp"

arch/arm/boot/dts/qcom/Makefile

+18 −2
Original line number Diff line number Diff line
@@ -32,10 +32,26 @@ dtb-$(CONFIG_ARCH_MSM8996) += msm8996-v2-pmi8994-cdp.dtb \ 
	msm8996-v3.0-fluid.dtb \

	msm8996-v3.0-liquid.dtb \

	msm8996-v3.0-dtp.dtb \

	apq8096-v2-pmi8994-cdp.dtb \

	apq8096-v2-pmi8994-pmk8001-cdp.dtb \

	apq8096-v2-pmi8994-pm8004-cdp.dtb \

	apq8096-v2-pmi8994-pm8004-pmk8001-cdp.dtb \

	apq8096-v2-liquid.dtb \

	apq8096-v3-liquid.dtb \

	apq8096-v2-dragonboard.dtb \

	apq8096-v3-dragonboard.dtb

	apq8096-v3-pmi8994-cdp.dtb \

	apq8096-v3-pmi8994-pmk8001-cdp.dtb \

	apq8096-v3-pmi8994-pm8004-cdp.dtb \

	apq8096-v3-pmi8994-pm8004-pmk8001-cdp.dtb \

	apq8096-v3-pmi8996-cdp.dtb \

	apq8096-v3-liquid.dtb \

	apq8096-v3-dragonboard.dtb \

	apq8096-v3.0-pmi8994-cdp.dtb \

	apq8096-v3.0-pmi8994-pm8004-cdp.dtb \

	apq8096-v3.0-pmi8994-pm8004-pmk8001-cdp.dtb \

	apq8096-v3.0-pmi8994-pmk8001-cdp.dtb \

	apq8096-v3.0-pmi8996-cdp.dtb \

	apq8096-v3.0-liquid.dtb \

	apq8096-v3.0-dragonboard.dtb



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

	msmcobalt-rumi.dtb

arch/arm/boot/dts/qcom/apq8096-v2-pmi8994-cdp.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-cdp.dtsi"



/ {

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

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

	qcom,board-id = <1 0>, <0x01000001 0>;

};

arch/arm/boot/dts/qcom/apq8096-v2-pmi8994-pm8004-cdp.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-pm8994-pmi8994-pm8004.dtsi"

#include "msm8996-cdp.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. APQ 8096 v2 + PMI8994 + PM8004 CDP";

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

	qcom,board-id = <1 0>, <0x01000001 0>;

};

arch/arm/boot/dts/qcom/apq8096-v2-pmi8994-pm8004-pmk8001-cdp.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-pm8994-pmi8994-pm8004-pmk8001.dtsi"

#include "msm8996-cdp.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. APQ 8096 v2 + PMI8994 + PM8004 + PMK8001 CDP";

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

	qcom,board-id = <1 0>;

};