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

Commit db25c7c8 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 device tree for SDM630 CDP, MTP and RCM"

parents 94e93c87 13e46e55

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

+2 −0
Original line number Diff line number Diff line
@@ -282,6 +282,8 @@ compatible = "qcom,sda658-cdp" 
compatible = "qcom,sda660-mtp"

compatible = "qcom,sda660-cdp"

compatible = "qcom,sdm630-rumi"

compatible = "qcom,sdm630-mtp"

compatible = "qcom,sdm630-cdp"

compatible = "qcom,msm8952-rumi"

compatible = "qcom,msm8952-sim"

compatible = "qcom,msm8952-qrd"

arch/arm/boot/dts/qcom/Makefile

+13 −1
Original line number Diff line number Diff line
@@ -182,7 +182,19 @@ dtb-$(CONFIG_ARCH_SDM660) += sdm660-sim.dtb \ 
	sda658-pm660a-rcm.dtb



dtb-$(CONFIG_ARCH_SDM630) += sdm630-rumi.dtb \

	sdm630-pm660a-rumi.dtb

	sdm630-pm660a-rumi.dtb \

	sdm630-mtp.dtb \

	sdm630-cdp.dtb \

	sdm630-rcm.dtb \

	sdm630-internal-codec-mtp.dtb \

	sdm630-internal-codec-cdp.dtb \

	sdm630-internal-codec-rcm.dtb \

	sdm630-pm660a-cdp.dtb \

	sdm630-pm660a-mtp.dtb \

	sdm630-pm660a-rcm.dtb \

	sdm630-internal-codec-pm660a-cdp.dtb \

	sdm630-internal-codec-pm660a-mtp.dtb \

	sdm630-internal-codec-pm660a-rcm.dtb



ifeq ($(CONFIG_ARM64),y)

always          := $(dtb-y)

arch/arm/boot/dts/qcom/sdm630-cdp.dts

0 → 100644
+25 −0
Original line number Diff line number Diff line 
/* Copyright (c) 2017, 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 "sdm630.dtsi"

#include "sdm630-cdp.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SDM 630 PM660 + PM660L CDP";

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

	qcom,board-id = <1 0>;

	qcom,pmic-id = <0x0001001b 0x0101011a 0x0 0x0>,

			<0x0001001b 0x0201011a 0x0 0x0>;

};

arch/arm/boot/dts/qcom/sdm630-cdp.dtsi

0 → 100644
+24 −0
Original line number Diff line number Diff line 
/* Copyright (c) 2017, 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.

 */



#include "sdm660-pinctrl.dtsi"

/ {

};



&uartblsp1dm1 {

	status = "ok";

	pinctrl-names = "default";

	pinctrl-0 = <&uart_console_active>;

};



&soc {

};

arch/arm/boot/dts/qcom/sdm630-internal-codec-cdp.dts

0 → 100644
+25 −0
Original line number Diff line number Diff line 
/* Copyright (c) 2017, 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 "sdm630.dtsi"

#include "sdm630-cdp.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SDM 630 PM660 + PM660L Int. Audio Codec CDP";

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

	qcom,board-id = <1 1>;

	qcom,pmic-id = <0x0001001b 0x0101011a 0x0 0x0>,

			<0x0001001b 0x0201011a 0x0 0x0>;

};