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

Commit 6ed82c87 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: sdmshrike bringup changes"

parents f94f0ed3 1f783ef5

arch/arm64/boot/dts/qcom/Makefile

+4 −3
Original line number Diff line number Diff line
@@ -103,12 +103,13 @@ ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y) 
		sdmshrike-cdp-overlay.dtbo \

		sdmshrike-mtp-overlay.dtbo



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

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

sdmshrike-cdp-overlay.dtbo-base := sdmshrike.dtb sdmshrike-v2.dtb

sdmshrike-mtp-overlay.dtbo-base := sdmshrike.dtb sdmshrike-v2.dtb

else

dtb-$(CONFIG_ARCH_SDMSHRIKE)	+= sdmshrike-rumi.dtb \

	sdmshrike-mtp.dtb \

	sdmshrike-cdp.dtb

	sdmshrike-cdp.dtb \

	sdmshrike-v2-mtp.dtb

endif



ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)

arch/arm64/boot/dts/qcom/sdmshrike-v2-mtp.dts

0 → 100644
+22 −0
Original line number Diff line number Diff line 
/* Copyright (c) 2019, 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 "sdmshrike-v2.dtsi"

#include "sdmshrike-mtp.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SDMSHRIKE V2 MTP";

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

	qcom,board-id = <8 0>;

};

arch/arm64/boot/dts/qcom/sdmshrike-v2.dts

0 → 100644
+22 −0
Original line number Diff line number Diff line 
/* Copyright (c) 2019, 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 "sdmshrike-v2.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SDMSHRIKE v2 SoC";

	compatible = "qcom,sdmshrike";

	qcom,pmic-name = "PM8150";

	qcom,board-id = <0 0>;

};

arch/arm64/boot/dts/qcom/sdmshrike-v2.dtsi

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

/ {

	model = "Qualcomm Technologies, Inc. SDMSHRIKE V2";

	qcom,msm-name = "SDMSHRIKE V2";

	qcom,msm-id = <340 0x20000>;

};



/* GPU overrides */

&msm_gpu {

	/* Updated chip ID */

	qcom,chipid = <0x6080001>;



};