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

Commit 85a7ff06 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 APQ8084 v1.0 and v1.1 device trees"

parents 993a8e0d 76fdde82

arch/arm/boot/dts/qcom/Makefile

+17 −9
Original line number Diff line number Diff line
@@ -96,17 +96,25 @@ dtb-$(CONFIG_ARCH_MPQ8092) += mpq8092-sim.dtb \ 
	mpq8092-cdp.dtb \

	mpq8092-dtv.dtb \

	mpq8092-dma.dtb

dtb-$(CONFIG_ARCH_APQ8084) += apq8084-liquid.dtb \

	apq8084-smb1357-cdp.dtb \

	apq8084-smb1357-mtp.dtb \

	apq8084-smb1359-mdm9x35-alt-mtp.dtb \

dtb-$(CONFIG_ARCH_APQ8084) += apq8084-v1.0-liquid.dtb \

	apq8084-v1.1-liquid.dtb \

	apq8084-v1.0-smb1357-cdp.dtb \

	apq8084-v1.1-smb1357-cdp.dtb \

	apq8084-v1.0-smb1357-mtp.dtb \

	apq8084-v1.1-smb1357-mtp.dtb \

	apq8084-v1.0-smb1359-mdm9x35-alt-mtp.dtb \

	apq8084-v1.1-smb1359-mdm9x35-alt-mtp.dtb \

	apq8084-smb349-cdp.dtb \

	apq8084-smb349-mtp.dtb \

	apq8084-smb1357-mdm9x35-alt-rcm.dtb \

	apq8084-smb1357-mdm9x35-mtp.dtb \

	apq8084-smb1357-mdm9x35-cdp.dtb \

	apq8084-mdm9x35-alt-cdp.dtb \

	apq8084-sbc.dtb

	apq8084-v1.0-smb1357-mdm9x35-alt-rcm.dtb \

	apq8084-v1.1-smb1357-mdm9x35-alt-rcm.dtb \

	apq8084-v1.0-smb1357-mdm9x35-mtp.dtb \

	apq8084-v1.1-smb1357-mdm9x35-mtp.dtb \

	apq8084-v1.0-smb1357-mdm9x35-cdp.dtb \

	apq8084-v1.1-smb1357-mdm9x35-cdp.dtb \

	apq8084-v1.0-mdm9x35-alt-cdp.dtb \

	apq8084-v1.1-mdm9x35-alt-cdp.dtb \

	apq8084-v1.1-sbc.dtb

dtb-$(CONFIG_ARCH_MSM) += msmplutonium-sim.dtb



DTB_NAMES := $(subst $\",,$(CONFIG_BUILD_ARM_APPENDED_DTB_IMAGE_NAMES))

arch/arm/boot/dts/qcom/apq8084-liquid.dts→arch/arm/boot/dts/qcom/apq8084-v1.0-liquid.dts

+2 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2013, The Linux Foundation. All rights reserved.

/* Copyright (c) 2013-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
@@ -17,7 +17,7 @@ 
#include "apq8084-camera-sensor-liquid.dtsi"



/ {

	model = "Qualcomm APQ 8084 LIQUID";

	model = "Qualcomm APQ 8084 v1.0 LIQUID";

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

	qcom,board-id = <9 0>;

};

arch/arm/boot/dts/qcom/apq8084-mdm9x35-alt-cdp.dts→arch/arm/boot/dts/qcom/apq8084-v1.0-mdm9x35-alt-cdp.dts

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
#include "apq8084-cdp.dtsi"



/ {

	model = "Qualcomm APQ 8084, MDM9x35 ALT CDP";

	model = "Qualcomm APQ 8084 v1.0, MDM9x35 ALT CDP";

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

	qcom,board-id = <1 6>;

};

arch/arm/boot/dts/qcom/apq8084-smb1357-cdp.dts→arch/arm/boot/dts/qcom/apq8084-v1.0-smb1357-cdp.dts

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
#include "apq8084-cdp.dtsi"



/ {

	model = "Qualcomm APQ 8084, SMB1357 CDP";

	model = "Qualcomm APQ 8084 v1.0, SMB1357 CDP";

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

	qcom,board-id = <1 2>,

			<1 4>,

arch/arm/boot/dts/qcom/apq8084-smb1357-mdm9x35-alt-rcm.dts→arch/arm/boot/dts/qcom/apq8084-v1.0-smb1357-mdm9x35-alt-rcm.dts

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
#include "apq8084-cdp.dtsi"



/ {

	model = "Qualcomm APQ 8084, SMB1357 MDM9x35 ALT RCM";

	model = "Qualcomm APQ 8084 v1.0, SMB1357 MDM9x35 ALT RCM";

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

	qcom,board-id = <21 6>;

};