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

Commit 99ef3a61 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge changes Ie9d89013,I5b21f5c4 into msm-4.14 

* changes:
  ARM: dts: msm: Add initial device tree for sdm640
  sdm640: Add initial config option and documentation
parents b69dcc14 8b750804

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

+7 −0
Original line number Diff line number Diff line
@@ -47,6 +47,9 @@ SoCs: 
- SDMSHRIKE

  compatible = "qcom,sdmshrike"



- SDM640

  compatible = "qcom,sdm640"



Generic board variants:



- CDP device:
@@ -129,3 +132,7 @@ compatible = "qcom,sdm855-qrd" 
compatible = "qcom,sdmshrike-rumi"

compatible = "qcom,sdmshrike-mtp"

compatible = "qcom,sdmshrike-cdp"

compatible = "qcom,sdm640-rumi"

compatible = "qcom,sdm640-mtp"

compatible = "qcom,sdm640-cdp"

compatible = "qcom,sdm640-qrd"

arch/arm64/Kconfig.platforms

+8 −0
Original line number Diff line number Diff line
@@ -159,6 +159,14 @@ config ARCH_SDMSHRIKE 
	  If you do not wish to build a kernel that runs on this chipset,

	  say 'N' here.



config ARCH_SDM640

	bool "Enable Support for Qualcomm Technologies, Inc. SDM640"

	depends on ARCH_QCOM

	select COMMON_CLK_QCOM

	help

	  This enables support for the SDM640 chipset. If you do not

	  wish to build a kernel that runs on this chipset, say 'N' here.



config ARCH_REALTEK

	bool "Realtek Platforms"

	help

arch/arm64/boot/dts/qcom/Makefile

+18 −0
Original line number Diff line number Diff line
@@ -45,6 +45,24 @@ dtb-$(CONFIG_ARCH_SDMSHRIKE) += sdmshrike-rumi.dtb \ 
	sdmshrike-mtp.dtb \

	sdmshrike-cdp.dtb



ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)

	dtbo-$(CONFIG_ARCH_SDM640) += \

		sdm640-cdp-overlay.dtbo \

		sdm640-mtp-overlay.dtbo \

		sdm640-rumi-overlay.dtbo \

		sdm640-qrd-overlay.dtbo \



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

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

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

sdm640-qrd-overlay.dtbo-base := sdm640.dtb

else

dtb-$(CONFIG_ARCH_SDM640)	+= sdm640-rumi.dtb \

	sdm640-mtp.dtb \

	sdm640-cdp.dtb \

	sdm640-qrd.dtb

endif



always		:= $(dtb-y)

subdir-y	:= $(dts-dirs)

clean-files	:= *.dtb *.dtbo

arch/arm64/boot/dts/qcom/sdm640-cdp.dts

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

#include "sdm640-cdp.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SDM640 CDP";

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

	qcom,board-id = <1 0>;

};

arch/arm64/boot/dts/qcom/sdm640-cdp.dtsi

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

 */



&soc {

};