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

Commit 3dedc09b 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 MSM8909 PM8916 qHD RCM variants"

parents 6bb62915 2c9963be

arch/arm/boot/dts/qcom/Makefile

+2 −3
Original line number Diff line number Diff line
@@ -43,14 +43,14 @@ dtb-$(CONFIG_ARCH_MSM8909) += msm8909-sim.dtb \ 
	msm8909-1gb-qrd-skue.dtb \

	msm8909-1gb-cdp.dtb \

	msm8909-1gb-mtp.dtb \

	msm8909-rcm.dtb \

	msm8909-1gb-rcm.dtb \

	msm8909-pm8916-1gb-rcm.dtb \

	msm8909-pm8916-rcm.dtb \

	msm8909-pm8916-mtp.dtb \

	msm8909-pm8916-cdp.dtb \

	msm8909-qhd-cdp.dtb \

	msm8909-qhd-rcm.dtb \

	msm8909-pm8916-1gb-qhd-rcm.dtb \

	msm8909-pm8916-qhd-rcm.dtb \

	msm8208-cdp.dtb \

	msm8208-mtp.dtb \

	msm8208-1gb-cdp.dtb \
@@ -61,7 +61,6 @@ dtb-$(CONFIG_ARCH_MSM8909) += msm8909-sim.dtb \ 
	msm8208-1gb-qrd-skua.dtb \

	msm8208-1gb-qrd-skuc.dtb \

	msm8208-1gb-qrd-skue.dtb \

	msm8208-rcm.dtb \

	msm8208-1gb-rcm.dtb \

	msm8208-qhd-cdp.dtb \

	msm8208-qhd-rcm.dtb

arch/arm/boot/dts/qcom/msm8909-pm8916-rcm.dts→arch/arm/boot/dts/qcom/msm8909-pm8916-1gb-qhd-rcm.dts

+3 −3
Original line number Diff line number Diff line
@@ -14,11 +14,11 @@ 
/dts-v1/;



#include "msm8909-cdp.dtsi"

#include "msm8909-pm8916.dtsi"

#include "msm8909-pm8916-cdp.dtsi"

#include "msm8909-gpu-qhd.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. MSM8909-PM8916 512MB RCM";

	model = "Qualcomm Technologies, Inc. MSM8909-PM8916 1GB QHD RCM";

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

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

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

};

arch/arm/boot/dts/qcom/msm8909-pm8916-1gb-rcm.dts

+1 −2
Original line number Diff line number Diff line
@@ -14,11 +14,10 @@ 
/dts-v1/;



#include "msm8909-cdp.dtsi"

#include "msm8909-pm8916.dtsi"

#include "msm8909-pm8916-cdp.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. MSM8909-PM8916 1GB RCM";

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

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

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

};

arch/arm/boot/dts/qcom/msm8208-rcm.dts→arch/arm/boot/dts/qcom/msm8909-pm8916-qhd-rcm.dts

+5 −6
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2014, The Linux Foundation. All rights reserved.

 * Copyright (c) 2015, 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
@@ -14,12 +14,11 @@ 
/dts-v1/;



#include "msm8909-cdp.dtsi"

#include "msm8909-pm8909.dtsi"

#include "msm8909-pm8909-cdp.dtsi"

#include "msm8208.dtsi"

#include "msm8909-pm8916-cdp.dtsi"

#include "msm8909-gpu-qhd.dtsi"



/ {

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

	model = "Qualcomm Technologies, Inc. MSM8909-PM8916 512MB QHD RCM";

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

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

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

};

arch/arm/boot/dts/qcom/msm8909-rcm.dts

deleted100644 → 0
+0 −28
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 RCM";

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

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

};



&blsp1_uart1 {

	status = "disabled";

};