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

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

Merge "defconfig: Enable AOP and Debug CC for SDXPRAIRIE"

parents 21362b49 ce2547e8

Documentation/devicetree/bindings/clock/qcom,debugcc.txt

+2 −1
Original line number Diff line number Diff line
@@ -5,7 +5,8 @@ Required properties : 
- compatible: Shall contain "qcom,debugcc-sm8150",

		"qcom,debugcc-qcs405",

		"qcom,debugcc-sm6150",

		"qcom,debugcc-sdmmagpie".

		"qcom,debugcc-sdmmagpie"

		"qcom,debugcc-sdxprairie".

- qcom,gcc: phandle to the GCC device node.

- qcom,videocc: phandle to the Video CC device node.

- qcom,camcc: phandle to the Camera CC device node.

arch/arm/configs/vendor/sdxprairie-perf_defconfig

+3 −0
Original line number Diff line number Diff line
@@ -272,10 +272,13 @@ CONFIG_RMNET_IPA3=y 
CONFIG_ECM_IPA=y

CONFIG_RNDIS_IPA=y

CONFIG_IPA_UT=y

CONFIG_MSM_CLK_AOP_QMP=y

CONFIG_MSM_CLK_RPMH=y

CONFIG_GCC_SDXPRAIRIE=y

CONFIG_DEBUGCC_SDXPRAIRIE=y

CONFIG_HWSPINLOCK=y

CONFIG_HWSPINLOCK_QCOM=y

CONFIG_MSM_QMP=y

CONFIG_IOMMU_IO_PGTABLE_FAST=y

CONFIG_ARM_SMMU=y

CONFIG_IOMMU_DEBUG=y

arch/arm/configs/vendor/sdxprairie_defconfig

+3 −0
Original line number Diff line number Diff line
@@ -262,10 +262,13 @@ CONFIG_RMNET_IPA3=y 
CONFIG_ECM_IPA=y

CONFIG_RNDIS_IPA=y

CONFIG_IPA_UT=y

CONFIG_MSM_CLK_AOP_QMP=y

CONFIG_MSM_CLK_RPMH=y

CONFIG_GCC_SDXPRAIRIE=y

CONFIG_DEBUGCC_SDXPRAIRIE=y

CONFIG_HWSPINLOCK=y

CONFIG_HWSPINLOCK_QCOM=y

CONFIG_MSM_QMP=y

CONFIG_IOMMU_IO_PGTABLE_FAST=y

CONFIG_ARM_SMMU=y

CONFIG_IOMMU_DEBUG=y

drivers/clk/qcom/Kconfig

+8 −0
Original line number Diff line number Diff line
@@ -476,3 +476,11 @@ config GCC_SDXPRAIRIE 
	 SDXPRAIRIE devices.

	 Say Y if you want to use peripheral devices such as UART, SPI, I2C,

	 USB, SD/eMMC, PCIe, etc.



config DEBUGCC_SDXPRAIRIE

	tristate "SDXPRAIRIE Debug Clock Controller"

	depends on COMMON_CLK_QCOM

	help

	  Support for the debug clock controller on Qualcomm Technologies, Inc

	  SDXPRAIRIE devices.

	  Say Y if you want to support the clock measurement functionality.

drivers/clk/qcom/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ obj-$(CONFIG_APQ_GCC_8084) += gcc-apq8084.o 
obj-$(CONFIG_APQ_MMCC_8084) += mmcc-apq8084.o

obj-$(CONFIG_CLOCK_CPU_OSM) += clk-cpu-osm.o

obj-$(CONFIG_CLOCK_CPU_QCS405) += clk-cpu-qcs405.o

obj-$(CONFIG_DEBUGCC_SDXPRAIRIE) += debugcc-sdxprairie.o

obj-$(CONFIG_GCC_SDXPRAIRIE) += gcc-sdxprairie.o

obj-$(CONFIG_IPQ_GCC_4019) += gcc-ipq4019.o

obj-$(CONFIG_IPQ_GCC_806X) += gcc-ipq806x.o