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

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

Merge "ARM: dts: msm: add gpio_key devices for buttons on sm8150-auto ADP STAR"

parents faf3db5e d65ddfcb

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

+2 −0
Original line number Diff line number Diff line
@@ -145,3 +145,5 @@ compatible = "qcom,sdm640-qrd" 
compatible = "qcom,qcs405-rumi"

compatible = "qcom,qcs405-mtp"

compatible = "qcom,qcs405-cdp"

compatible = "qcom,sm8150-auto-adp-star"

compatible = "qcom,auto-adp-star"

arch/arm64/boot/dts/qcom/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y) 
		sm8150-mtp-overlay.dtbo \

		sm8150-rumi-overlay.dtbo \

		sm8150-qrd-overlay.dtbo \

		sm8150-auto-adp-star-overlay.dtbo \

		sm8150p-cdp-overlay.dtbo \

		sm8150p-mtp-overlay.dtbo \

		sm8150p-qrd-overlay.dtbo \
@@ -26,6 +27,7 @@ sm8150-cdp-overlay.dtbo-base := sm8150.dtb sm8150-v2.dtb 
sm8150-mtp-overlay.dtbo-base := sm8150.dtb sm8150-v2.dtb

sm8150-rumi-overlay.dtbo-base := sm8150.dtb sm8150-v2.dtb

sm8150-qrd-overlay.dtbo-base := sm8150.dtb sm8150-v2.dtb

sm8150-auto-adp-star-overlay.dtbo-base := sm8150-auto.dtb

sm8150-sdx50m-cdp-overlay.dtbo-base := sm8150.dtb sm8150-v2.dtb

sm8150-sdx50m-mtp-overlay.dtbo-base := sm8150.dtb sm8150-v2.dtb

sm8150p-mtp-overlay.dtbo-base := sm8150p.dtb sm8150p-v2.dtb
@@ -35,6 +37,7 @@ dtb-$(CONFIG_ARCH_SM8150) += sm8150-rumi.dtb \ 
	sm8150-mtp.dtb \

	sm8150-cdp.dtb \

	sm8150-qrd.dtb \

	sm8150-auto-adp-star.dtb \

	sm8150-v2-rumi.dtb \

	sm8150-v2-mtp.dtb \

	sm8150-v2-cdp.dtb \

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

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
 * GNU General Public License for more details.

 */



#include <dt-bindings/clock/qcom,rpmh.h>

#include <dt-bindings/input/input.h>

#include <dt-bindings/input/qcom,qpnp-power-on.h>

#include <dt-bindings/interrupt-controller/irq.h>

arch/arm64/boot/dts/qcom/sm8150-auto-adp-star-overlay.dts

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

/plugin/;



#include "sm8150-auto-adp-star.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SM8150 AUTO-ADP-STAR";

	compatible = "qcom,sm8150-auto-adp-star", "qcom,sm8150",

		"qcom,auto-adp-star";

	qcom,board-id = <25 0>;

};

arch/arm64/boot/dts/qcom/sm8150-auto-adp-star.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 "sm8150-auto.dtsi"

#include "sm8150-auto-adp-star.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SM8150 AUTO-ADP-STAR";

	compatible = "qcom,sm8150-auto-adp-star", "qcom,sm8150",

		"qcom,auto-adp-star";

	qcom,board-id = <25 0>;

};