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

Commit 8459262e authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Update chip wake up registers for atoll ab variants"

parents 559a2e5c 5dee92b7

Documentation/devicetree/bindings/sound/qcom-audio-dev.txt

+5 −0
Original line number Diff line number Diff line
@@ -433,6 +433,11 @@ Required properties: 
Optional properties:

 - qcom,lpi-gpios : This boolean property is added if GPIOs are under

                    LPI TLMM.

- qcom,chip-wakeup-reg : This lists registers related to control interrupt mask

		for respective LPI TLMM GPIOs.

- qcom,chip-wakeup-maskbit : This gives info on maskbit for given list of registers.

- qcom,chip-wakeup-default-val : This gives info on default value to be updated

		for given chip regs.



* msm-dai-slim

arch/arm64/boot/dts/qcom/Makefile

+13 −4
Original line number Diff line number Diff line
@@ -255,7 +255,10 @@ ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y) 
		atoll-rumi-overlay.dtbo\

		atollp-idp-overlay.dtbo\

		atollp-atp-overlay.dtbo\

		atollp-qrd-overlay.dtbo

		atollp-qrd-overlay.dtbo\

		atoll-ab-idp-overlay.dtbo\

		atoll-ab-atp-overlay.dtbo\

		atoll-ab-qrd-overlay.dtbo



atoll-idp-overlay.dtbo-base := atoll.dtb

atoll-atp-overlay.dtbo-base := atoll.dtb
@@ -266,6 +269,9 @@ atoll-usbc-idp-overlay.dtbo-base := atoll.dtb 
atollp-idp-overlay.dtbo-base := atollp.dtb

atollp-atp-overlay.dtbo-base := atollp.dtb

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

atoll-ab-idp-overlay.dtbo-base := atoll-ab.dtb

atoll-ab-atp-overlay.dtbo-base := atoll-ab.dtb

atoll-ab-qrd-overlay.dtbo-base := atoll-ab.dtb

else

dtb-$(CONFIG_ARCH_ATOLL)	+= atoll-idp.dtb\

	atoll-atp.dtb\
@@ -275,7 +281,10 @@ dtb-$(CONFIG_ARCH_ATOLL) += atoll-idp.dtb\ 
	atoll-rumi.dtb\

	atollp-idp.dtb\

	atollp-atp.dtb\

	atollp-qrd.dtb

	atollp-qrd.dtb\

	atoll-ab-idp.dtb\

	atoll-ab-atp.dtb\

	atoll-ab-qrd.dtb

endif



dtb-$(CONFIG_ARCH_SDXPRAIRIE) += sdxprairie-rumi.dtb \

arch/arm64/boot/dts/qcom/atoll-ab-atp-overlay.dts

0 → 100644
+36 −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 "atoll-atp.dtsi"

#include "atoll-audio-overlay.dtsi"



/ {

	model = "ATP";

	compatible = "qcom,atoll-ab-idp", "qcom,atoll-ab", "qcom,idp", "qcom,atp";

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

	qcom,board-id = <33 0>;

};



&dsi_rm69299_visionox_amoled_vid_display {

	qcom,dsi-display-active;

};



&tx_swr_gpios {

	qcom,chip-wakeup-reg = <0x01FFB000>;

	qcom,chip-wakeup-maskbit = <0>;

	qcom,chip-wakeup-default-val = <0x1>;

};

arch/arm64/boot/dts/qcom/atoll-ab-atp.dts

0 → 100644
+23 −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 "atoll-ab.dtsi"

#include "atoll-atp.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. ATOLL-AB PM6150 ATP";

	compatible = "qcom,atoll-ab-idp", "qcom,atoll-ab",

			"qcom,idp", "qcom,atp";

	qcom,board-id = <33 0>;

};

arch/arm64/boot/dts/qcom/atoll-ab-idp-overlay.dts

0 → 100644
+36 −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 "atoll-idp.dtsi"

#include "atoll-audio-overlay.dtsi"



/ {

	model = "IDP";

	compatible = "qcom,atoll-ab-idp", "qcom,atoll-ab", "qcom,idp";

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

	qcom,board-id = <34 0>;

};



&dsi_rm69299_visionox_amoled_vid_display {

	qcom,dsi-display-active;

};



&tx_swr_gpios {

	qcom,chip-wakeup-reg = <0x01FFB000>;

	qcom,chip-wakeup-maskbit = <0>;

	qcom,chip-wakeup-default-val = <0x1>;

};