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

Commit 54ee6ef4 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 msm8926 v2"

parents 529b9fe6 b5ce1f3e

arch/arm/boot/dts/qcom/Makefile

+16 −7
Original line number Diff line number Diff line
@@ -40,13 +40,22 @@ dtb-$(CONFIG_ARCH_MSM8226) += msm8226-sim.dtb \ 
	msm8226-v2-1080p-mtp.dtb \

	msm8226-v2-qrd-evt.dtb \

	msm8226-v2-qrd-dvt.dtb \

	msm8926-720p-cdp.dtb \

	msm8926-1080p-cdp.dtb \

	msm8926-720p-mtp.dtb \

	msm8926-1080p-mtp.dtb \

	msm8926-qrd.dtb \

	msm8926-qrd-skug.dtb \

	msm8926-qrd-skug-pvt.dtb \

	msm8926-v1-720p-cdp.dtb \

	msm8926-v1-1080p-cdp.dtb \

	msm8926-v1-720p-mtp.dtb \

	msm8926-v1-1080p-mtp.dtb \

	msm8926-v1-qrd.dtb \

	msm8926-v1-qrd-skug.dtb \

	msm8926-v1-qrd-skug-pvt.dtb \

	msm8926-v2-720p-cdp.dtb \

	msm8926-v2-1080p-cdp.dtb \

	msm8926-v2-1080p-ext-buck-cdp.dtb \

	msm8926-v2-720p-mtp.dtb \

	msm8926-v2-1080p-mtp.dtb \

	msm8926-v2-1080p-ext-buck-mtp.dtb \

	msm8926-v2-qrd.dtb \

	msm8926-v2-qrd-skug.dtb \

	msm8926-v2-qrd-skug-pvt.dtb \

	msm8226-v1-qrd-skuf.dtb \

	msm8226-v2-qrd-skuf.dtb \

	apq8026-v1-xpm.dtb \

arch/arm/boot/dts/qcom/msm8926-qrd-skug.dtsi

+0 −1
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ 
 * GNU General Public License for more details.

 */



#include "msm8926.dtsi"

#include "msm8226-qrd.dtsi"

#include "msm8926-camera-sensor-qrd.dtsi"

arch/arm/boot/dts/qcom/msm8926-v1-1080p-cdp.dts

0 → 100644
+38 −0
Original line number Diff line number Diff line 
/* 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

 * 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 "msm8926-v1.dtsi"

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

#include "msm8226-camera-sensor-cdp.dtsi"



/ {

	model = "Qualcomm MSM 8926 CDP";

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

	qcom,board-id = <1 2>;

};



&pm8226_chg {

	status = "ok";

	qcom,charging-disabled;

	qcom,use-default-batt-values;



	qcom,bat-if@1200 {

		status = "disabled";

	};



};



&hsic_host {

	status = "ok";

};

arch/arm/boot/dts/qcom/msm8926-1080p-mtp.dts→arch/arm/boot/dts/qcom/msm8926-v1-1080p-mtp.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
@@ -12,7 +12,7 @@ 




/dts-v1/;

#include "msm8926.dtsi"

#include "msm8926-v1.dtsi"

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

#include "msm8226-camera-sensor-mtp.dtsi"

arch/arm/boot/dts/qcom/msm8926-720p-cdp.dts→arch/arm/boot/dts/qcom/msm8926-v1-720p-cdp.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
@@ -12,7 +12,7 @@ 




/dts-v1/;

#include "msm8926.dtsi"

#include "msm8926-v1.dtsi"

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

#include "msm8226-camera-sensor-cdp.dtsi"