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

Commit 97e8fbf6 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: match apq8026-w and msm8226-w with proper device tree"

parents f93dec93 6e6b89c7

arch/arm/boot/dts/qcom/Makefile

+5 −9
Original line number Diff line number Diff line
@@ -47,13 +47,11 @@ dtb-$(CONFIG_ARCH_MSM8226) += msm8226-sim.dtb \ 
	msm8226-v1-qrd-evt.dtb \

	msm8226-v1-qrd-dvt.dtb \

	msm8226-v2-720p-cdp.dtb \

	msm8226-v2-720p-w-cdp.dtb \

	msm8226-v2-320p-w-cdp.dtb \

	msm8226-v2-1080p-cdp.dtb \

	msm8226-v2-1080p-w-cdp.dtb \

	msm8226-v2-720p-mtp.dtb \

	msm8226-v2-720p-w-mtp.dtb \

	msm8226-v2-320p-w-mtp.dtb \

	msm8226-v2-1080p-mtp.dtb \

	msm8226-v2-1080p-w-mtp.dtb \

	msm8226-v2-qrd-evt.dtb \

	msm8226-v2-qrd-dvt.dtb \

	msm8926-v1-720p-cdp.dtb \
@@ -80,13 +78,11 @@ dtb-$(CONFIG_ARCH_MSM8226) += msm8226-sim.dtb \ 
	apq8026-v1-w-mtp.dtb \

	apq8026-v2-xpm.dtb \

	apq8026-v2-720p-cdp.dtb \

	apq8026-v2-720p-w-cdp.dtb \

	apq8026-v2-320p-w-cdp.dtb \

	apq8026-v2-1080p-cdp.dtb \

	apq8026-v2-1080p-w-cdp.dtb \

	apq8026-v2-720p-mtp.dtb \

	apq8026-v2-720p-w-mtp.dtb \

	apq8026-v2-1080p-mtp.dtb \

	apq8026-v2-1080p-w-mtp.dtb

	apq8026-v2-320p-w-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/qcom/apq8026-v2-1080p-w-cdp.dts

deleted100644 → 0
+0 −38
Original line number Diff line number Diff line 
/* Copyright (c) 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

 * 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-w-memory.dtsi"

#include "msm8226-w-qseecom.dtsi"

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

#include "msm8x26w-gpu.dts"



/ {

	model = "Qualcomm Technologies, Inc. APQ 8026v2W CDP";

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

	qcom,board-id = <1 4>;

};



&mdss_fb0 {

	/* cont_splash memory*/

	qcom,memblock-reserve = <0x04200000 0x64000>;

};



&mdss_dsi0 {

	qcom,dsi-pref-prim-pan = <&dsi_nt35590_qvga_cmd>;

};



&dsi_nt35590_qvga_cmd {

	qcom,cont-splash-enabled;

};

arch/arm/boot/dts/qcom/apq8026-v2-1080p-w-mtp.dts

deleted100644 → 0
+0 −37
Original line number Diff line number Diff line 
/* Copyright (c) 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

 * 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-w-memory.dtsi"

#include "msm8226-1080p-mtp.dtsi"

#include "msm8226-w-qseecom.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. APQ 8026v2W MTP";

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

	qcom,board-id = <8 4>;

};



&mdss_fb0 {

	/* cont_splash memory*/

	qcom,memblock-reserve = <0x04200000 0x64000>;

};



&mdss_dsi0 {

	qcom,dsi-pref-prim-pan = <&dsi_nt35590_qvga_cmd>;

};



&dsi_nt35590_qvga_cmd {

	qcom,cont-splash-enabled;

};