Merge "msm: rpm-stats: move rpm stat driver to new location in kernel" (81e83e9d) · Commits · e / devices / android_kernel_sony_msm8994

arch/arm/mach-msm/Kconfig

+0 −31

Original line number	Diff line number	Diff line
		@@ -850,37 +850,6 @@ config MSM_TZ_LOG
		produced by the Secure code (Trust zone). These messages provide
		diagnostic information about TZ operation.

		config MSM_RPM_LOG
		tristate "MSM Resource Power Manager Log Driver"
		depends on DEBUG_FS
		depends on MSM_RPM \|\| MSM_RPM_SMD
		default n
		help
		This option enables a driver which can read from a circular buffer
		of messages produced by the RPM. These messages provide diagnostic
		information about RPM operation. The driver outputs the messages
		via a debugfs node.

		config MSM_RPM_STATS_LOG
		tristate "MSM Resource Power Manager Stat Driver"
		depends on DEBUG_FS
		depends on MSM_RPM \|\| MSM_RPM_SMD
		default n
		help
		This option enables a driver which reads RPM messages from a shared
		memory location. These messages provide statistical information about
		the low power modes that RPM enters. The drivers outputs the message
		via a debugfs node.

		config MSM_RPM_RBCPR_STATS_V2_LOG
		tristate "MSM Resource Power Manager RPBCPR Stat Driver"
		depends on DEBUG_FS
		help
		This option enables v2 of the rpmrbcpr_stats driver which reads RPM
		memory for statistics pertaining to RPM's RBCPR(Rapid Bridge Core
		Power Reduction) driver. The drivers outputs the message via a
		debugfs node.

		config MSM_DIRECT_SCLK_ACCESS
		bool "Direct access to the SCLK timer"
		default n

+0 −3

Original line number	Diff line number	Diff line
		@@ -67,9 +67,6 @@ CFLAGS_msm_vibrator.o += -Idrivers/staging/android

		obj-$(CONFIG_MSM_RMT_STORAGE_CLIENT) += rmt_storage_client.o
		obj-$(CONFIG_MSM_LPM_TEST) += test-lpm.o
		obj-$(CONFIG_MSM_RPM_STATS_LOG) += rpm_stats.o rpm_master_stat.o
		obj-$(CONFIG_MSM_RPM_RBCPR_STATS_V2_LOG) += rpm_rbcpr_stats_v2.o
		obj-$(CONFIG_MSM_RPM_LOG) += rpm_log.o
		obj-$(CONFIG_MSM_TZ_LOG) += tz_log.o
		obj-$(CONFIG_MSM_BUS_SCALING) += msm_bus/
		obj-$(CONFIG_MSM_BUSPM_DEV) += msm-buspm-dev.o

+31 −0

Original line number	Diff line number	Diff line
		@@ -108,6 +108,37 @@ config MSM_RPM_SMD
		the MSM_MPM config that programs the MPM module to monitor interrupts
		during sleep modes.

		config MSM_RPM_RBCPR_STATS_V2_LOG
		tristate "MSM Resource Power Manager RPBCPR Stat Driver"
		depends on DEBUG_FS
		help
		This option enables v2 of the rpmrbcpr_stats driver which reads RPM
		memory for statistics pertaining to RPM's RBCPR(Rapid Bridge Core
		Power Reduction) driver. The drivers outputs the message via a
		debugfs node.

		config MSM_RPM_LOG
		tristate "MSM Resource Power Manager Log Driver"
		depends on DEBUG_FS
		depends on MSM_RPM_SMD
		default n
		help
		This option enables a driver which can read from a circular buffer
		of messages produced by the RPM. These messages provide diagnostic
		information about RPM operation. The driver outputs the messages
		via a debugfs node.

		config MSM_RPM_STATS_LOG
		tristate "MSM Resource Power Manager Stat Driver"
		depends on DEBUG_FS
		depends on MSM_RPM_SMD
		default n
		help
		This option enables a driver which reads RPM messages from a shared
		memory location. These messages provide statistical information about
		the low power modes that RPM enters. The drivers outputs the message
		via a debugfs node.

		config MSM_SMEM
		depends on REMOTE_SPINLOCK_MSM
		bool "MSM Shared Memory (SMEM)"

+3 −0

Original line number	Diff line number	Diff line
		@@ -15,6 +15,9 @@ obj-$(CONFIG_MSM_RPM_SMD) += rpm-smd.o
		ifdef CONFIG_DEBUG_FS
		obj-$(CONFIG_MSM_RPM_SMD) += rpm-smd-debug.o
		endif
		obj-$(CONFIG_MSM_RPM_RBCPR_STATS_V2_LOG) += rpm_rbcpr_stats_v2.o
		obj-$(CONFIG_MSM_RPM_STATS_LOG) += rpm_stats.o rpm_master_stat.o
		obj-$(CONFIG_MSM_RPM_LOG) += rpm_log.o
		obj-$(CONFIG_MSM_JTAG) += jtag-fuse.o jtag.o
		obj-$(CONFIG_MSM_JTAG_MM) += jtag-fuse.o jtag-mm.o
		obj-$(CONFIG_MSM_QMI_INTERFACE) += qmi_interface.o

+1 −2