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

Commit 2ff06bd4 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: 8x26: add support for 1080p panel boards"

parents 05b9885c e8394881

arch/arm/boot/dts/Makefile

+12 −6
Original line number Diff line number Diff line
@@ -130,12 +130,16 @@ dtb-$(CONFIG_ARCH_MSM8226) += msm8226-sim.dtb \ 
	msm8226-v1-mtp.dtb \

	msm8226-v1-qrd-evt.dtb \

	msm8226-v1-qrd-dvt.dtb \

	msm8226-v2-cdp.dtb \

	msm8226-v2-mtp.dtb \

	msm8226-v2-720p-cdp.dtb \

	msm8226-v2-1080p-cdp.dtb \

	msm8226-v2-720p-mtp.dtb \

	msm8226-v2-1080p-mtp.dtb \

	msm8226-v2-qrd-evt.dtb \

	msm8226-v2-qrd-dvt.dtb \

	msm8926-cdp.dtb \

	msm8926-mtp.dtb \

	msm8926-720p-cdp.dtb \

	msm8926-1080p-cdp.dtb \

	msm8926-720p-mtp.dtb \

	msm8926-1080p-mtp.dtb \

	msm8926-qrd.dtb \

	msm8926-qrd-skug.dtb \

	msm8226-v1-qrd-skuf.dtb \
@@ -144,8 +148,10 @@ dtb-$(CONFIG_ARCH_MSM8226) += msm8226-sim.dtb \ 
	apq8026-v1-cdp.dtb \

	apq8026-v1-mtp.dtb \

	apq8026-v2-xpm.dtb \

	apq8026-v2-cdp.dtb \

	apq8026-v2-mtp.dtb

	apq8026-v2-720p-cdp.dtb \

	apq8026-v2-1080p-cdp.dtb \

	apq8026-v2-720p-mtp.dtb \

	apq8026-v2-1080p-mtp.dtb

dtb-$(CONFIG_ARCH_MSM8610) += msm8610-rumi.dtb \

	msm8610-v1-cdp.dtb \

	msm8610-v2-cdp.dtb \

arch/arm/boot/dts/apq8026-v1-cdp.dts

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 


/dts-v1/;

/include/ "apq8026-v1.dtsi"

/include/ "msm8226-cdp.dtsi"

/include/ "msm8226-720p-cdp.dtsi"



/ {

	model = "Qualcomm APQ 8026 CDP";

arch/arm/boot/dts/apq8026-v1-mtp.dts

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 


/dts-v1/;

/include/ "apq8026-v1.dtsi"

/include/ "msm8226-mtp.dtsi"

/include/ "msm8226-720p-mtp.dtsi"



/ {

	model = "Qualcomm APQ 8026 MTP";

arch/arm/boot/dts/apq8026-v1-xpm.dts

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 


/dts-v1/;

/include/ "apq8026-v1.dtsi"

/include/ "msm8226-cdp.dtsi"

/include/ "msm8226-720p-cdp.dtsi"



/ {

	model = "Qualcomm APQ 8026 XPM";

arch/arm/boot/dts/apq8026-v2-1080p-cdp.dts

0 → 100644
+22 −0
Original line number Diff line number Diff line 
/* Copyright (c) 2013, 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/ "apq8026-v2.dtsi"

/include/ "msm8226-1080p-cdp.dtsi"



/ {

	model = "Qualcomm APQ 8026v2 CDP";

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

	qcom,board-id = <1 2>;

};