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

Commit e19e227c authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: move ocmem to its new location"

parents 500bff85 e24d6c68

arch/arm/mach-msm/Kconfig

+0 −63
Original line number Diff line number Diff line
@@ -903,69 +903,6 @@ config PM8XXX_RPC_VIBRATOR 
	  is connected on the PM8XXX PMIC. Say Y if you want to enable

	  this feature.



config MSM_OCMEM

	bool "MSM On-Chip memory driver (OCMEM)"

	help

	  Enable support for On-Chip Memory available on certain MSM chipsets.

	  OCMEM is a low latency, high performance pool shared by subsystems.



config MSM_OCMEM_LOCAL_POWER_CTRL

	bool "OCMEM Local Power Control"

	depends on MSM_OCMEM

	help

	  Enable direct power management of the OCMEM core by the

	  OCMEM driver. By default power management is delegated to

	  the RPM. Selecting this option causes the OCMEM driver to

	  directly handle the various macro power transitions.



config MSM_OCMEM_DEBUG

	bool "OCMEM Debug Support"

	depends on MSM_OCMEM

	help

	  Enable debug options for On-chip Memory (OCMEM) driver.

	  Various debug options include memory, power and latency.

	  Choosing one of these options allows debugging of each

	  individual subsystem separately.



config MSM_OCMEM_NONSECURE

	bool "OCMEM Non Secure Mode"

	depends on MSM_OCMEM_DEBUG

	help

	  Disable OCMEM interaction with secure processor.

	  By default OCMEM is secured and accesses for each master

	  is requested by the OCMEM driver. Selecting this option

	  causes the OCMEM memory to be in non-secure state unless

	  its locked down by the secure processor.



config MSM_OCMEM_POWER_DEBUG

	bool "OCMEM Power Debug Support"

	depends on MSM_OCMEM_DEBUG

	help

	  Enable debug support for OCMEM power management.

	  This adds support for verifying all power management

	  related operations of OCMEM. Both local power management

	  and RPM assisted power management operations are supported.



config MSM_OCMEM_DEBUG_ALWAYS_ON

	bool "Keep OCMEM always turned ON"

	depends on MSM_OCMEM_DEBUG

	help

	  Always vote for all OCMEM clocks and keep all OCMEM

	  macros turned ON and never allow them to be turned OFF.

	  Both local power management and RPM assisted power modes

	  are supported for individual macro power control operations.



config MSM_OCMEM_POWER_DISABLE

	bool "OCMEM Disable Power Control"

	depends on MSM_OCMEM

	help

	  Disable all OCMEM power management.

	  Skip all OCMEM power operations that turn ON or

	  turn OFF the macros. Both local power management and

	  RPM assisted power management operations are skipped.

	  Enable this configuration if OCMEM is being exclusively

	  used as GMEM or OCIMEM.



config SENSORS_ADSP

	bool "Enable Sensors Driver Support for ADSP"

	help

arch/arm/mach-msm/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -56,8 +56,6 @@ obj-$(CONFIG_MSM_TZ_LOG) += tz_log.o 
obj-$(CONFIG_MSM_BUS_SCALING) += msm_bus/

obj-$(CONFIG_MSM_BUSPM_DEV) += msm-buspm-dev.o



obj-$(CONFIG_MSM_OCMEM) += ocmem.o ocmem_allocator.o ocmem_notifier.o

obj-$(CONFIG_MSM_OCMEM) += ocmem_sched.o ocmem_api.o ocmem_rdm.o ocmem_core.o



obj-$(CONFIG_ARCH_MSM8974) += gpiomux-v2.o gpiomux.o

obj-$(CONFIG_ARCH_MDM9630) += gpiomux-v2.o gpiomux.o

drivers/gpu/msm/adreno.h

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
#include <linux/stat.h>



#ifdef CONFIG_MSM_OCMEM

#include <mach/ocmem.h>

#include <soc/qcom/ocmem.h>

#endif



#include "a3xx_reg.h"

drivers/media/platform/msm/vidc/hfi_packetization.c

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
#include "msm_vidc_debug.h"

#include <linux/errno.h>

#include <linux/log2.h>

#include <mach/ocmem.h>

#include <soc/qcom/ocmem.h>



/* Set up look-up tables to convert HAL_* to HFI_*.

 *

drivers/media/platform/msm/vidc/msm_vidc_internal.h

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
#include <linux/wait.h>

#include <mach/msm_bus.h>

#include <mach/msm_bus_board.h>

#include <mach/ocmem.h>

#include <soc/qcom/ocmem.h>

#include <media/v4l2-dev.h>

#include <media/v4l2-device.h>

#include <media/v4l2-ioctl.h>