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

Commit 92b69a17 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: Add support for qHD panel for MSM8909"

parents a1a6fb2b 461f6290

Documentation/devicetree/bindings/arm/msm/board-id.txt

+5 −2
Original line number Diff line number Diff line
@@ -46,8 +46,11 @@ where board_id is a 32-bit integer whose bit values are defined as follows: 
    bits  7-0  = Platform Type ID



and the 'reserved' cell is a 32-bit integer whose bit values are defined as follows:

    bits 31-16 = Reserved bits

    bits 15-8  = DDR Size. For devices with DDR Size as 512MB the value is 0x1, default value as 0x0

    bits 31-13 = Reserved Bits

    bits 12-11 = Panel Detection. 00 - limit to HD, 01 - limit to 720p,

		 10 - limit to qHD, 11 - limit to FWVGA

    bits 10-8  = DDR Size. For devices with DDR Size as 512MB the value is 0x1,

		 default value as 0x0

    bits 7-0   = Platform Subtype



In the event that a given device tree is applicable to all hardware versions

arch/arm/boot/dts/qcom/Makefile

+5 −1
Original line number Diff line number Diff line
@@ -46,6 +46,8 @@ dtb-$(CONFIG_ARCH_MSM8909) += msm8909-sim.dtb \ 
	msm8909-1gb-rcm.dtb \

	msm8909-pm8916-mtp.dtb \

	msm8909-pm8916-cdp.dtb \

	msm8909-qhd-cdp.dtb \

	msm8909-qhd-rcm.dtb \

	msm8208-cdp.dtb \

	msm8208-mtp.dtb \

	msm8208-1gb-cdp.dtb \
@@ -57,7 +59,9 @@ dtb-$(CONFIG_ARCH_MSM8909) += msm8909-sim.dtb \ 
	msm8208-1gb-qrd-skuc.dtb \

	msm8208-1gb-qrd-skue.dtb \

	msm8208-rcm.dtb \

	msm8208-1gb-rcm.dtb

	msm8208-1gb-rcm.dtb \

	msm8208-qhd-cdp.dtb \

	msm8208-qhd-rcm.dtb

dtb-$(CONFIG_ARCH_MSM8916) += msm8916-sim.dtb \

	msm8916-rumi.dtb \

	msm8916-cdp.dtb \

arch/arm/boot/dts/qcom/msm8208-qhd-cdp.dts

0 → 100644
+26 −0
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 "msm8909-cdp.dtsi"

#include "msm8909-pm8909.dtsi"

#include "msm8909-pm8909-cdp.dtsi"

#include "msm8208.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. MSM8208 QHD CDP";

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

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

};

arch/arm/boot/dts/qcom/msm8208-qhd-rcm.dts

0 → 100644
+25 −0
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 "msm8909-cdp.dtsi"

#include "msm8909-pm8909.dtsi"

#include "msm8909-pm8909-cdp.dtsi"

#include "msm8208.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. MSM8208 QHD RCM";

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

	qcom,board-id= <21 0x1100>;

};

arch/arm/boot/dts/qcom/msm8909-qhd-cdp.dts

0 → 100644
+25 −0
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 "msm8909-cdp.dtsi"

#include "msm8909-pm8909.dtsi"

#include "msm8909-pm8909-cdp.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. MSM8909-PM8909 QHD CDP";

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

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

};