summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBibek Basu <bibek.basu@stericsson.com>2011-11-28 15:58:00 +0530
committerPhilippe Langlais <philippe.langlais@stericsson.com>2012-05-22 11:03:25 +0200
commit5e6c28b8714b930484fd216326d0acec89b4a57c (patch)
tree80756c6430b935759322c163cd684e165e300183
parent045169df5cde22e97443190098394115b3c51385 (diff)
u8500 : misc : stm driver not functional
configure stm mode to software to fix the broken driver ST-Ericsson Linux next: NA ST-Ericsson ID: 373611 ST-Ericsson FOSS-OUT ID: Trivial Signed-off-by: Bibek Basu <bibek.basu@stericsson.com> Change-Id: Ib1349cfea5a4d3143d232a0ff3fe1e93820c6439 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/40440 Reviewed-by: QABUILD Reviewed-by: Anil KUMAR (STE) <anil.kumar@stericsson.com> Reviewed-by: Philippe LANGLAIS <philippe.langlais@stericsson.com>
-rw-r--r--drivers/misc/Kconfig.stm6
-rw-r--r--drivers/misc/stm.c3
2 files changed, 7 insertions, 2 deletions
diff --git a/drivers/misc/Kconfig.stm b/drivers/misc/Kconfig.stm
index ef2b94683a3..d509c85c79f 100644
--- a/drivers/misc/Kconfig.stm
+++ b/drivers/misc/Kconfig.stm
@@ -14,6 +14,12 @@ config STM_NUMBER_OF_CHANNEL
help
Number Max of channels always a multiple of 256
+config STM_DEFAULT_MASTERS_MODES
+ hex "channel mode"
+ default 0xffffffff
+ help
+ Default config for enabling hardware mode tracing
+
config STM_PRINTK
bool "printk support"
depends on STM_TRACE
diff --git a/drivers/misc/stm.c b/drivers/misc/stm.c
index 53c47c1693a..33bb26c27ca 100644
--- a/drivers/misc/stm.c
+++ b/drivers/misc/stm.c
@@ -32,7 +32,7 @@
#define STM_CLOCK_MASK 0x1C0
/* Hardware mode for all sources */
-#define STM_MMC_DEFAULT 0xFFFFFFFF
+#define STM_MMC_DEFAULT CONFIG_STM_DEFAULT_MASTERS_MODES
/* Max number of channels (multiple of 256) */
#define STM_NUMBER_OF_CHANNEL CONFIG_STM_NUMBER_OF_CHANNEL
@@ -657,7 +657,6 @@ static int __devinit stm_probe(struct platform_device *pdev)
/* Enable STM Masters given in pdata */
if (stm.pdata->masters_enabled)
stm_enable_src(stm.pdata->masters_enabled);
-
stm_set_modes(STM_MMC_DEFAULT); /* Set all sources in HW mode */
dev_info(&pdev->dev, "STM-Trace driver probed successfully\n");