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

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

Merge "ARM: dts: sa6155p: Add device tree for ADP air/star v2"

parents 6c11e4a9 ef39d57e

arch/arm64/boot/dts/qcom/Makefile

+8 −2
Original line number Diff line number Diff line
@@ -122,7 +122,9 @@ ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y) 
		sa6155-adp-star-overlay.dtbo \

		sa6155p-adp-star-overlay.dtbo \

		sa6155-adp-air-overlay.dtbo \

		sa6155p-adp-air-overlay.dtbo

		sa6155p-adp-air-overlay.dtbo \

		sa6155p-v2-adp-star-overlay.dtbo \

		sa6155p-v2-adp-air-overlay.dtbo



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

sm6150-qrd-overlay.dtbo-base := sm6150.dtb
@@ -135,8 +137,10 @@ sm6150-usbc-minidp-idp-overlay.dtbo-base := sm6150.dtb 
sm6150-cmd-mode-display-idp-overlay.dtbo-base := sm6150.dtb

sa6155-adp-star-overlay.dtbo-base := sa6155.dtb

sa6155p-adp-star-overlay.dtbo-base := sa6155p.dtb

sa6155p-v2-adp-star-overlay.dtbo-base := sa6155p.dtb

sa6155-adp-air-overlay.dtbo-base := sa6155.dtb

sa6155p-adp-air-overlay.dtbo-base := sa6155p.dtb

sa6155p-v2-adp-air-overlay.dtbo-base := sa6155p.dtb

else

dtb-$(CONFIG_ARCH_SM6150)	+= sm6150-rumi.dtb \

	sm6150-qrd.dtb \
@@ -150,7 +154,9 @@ dtb-$(CONFIG_ARCH_SM6150) += sm6150-rumi.dtb \ 
	sa6155-adp-star.dtb \

	sa6155p-adp-star.dtb \

	sa6155-adp-air.dtb \

	sa6155p-adp-air.dtb

	sa6155p-adp-air.dtb \

	sa6155p-v2-adp-star.dtb \

	sa6155p-v2-adp-air.dtb



endif

arch/arm64/boot/dts/qcom/sa6155p-v2-adp-air-overlay.dts

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

/plugin/;



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

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



#include "sa6155-adp-air.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SA6155P ADP-AIR V2";

	compatible = "qcom,sa6155p-adp-air", "qcom,sa6155p", "qcom,adp-air";

	qcom,msm-id = <377 0x0>;

	qcom,board-id = <0x03010019 0>;

};

arch/arm64/boot/dts/qcom/sa6155p-v2-adp-air.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 "sa6155p.dtsi"

#include "sa6155-adp-air.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SA6155P ADP-AIR V2";

	compatible = "qcom,sa6155p-adp-air", "qcom,sa6155p", "qcom,adp-air";

	qcom,board-id = <0x03010019 0>;

};

arch/arm64/boot/dts/qcom/sa6155p-v2-adp-star-overlay.dts

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

/plugin/;



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

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



#include "sa6155-adp-star.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SA6155P ADP-STAR V2";

	compatible = "qcom,sa6155p-adp-star", "qcom,sa6155p", "qcom,adp-star";

	qcom,msm-id = <377 0x0>;

	qcom,board-id = <0x010019 0>;

};

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

#include "sa6155-adp-star.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SA6155P ADP-STAR V2";

	compatible = "qcom,sa6155p-adp-star", "qcom,sa6155p", "qcom,adp-star";

	qcom,board-id = <0x010019 0>;

};