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

Commit 0efd628e 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: Split 8994-v2.0 and 8994-v2.1 device trees"

parents bbf37047 429b4672
Loading
Loading
Loading
Loading
+22 −11
Original line number Original line Diff line number Diff line
@@ -238,17 +238,28 @@ dtb-$(CONFIG_ARCH_MSM8994) += msm8994-v1-sim.dtb \
	apq8094-v1-fluid.dtb \
	apq8094-v1-fluid.dtb \
	apq8094-v1-dragonboard.dtb \
	apq8094-v1-dragonboard.dtb \
	msm8994-v2-sim.dtb \
	msm8994-v2-sim.dtb \
	msm8994-v2-cdp.dtb \
	msm8994-v2.0-cdp.dtb \
	msm8994-pmi8994-pm8004-v2-cdp.dtb \
	msm8994-pmi8994-pm8004-v2.0-cdp.dtb \
	msm8994-v2-mtp.dtb \
	msm8994-v2.0-mtp.dtb \
	msm8994-pmi8994-pm8004-v2-mtp.dtb \
	msm8994-pmi8994-pm8004-v2.0-mtp.dtb \
	msm8994-v2-liquid.dtb \
	msm8994-v2.0-liquid.dtb \
	msm8994-v2-fluid.dtb \
	msm8994-v2.0-fluid.dtb \
	apq8094-v2-cdp.dtb \
	apq8094-v2.0-cdp.dtb \
	apq8094-v2-mtp.dtb \
	apq8094-v2.0-mtp.dtb \
	apq8094-v2-liquid.dtb \
	apq8094-v2.0-liquid.dtb \
	apq8094-v2-fluid.dtb \
	apq8094-v2.0-fluid.dtb \
	apq8094-v2-dragonboard.dtb
	apq8094-v2.0-dragonboard.dtb \
	msm8994-v2.1-mtp.dtb \
	msm8994-v2.1-cdp.dtb \
	msm8994-v2.1-liquid.dtb \
	msm8994-v2.1-fluid.dtb \
	msm8994-pmi8994-pm8004-v2.1-cdp.dtb \
	msm8994-pmi8994-pm8004-v2.1-mtp.dtb \
	apq8094-v2.1-cdp.dtb \
	apq8094-v2.1-mtp.dtb \
	apq8094-v2.1-liquid.dtb \
	apq8094-v2.1-fluid.dtb \
	apq8094-v2.1-dragonboard.dtb


dtb-$(CONFIG_ARCH_MSM8992) += msm8992-sim.dtb \
dtb-$(CONFIG_ARCH_MSM8992) += msm8992-sim.dtb \
	msm8992-rumi.dtb \
	msm8992-rumi.dtb \
+3 −3
Original line number Original line Diff line number Diff line
/* Copyright (c) 2014, The Linux Foundation. All rights reserved.
/* Copyright (c) 2014-2015, The Linux Foundation. All rights reserved.
 *
 *
 * This program is free software; you can redistribute it and/or modify
 * 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
 * it under the terms of the GNU General Public License version 2 and
@@ -13,11 +13,11 @@


/dts-v1/;
/dts-v1/;


#include "apq8094-v2.dtsi"
#include "apq8094-v2.0.dtsi"
#include "msm8994-cdp.dtsi"
#include "msm8994-cdp.dtsi"


/ {
/ {
	model = "Qualcomm Technologies, Inc. APQ8094v2 CDP";
	model = "Qualcomm Technologies, Inc. APQ8094v2.0 CDP";
	compatible = "qcom,apq8094-cdp", "qcom,apq8094", "qcom,cdp";
	compatible = "qcom,apq8094-cdp", "qcom,apq8094", "qcom,cdp";
	qcom,board-id = <1 0>;
	qcom,board-id = <1 0>;
};
};
+3 −3
Original line number Original line Diff line number Diff line
/* Copyright (c) 2014, The Linux Foundation. All rights reserved.
/* Copyright (c) 2014-2015, The Linux Foundation. All rights reserved.
 *
 *
 * This program is free software; you can redistribute it and/or modify
 * 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
 * it under the terms of the GNU General Public License version 2 and
@@ -13,11 +13,11 @@


/dts-v1/;
/dts-v1/;


#include "apq8094-v2.dtsi"
#include "apq8094-v2.0.dtsi"
#include "apq8094-dragonboard.dtsi"
#include "apq8094-dragonboard.dtsi"


/ {
/ {
	model = "Qualcomm Technologies, Inc. APQ8094 Dragonboard";
	model = "Qualcomm Technologies, Inc. APQ8094v2.0 Dragonboard";
	compatible = "qcom,apq8094-dragonboard", "qcom,apq8094", "qcom,dragonboard";
	compatible = "qcom,apq8094-dragonboard", "qcom,apq8094", "qcom,dragonboard";
	qcom,board-id = <10 0>;
	qcom,board-id = <10 0>;
};
};
+3 −3
Original line number Original line Diff line number Diff line
/* Copyright (c) 2014, The Linux Foundation. All rights reserved.
/* Copyright (c) 2014-2015, The Linux Foundation. All rights reserved.
 *
 *
 * This program is free software; you can redistribute it and/or modify
 * 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
 * it under the terms of the GNU General Public License version 2 and
@@ -13,11 +13,11 @@


/dts-v1/;
/dts-v1/;


#include "apq8094-v2.dtsi"
#include "apq8094-v2.0.dtsi"
#include "msm8994-fluid.dtsi"
#include "msm8994-fluid.dtsi"


/ {
/ {
	model = "Qualcomm Technologies, Inc. APQ8094v2 FLUID";
	model = "Qualcomm Technologies, Inc. APQ8094v2.0 FLUID";
	compatible = "qcom,apq8094-fluid", "qcom,apq8094", "qcom,fluid";
	compatible = "qcom,apq8094-fluid", "qcom,apq8094", "qcom,fluid";
	qcom,board-id = <3 0>;
	qcom,board-id = <3 0>;
};
};
+3 −3
Original line number Original line Diff line number Diff line
/* Copyright (c) 2014, The Linux Foundation. All rights reserved.
/* Copyright (c) 2014-2015, The Linux Foundation. All rights reserved.
 *
 *
 * This program is free software; you can redistribute it and/or modify
 * 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
 * it under the terms of the GNU General Public License version 2 and
@@ -13,12 +13,12 @@


/dts-v1/;
/dts-v1/;


#include "apq8094-v2.dtsi"
#include "apq8094-v2.0.dtsi"
#include "msm8994-liquid.dtsi"
#include "msm8994-liquid.dtsi"
#include "msm8994-camera-sensor-liquid.dtsi"
#include "msm8994-camera-sensor-liquid.dtsi"


/ {
/ {
	model = "Qualcomm Technologies, Inc. APQ8094v2 LIQUID";
	model = "Qualcomm Technologies, Inc. APQ8094v2.0 LIQUID";
	compatible = "qcom,apq8094-liquid", "qcom,apq8094", "qcom,liquid";
	compatible = "qcom,apq8094-liquid", "qcom,apq8094", "qcom,liquid";
	qcom,board-id = <9 0>;
	qcom,board-id = <9 0>;
};
};
Loading