forked from rubenslte/android_kernel_samsung_msm8226
Merge "msm: buspm: Enable busPM for targets which support bus scaling."
This commit is contained in:
committed by
Gerrit - the friendly Code Review server
commit
ec14f4098b
@@ -237,6 +237,7 @@ CONFIG_HW_RANDOM_MSM=y
|
||||
CONFIG_I2C=y
|
||||
CONFIG_I2C_CHARDEV=y
|
||||
CONFIG_I2C_QUP=y
|
||||
CONFIG_MSM_BUSPM_DEV=m
|
||||
CONFIG_SPI=y
|
||||
CONFIG_SPI_QUP=y
|
||||
CONFIG_SPI_SPIDEV=m
|
||||
|
||||
@@ -238,6 +238,7 @@ CONFIG_HW_RANDOM_MSM=y
|
||||
CONFIG_I2C=y
|
||||
CONFIG_I2C_CHARDEV=y
|
||||
CONFIG_I2C_QUP=y
|
||||
CONFIG_MSM_BUSPM_DEV=m
|
||||
CONFIG_SPI=y
|
||||
CONFIG_SPI_QUP=y
|
||||
CONFIG_SPI_SPIDEV=m
|
||||
|
||||
@@ -240,6 +240,7 @@ CONFIG_HW_RANDOM_MSM=y
|
||||
CONFIG_I2C=y
|
||||
CONFIG_I2C_CHARDEV=y
|
||||
CONFIG_I2C_QUP=y
|
||||
CONFIG_MSM_BUSPM_DEV=m
|
||||
CONFIG_SPI=y
|
||||
CONFIG_SPI_QUP=y
|
||||
CONFIG_SPI_SPIDEV=m
|
||||
|
||||
@@ -238,6 +238,7 @@ CONFIG_HW_RANDOM_MSM=y
|
||||
CONFIG_I2C=y
|
||||
CONFIG_I2C_CHARDEV=y
|
||||
CONFIG_I2C_QUP=y
|
||||
CONFIG_MSM_BUSPM_DEV=m
|
||||
CONFIG_SPI=y
|
||||
CONFIG_SPI_QUP=y
|
||||
CONFIG_SPI_SPIDEV=m
|
||||
|
||||
@@ -278,6 +278,7 @@ CONFIG_I2C_CHARDEV=y
|
||||
# CONFIG_I2C_MSM is not set
|
||||
CONFIG_I2C_QUP=y
|
||||
CONFIG_I2C_SSBI=y
|
||||
CONFIG_MSM_BUSPM_DEV=m
|
||||
CONFIG_SPI=y
|
||||
CONFIG_SPI_QUP=y
|
||||
CONFIG_SPI_SPIDEV=m
|
||||
|
||||
@@ -278,6 +278,7 @@ CONFIG_I2C_CHARDEV=y
|
||||
# CONFIG_I2C_MSM is not set
|
||||
CONFIG_I2C_QUP=y
|
||||
CONFIG_I2C_SSBI=y
|
||||
CONFIG_MSM_BUSPM_DEV=m
|
||||
CONFIG_SPI=y
|
||||
CONFIG_SPI_QUP=y
|
||||
CONFIG_SPI_SPIDEV=m
|
||||
|
||||
@@ -319,6 +319,7 @@ CONFIG_I2C=y
|
||||
CONFIG_I2C_CHARDEV=y
|
||||
# CONFIG_I2C_MSM is not set
|
||||
CONFIG_I2C_QUP=y
|
||||
CONFIG_MSM_BUSPM_DEV=m
|
||||
CONFIG_SPI=y
|
||||
CONFIG_SPI_QUP=y
|
||||
CONFIG_SPI_SPIDEV=m
|
||||
|
||||
@@ -83,6 +83,7 @@ CONFIG_MSM_RPM_STATS_LOG=y
|
||||
CONFIG_MSM_RPM_RBCPR_STATS_LOG=y
|
||||
CONFIG_MSM_EVENT_TIMER=y
|
||||
CONFIG_MSM_BUS_SCALING=y
|
||||
CONFIG_MSM_BUSPM_DEV=m
|
||||
CONFIG_MSM_BUS_RPM_MULTI_TIER_ENABLED=y
|
||||
CONFIG_MSM_WATCHDOG=y
|
||||
CONFIG_MSM_DLOAD_MODE=y
|
||||
|
||||
@@ -290,6 +290,7 @@ CONFIG_HW_RANDOM_MSM=y
|
||||
CONFIG_I2C=y
|
||||
CONFIG_I2C_CHARDEV=y
|
||||
CONFIG_I2C_QUP=y
|
||||
CONFIG_MSM_BUSPM_DEV=m
|
||||
CONFIG_SPI=y
|
||||
CONFIG_SPI_QUP=y
|
||||
CONFIG_SPI_SPIDEV=m
|
||||
|
||||
@@ -63,6 +63,7 @@ CONFIG_MSM_TZ_LOG=y
|
||||
CONFIG_MSM_DIRECT_SCLK_ACCESS=y
|
||||
CONFIG_MSM_EVENT_TIMER=y
|
||||
CONFIG_MSM_BUS_SCALING=y
|
||||
CONFIG_MSM_BUSPM_DEV=m
|
||||
CONFIG_MSM_WATCHDOG_V2=y
|
||||
CONFIG_MSM_MEMORY_DUMP=y
|
||||
CONFIG_MSM_DLOAD_MODE=y
|
||||
|
||||
@@ -53,6 +53,7 @@ CONFIG_MSM_RPM_LOG=y
|
||||
CONFIG_MSM_RPM_STATS_LOG=y
|
||||
CONFIG_MSM_DIRECT_SCLK_ACCESS=y
|
||||
CONFIG_MSM_BUS_SCALING=y
|
||||
CONFIG_MSM_BUSPM_DEV=m
|
||||
CONFIG_MSM_BUS_RPM_MULTI_TIER_ENABLED=y
|
||||
CONFIG_MSM_WATCHDOG=y
|
||||
CONFIG_MSM_DLOAD_MODE=y
|
||||
|
||||
@@ -210,6 +210,7 @@ CONFIG_HW_RANDOM_MSM=y
|
||||
CONFIG_I2C=y
|
||||
CONFIG_I2C_CHARDEV=y
|
||||
CONFIG_I2C_QUP=y
|
||||
CONFIG_MSM_BUSPM_DEV=m
|
||||
CONFIG_SPI=y
|
||||
CONFIG_SPI_QUP=y
|
||||
CONFIG_SPI_SPIDEV=m
|
||||
|
||||
@@ -50,6 +50,7 @@ CONFIG_MSM_PIL=y
|
||||
CONFIG_MSM_PIL_MSS_QDSP6V5=y
|
||||
CONFIG_MSM_DIRECT_SCLK_ACCESS=y
|
||||
CONFIG_MSM_BUS_SCALING=y
|
||||
CONFIG_MSM_BUSPM_DEV=m
|
||||
CONFIG_MSM_WATCHDOG_V2=y
|
||||
CONFIG_MSM_MEMORY_DUMP=y
|
||||
CONFIG_MSM_DLOAD_MODE=y
|
||||
|
||||
@@ -2324,8 +2324,8 @@ config SCORPION_Uni_45nm_BUG
|
||||
|
||||
config MSM_BUSPM_DEV
|
||||
tristate "MSM Bus Performance Monitor Kernel Module"
|
||||
depends on (ARCH_MSM8X60 || ARCH_MSM8960 || ARCH_MSM8974)
|
||||
default m
|
||||
depends on MSM_BUS_SCALING
|
||||
default n
|
||||
help
|
||||
This kernel module is used to mmap() hardware registers for the
|
||||
performance monitors, counters, etc. The module can also be used to
|
||||
|
||||
Reference in New Issue
Block a user