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

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

Merge "ARM: dts: msm: Add PDC interrupt controller for atoll"

parents 4accc57b 83ee62aa
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ Properties:
		    "qcom,pdc-sm6150",
	            "qcom,pdc-sm8150",
		    "qcom,pdc-sdxprairie",
	            "qcom,pdc-atoll"

- reg:
	Usage: required
+1 −0
Original line number Diff line number Diff line
@@ -171,6 +171,7 @@ config ARCH_ATOLL
	bool "Enable Support for Qualcomm Technologies, Inc. ATOLL"
	depends on ARCH_QCOM
	select COMMON_CLK_QCOM
	select QTI_PDC_ATOLL
	help
	  This enables support for the ATOLL chipset. If you do not
	  wish to build a kernel that runs on this chipset, say 'N' here.
+9 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@
	compatible = "qcom,atoll";
	qcom,msm-name = "ATOLL";
	qcom,msm-id = <407 0x0>;
	interrupt-parent = <&intc>;
	interrupt-parent = <&pdc>;

	cpus {
		#address-cells = <2>;
@@ -487,6 +487,14 @@
		interrupt-parent = <&intc>;
	};

	pdc: interrupt-controller@b220000 {
		compatible = "qcom,pdc-atoll";
		reg = <0xb220000 0x400>;
		#interrupt-cells = <3>;
		interrupt-parent = <&intc>;
		interrupt-controller;
	};

	timer {
		compatible = "arm,armv8-timer";
		interrupts = <GIC_PPI 1 0xf08>,
+9 −0
Original line number Diff line number Diff line
@@ -41,6 +41,15 @@ config QTI_PDC_SDXPRAIRIE
	  the wakeup interrupts. Enable it when
	  ARCH_SDXPRAIRIE is selected.

config QTI_PDC_ATOLL
        bool "QTI PDC ATOLL"
        select QTI_PDC
        help
          QTI Power Domain Controller for ATOLL
	  This is used for managing and configuring
	  the wakeup interrupts. Enable it when
	  ARCH_ATOLL is selected.

config QTI_MPM
	bool "QTI MPM"
	depends on ARCH_QCOM
+1 −0
Original line number Diff line number Diff line
@@ -3,4 +3,5 @@ obj-$(CONFIG_QTI_PDC_SM8150) += pdc-sm8150.o
obj-$(CONFIG_QTI_PDC_SM6150)		+= pdc-sm6150.o
obj-$(CONFIG_QTI_PDC_SDMMAGPIE)		+= pdc-sdmmagpie.o
obj-$(CONFIG_QTI_PDC_SDXPRAIRIE)	+= pdc-sdxprairie.o
obj-$(CONFIG_QTI_PDC_ATOLL)		+= pdc-atoll.o
obj-$(CONFIG_QTI_MPM)			+= mpm.o mpm-8937.o mpm-qcs405.o mpm-trinket.o
Loading