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

Commit 27286dea 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 support for sdm450"

parents c678eb21 6451c374

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

+6 −0
Original line number Diff line number Diff line
@@ -107,6 +107,9 @@ SoCs: 
- MSM8953

  compatible = "qcom,msm8953"



- SDM450

  compatible = "qcom,sdm450"



- MSM8937

  compatible = "qcom,msm8937"
@@ -310,6 +313,9 @@ compatible = "qcom,msm8953-cdp" 
compatible = "qcom,msm8953-mtp"

compatible = "qcom,msm8953-qrd"

compatible = "qcom,msm8953-qrd-sku3"

compatible = "qcom,sdm450-mtp"

compatible = "qcom,sdm450-cdp"

compatible = "qcom,sdm450-qrd"

compatible = "qcom,mdm9640-cdp"

compatible = "qcom,mdm9640-mtp"

compatible = "qcom,mdm9640-rumi"

arch/arm64/Kconfig.platforms

+9 −0
Original line number Diff line number Diff line
@@ -148,6 +148,15 @@ config ARCH_MSM8953 
	  This enables support for the MSM8953 chipset. If you do not

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



config ARCH_SDM450

	bool "Enable Support for Qualcomm Technologies Inc. SDM450"

	depends on ARCH_QCOM

	select COMMON_CLK_QCOM

	select QCOM_GDSC

	help

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

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



config ARCH_ROCKCHIP

	bool "Rockchip Platforms"

	select ARCH_HAS_RESET_CONTROLLER

arch/arm64/boot/dts/qcom/Makefile

+7 −0
Original line number Diff line number Diff line
@@ -176,6 +176,13 @@ endif 
ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)

else

dtb-$(CONFIG_ARCH_MSM8953) += msm8953-mtp.dtb

dtb-$(CONFIG_ARCH_SDM450) += sdm450-rcm.dtb \

	sdm450-cdp.dtb \

	sdm450-mtp.dtb \

	sdm450-qrd.dtb \

	sdm450-pmi8940-mtp.dtb \

	sdm450-pmi8937-mtp.dtb \

	sdm450-iot-mtp.dtb

endif



always		:= $(dtb-y)

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

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

 * Copyright (c) 2015-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.

 */



&blsp1_uart0 {

	status = "ok";

	pinctrl-names = "default";

	pinctrl-0 = <&uart_console_active>;

};

arch/arm64/boot/dts/qcom/msm8953-qrd.dtsi

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

 * Copyright (c) 2015-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.

 */



&blsp1_uart0 {

	status = "ok";

	pinctrl-names = "default";

	pinctrl-0 = <&uart_console_active>;

};