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

Commit 120a0116 authored by Kyle Yan's avatar Kyle Yan Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Add initial device tree for sdmbat" into msm-4.8

parents 886cf112 18b01d63

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

+7 −0
Original line number Diff line number Diff line
@@ -89,6 +89,9 @@ SoCs: 
- MSMSKUNK

  compatible = "qcom,msmskunk"



- SDMBAT

  compatible = "qcom,sdmbat"



- MSM8952

  compatible = "qcom,msm8952"
@@ -260,6 +263,10 @@ compatible = "qcom,msmskunk-rumi" 
compatible = "qcom,msmskunk-cdp"

compatible = "qcom,msmskunk-mtp"

compatible = "qcom,msmskunk-mtp"

compatible = "qcom,sdmbat-sim"

compatible = "qcom,sdmbat-rumi"

compatible = "qcom,sdmbat-cdp"

compatible = "qcom,sdmbat-mtp"

compatible = "qcom,msm8952-rumi"

compatible = "qcom,msm8952-sim"

compatible = "qcom,msm8952-qrd"

arch/arm64/Kconfig.platforms

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

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



config ARCH_SDMBAT

	bool "Enable Support for Qualcomm Technologies Inc. SDMBAT"

	depends on ARCH_QCOM

	select COMMON_CLK_QCOM

	select QCOM_GDSC

	help

	  This enables support for the SDMBAT 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

+5 −0
Original line number Diff line number Diff line
@@ -7,6 +7,11 @@ dtb-$(CONFIG_ARCH_MSMSKUNK) += msmskunk-sim.dtb \ 
	msmskunk-mtp.dtb \

	msmskunk-cdp.dtb



dtb-$(CONFIG_ARCH_SDMBAT) += sdmbat-sim.dtb \

	sdmbat-rumi.dtb \

	sdmbat-mtp.dtb \

	sdmbat-cdp.dtb



always		:= $(dtb-y)

subdir-y	:= $(dts-dirs)

clean-files	:= *.dtb

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

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

#include "sdmbat-cdp.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SDM bat v1 CDP";

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

	qcom,board-id = <1 0>;

};

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

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