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

Commit 2aa9189b 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 MSM8920"

parents e7587c62 5b22dcb4

Documentation/devicetree/bindings/arm/msm/msm.txt

+5 −0
Original line number Original line Diff line number Diff line
@@ -68,6 +68,9 @@ SoCs: 
- MSM8917

- MSM8917

  compatible = "qcom,msm8917"

  compatible = "qcom,msm8917"





- MSM8920

  compatible = "qcom,msm8920"



- MSM8940

- MSM8940

  compatible = "qcom,msm8940"

  compatible = "qcom,msm8940"
@@ -218,6 +221,8 @@ compatible = "qcom,msm8917-rumi" 
compatible = "qcom,msm8917-qrd"

compatible = "qcom,msm8917-qrd"

compatible = "qcom,msm8917-qrd-sku5"

compatible = "qcom,msm8917-qrd-sku5"

compatible = "qcom,msm8917-qgp-tmo"

compatible = "qcom,msm8917-qgp-tmo"

compatible = "qcom,msm8920-cdp"

compatible = "qcom,msm8920-mtp"

compatible = "qcom,msm8940-cdp"

compatible = "qcom,msm8940-cdp"

compatible = "qcom,msm8940-mtp"

compatible = "qcom,msm8940-mtp"

compatible = "qcom,msm8940-rumi"

compatible = "qcom,msm8940-rumi"

arch/arm/boot/dts/qcom/Makefile

+7 −0
Original line number Original line Diff line number Diff line
@@ -176,6 +176,13 @@ dtb-$(CONFIG_ARCH_MSM8917) += msm8917-rumi.dtb \ 
	msm8917-qgp-tmo.dtb \

	msm8917-qgp-tmo.dtb \

	msm8917-pmi8937-qrd-sku5.dtb

	msm8917-pmi8937-qrd-sku5.dtb





dtb-$(CONFIG_ARCH_MSM8920) += msm8920-pmi8937-cdp.dtb \

	msm8920-pmi8937-mtp.dtb \

	msm8920-pmi8950-cdp.dtb \

	msm8920-pmi8950-mtp.dtb \

	msm8920-pmi8937-rcm.dtb \

	msm8920-pmi8950-rcm.dtb



dtb-$(CONFIG_ARCH_MSM8940) += msm8940-pmi8937-cdp.dtb \

dtb-$(CONFIG_ARCH_MSM8940) += msm8940-pmi8937-cdp.dtb \

	msm8940-pmi8937-mtp.dtb \

	msm8940-pmi8937-mtp.dtb \

	msm8940-pmi8950-cdp.dtb \

	msm8940-pmi8950-cdp.dtb \

arch/arm/boot/dts/qcom/msm8920-pmi8937-cdp.dts

0 → 100644
+24 −0
Original line number Original line Diff line number Diff line 
/*

 * Copyright (c) 2016, 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 "msm8920.dtsi"

#include "msm8917-pmi8937-cdp.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. MSM8920-PMI8937 CDP";

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

	qcom,board-id= <1 0>;

	qcom,pmic-id = <0x10019 0x020037 0x0 0x0>;

};

arch/arm/boot/dts/qcom/msm8920-pmi8937-mtp.dts

0 → 100644
+24 −0
Original line number Original line Diff line number Diff line 
/*

 * Copyright (c) 2016, 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 "msm8920.dtsi"

#include "msm8917-pmi8937-mtp.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. MSM8920-PMI8937 MTP";

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

	qcom,board-id= <8 0>;

	qcom,pmic-id = <0x10019 0x020037 0x0 0x0>;

};

arch/arm/boot/dts/qcom/msm8920-pmi8937-rcm.dts

0 → 100644
+24 −0
Original line number Original line Diff line number Diff line 
/*

 * Copyright (c) 2016, 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 "msm8920.dtsi"

#include "msm8917-pmi8937-cdp.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. MSM8920-PMI8937 RCM";

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

	qcom,board-id= <21 0>;

	qcom,pmic-id = <0x10019 0x020037 0x0 0x0>;

};