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

Commit 5f59be16 authored by Gaurav Kohli's avatar Gaurav Kohli Committed by Gerrit - the friendly Code Review server
Browse files

ARM: dts: msm: Add Rumi overlay files for SDM670 



Add SDM670 Rumi specific device tree overlay files.
Also move aliases to soc dts to avoid compile error
for overlay, We will add them back once it needs
to overwrite the soc aliases.

Change-Id: I9feae8105d633a2a0657c046bded5238c2e1682b
Signed-off-by: default avatarGaurav Kohli <gkohli@codeaurora.org>
parent d2ae07b1

arch/arm64/boot/dts/qcom/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -68,10 +68,12 @@ endif 
ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)

	dtbo-$(CONFIG_ARCH_SDM670) += \

		sdm670-cdp-overlay.dtbo \

		sdm670-mtp-overlay.dtbo

		sdm670-mtp-overlay.dtbo \

		sdm670-rumi-overlay.dtbo



sdm670-cdp-overlay.dtbo-base := sdm670.dtb

sdm670-mtp-overlay.dtbo-base := sdm670.dtb

sdm670-rumi-overlay.dtbo-base := sdm670.dtb

else

dtb-$(CONFIG_ARCH_SDM670) += sdm670-rumi.dtb \

	sdm670-mtp.dtb \

arch/arm64/boot/dts/qcom/sdm670-rumi-overlay.dts

0 → 100644
+29 −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/;

/plugin/;



#include "sdm670-rumi.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SDM670 RUMI";

	compatible = "qcom,sdm670-rumi", "qcom,sdm670", "qcom,rumi";

	qcom,msm-id = <336 0x0>;

	qcom,board-id = <15 0>;

};



&soc {

	wdog: qcom,wdt@17980000{

		status = "disabled";

	};

};

arch/arm64/boot/dts/qcom/sdm670-rumi.dtsi

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

 */



/{

	aliases {

		serial0 = &qupv3_se10_2uart;

		serial1 = &qupv3_se9_2uart;

		spi0 = &qupv3_se8_spi;

		i2c0 = &qupv3_se10_i2c;

		i2c1 = &qupv3_se3_i2c;

		hsuart0 = &qupv3_se6_4uart;

	};



};



&soc {

	/* Delete all regulators */

	/delete-node/ rpmh-regulator-smpa4;

arch/arm64/boot/dts/qcom/sdm670.dtsi

+0 −3
Original line number Diff line number Diff line
@@ -33,9 +33,6 @@ 
		ufshc1 = &ufshc_mem; /* Embedded UFS slot */

		sdhc1 = &sdhc_1; /* SDC1 eMMC slot */

		sdhc2 = &sdhc_2; /* SDC2 SD Card slot */

	};



	aliases {

		serial0 = &qupv3_se12_2uart;

		spi0 = &qupv3_se8_spi;

		i2c0 = &qupv3_se10_i2c;