renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-23 04:34:11 +08:00
Code

coresight: tmc: cleaning up header file

Browse Source 
This patch first move the TMC_STS_TMCREADY_BIT and
TMC_FFCR_FLUSHMAN_BIT defines to their respective section.
It also removes TMC_FFCR_FLUSHMAN, since the same result
can easily be obtained using the BIT() macro.

Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Reviewed-by: Suzuki K Poulose <suzuki.poulose@arm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Mathieu Poirier 2016-05-03 11:33:49 -06:00 committed by Greg Kroah-Hartman
parent 4c324b5f0e
commit a8ab4268e0
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/hwtracing/coresight/coresight-tmc.c
View File

@ -50,7 +50,7 @@ static void tmc_flush_and_stop(struct tmc_drvdata *drvdata)
ffcr = readl_relaxed(drvdata->base + TMC_FFCR); ffcr = readl_relaxed(drvdata->base + TMC_FFCR);
ffcr |= TMC_FFCR_STOP_ON_FLUSH; ffcr |= TMC_FFCR_STOP_ON_FLUSH;
writel_relaxed(ffcr, drvdata->base + TMC_FFCR); writel_relaxed(ffcr, drvdata->base + TMC_FFCR);
ffcr |= TMC_FFCR_FLUSHMAN; ffcr |= BIT(TMC_FFCR_FLUSHMAN_BIT);
writel_relaxed(ffcr, drvdata->base + TMC_FFCR); writel_relaxed(ffcr, drvdata->base + TMC_FFCR);
/* Ensure flush completes */ /* Ensure flush completes */
if (coresight_timeout(drvdata->base, if (coresight_timeout(drvdata->base,

5
drivers/hwtracing/coresight/coresight-tmc.h
View File

@ -49,6 +49,7 @@
/* TMC_CTL - 0x020 */ /* TMC_CTL - 0x020 */
#define TMC_CTL_CAPT_EN BIT(0) #define TMC_CTL_CAPT_EN BIT(0)
/* TMC_STS - 0x00C */ /* TMC_STS - 0x00C */
#define TMC_STS_TMCREADY_BIT 2
#define TMC_STS_TRIGGERED BIT(1) #define TMC_STS_TRIGGERED BIT(1)
/* TMC_AXICTL - 0x110 */ /* TMC_AXICTL - 0x110 */
#define TMC_AXICTL_PROT_CTL_B0 BIT(0) #define TMC_AXICTL_PROT_CTL_B0 BIT(0)
@ -56,16 +57,14 @@
#define TMC_AXICTL_SCT_GAT_MODE BIT(7) #define TMC_AXICTL_SCT_GAT_MODE BIT(7)
#define TMC_AXICTL_WR_BURST_16 0xF00 #define TMC_AXICTL_WR_BURST_16 0xF00
/* TMC_FFCR - 0x304 */ /* TMC_FFCR - 0x304 */
#define TMC_FFCR_FLUSHMAN_BIT 6
#define TMC_FFCR_EN_FMT BIT(0) #define TMC_FFCR_EN_FMT BIT(0)
#define TMC_FFCR_EN_TI BIT(1) #define TMC_FFCR_EN_TI BIT(1)
#define TMC_FFCR_FON_FLIN BIT(4) #define TMC_FFCR_FON_FLIN BIT(4)
#define TMC_FFCR_FON_TRIG_EVT BIT(5) #define TMC_FFCR_FON_TRIG_EVT BIT(5)
#define TMC_FFCR_FLUSHMAN BIT(6)
#define TMC_FFCR_TRIGON_TRIGIN BIT(8) #define TMC_FFCR_TRIGON_TRIGIN BIT(8)
#define TMC_FFCR_STOP_ON_FLUSH BIT(12) #define TMC_FFCR_STOP_ON_FLUSH BIT(12)
#define TMC_STS_TMCREADY_BIT 2
#define TMC_FFCR_FLUSHMAN_BIT 6
enum tmc_config_type { enum tmc_config_type {
TMC_CONFIG_TYPE_ETB, TMC_CONFIG_TYPE_ETB,