From patchwork Tue May 3 17:33:49 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Poirier X-Patchwork-Id: 67075 Delivered-To: patch@linaro.org Received: by 10.140.92.199 with SMTP id b65csp718968qge; Tue, 3 May 2016 10:34:49 -0700 (PDT) X-Received: by 10.66.142.73 with SMTP id ru9mr5314620pab.51.1462296886979; Tue, 03 May 2016 10:34:46 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 12si254274pft.105.2016.05.03.10.34.46; Tue, 03 May 2016 10:34:46 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964904AbcECRef (ORCPT + 29 others); Tue, 3 May 2016 13:34:35 -0400 Received: from mail-ig0-f181.google.com ([209.85.213.181]:33307 "EHLO mail-ig0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964858AbcECRec (ORCPT ); Tue, 3 May 2016 13:34:32 -0400 Received: by mail-ig0-f181.google.com with SMTP id c3so22209941igl.0 for ; Tue, 03 May 2016 10:34:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=bYoFjZEfygv0oRW1bgQdbGT8/X6bVPy3DG4C7ICbITw=; b=DXmVlGjVc16AmkhsTsejYUbh4YuZsl/8Bi5nWX3BaNbGtcuDMCyxY1QpPbI0C7NyCO l21QkgO78VVe8d+qknx3eAMQ585si6V6zHdt6FR9bKzkSLEXVPShBGR9CN4YEzOWyXvP I51rGjazDG3qV3SIiFhOGaNBzvP1rNyttIbfs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=bYoFjZEfygv0oRW1bgQdbGT8/X6bVPy3DG4C7ICbITw=; b=NV/gm8hTZr4FguApgoPGpq/7MqDLyGmjmkU849wwB6DXJ11Fn8LaxReBWyiUM6ZVEo 0ZVfO1IeqbIeMGGt2IELEHwz9jxZ2pZ7YuNEwuys3Sm5dPm36V3GkKnojeTSRwsL3vnu bEKH9HI6Y/KV8qmSZw1dCxmf4zNNoUJfxlKww+KzcFzFXuwoFRcmcBngpB373jzDfdxu 2t2qwNgV/aROCLsvY6uEp1IyVhA6/mu9r0eyOzXBxYxb67jQ10Vsnwc42NsFkfP7NM4k GS4jEn7TGZ58VYqOlnRGNzy/dtquuR+DASwkA1V3jagLH924/JRgtSaha1j0BjwREOxQ 360A== X-Gm-Message-State: AOPr4FXMTidTO+TPMLfoyx6n5mtUa5mPnqodCUQuQNJuL2AkgYWzOZuVUyWwSBJeGrIWmhDJ X-Received: by 10.50.164.226 with SMTP id yt2mr4991162igb.66.1462296871098; Tue, 03 May 2016 10:34:31 -0700 (PDT) Received: from t430.cg.shawcable.net (S0106002369de4dac.cg.shawcable.net. [68.147.8.254]) by smtp.gmail.com with ESMTPSA id k33sm103957iod.44.2016.05.03.10.34.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 03 May 2016 10:34:30 -0700 (PDT) From: Mathieu Poirier To: gregkh@linuxfoundation.org Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 15/27] coresight: tmc: cleaning up header file Date: Tue, 3 May 2016 11:33:49 -0600 Message-Id: <1462296841-12327-16-git-send-email-mathieu.poirier@linaro.org> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1462296841-12327-1-git-send-email-mathieu.poirier@linaro.org> References: <1462296841-12327-1-git-send-email-mathieu.poirier@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Reviewed-by: Suzuki K Poulose --- drivers/hwtracing/coresight/coresight-tmc.c | 2 +- drivers/hwtracing/coresight/coresight-tmc.h | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) -- 2.5.0 diff --git a/drivers/hwtracing/coresight/coresight-tmc.c b/drivers/hwtracing/coresight/coresight-tmc.c index f9a6624ab531..07e2809d832b 100644 --- a/drivers/hwtracing/coresight/coresight-tmc.c +++ b/drivers/hwtracing/coresight/coresight-tmc.c @@ -50,7 +50,7 @@ static void tmc_flush_and_stop(struct tmc_drvdata *drvdata) ffcr = readl_relaxed(drvdata->base + TMC_FFCR); ffcr |= TMC_FFCR_STOP_ON_FLUSH; writel_relaxed(ffcr, drvdata->base + TMC_FFCR); - ffcr |= TMC_FFCR_FLUSHMAN; + ffcr |= BIT(TMC_FFCR_FLUSHMAN_BIT); writel_relaxed(ffcr, drvdata->base + TMC_FFCR); /* Ensure flush completes */ if (coresight_timeout(drvdata->base, diff --git a/drivers/hwtracing/coresight/coresight-tmc.h b/drivers/hwtracing/coresight/coresight-tmc.h index 49718b4a9788..5a60830c8db5 100644 --- a/drivers/hwtracing/coresight/coresight-tmc.h +++ b/drivers/hwtracing/coresight/coresight-tmc.h @@ -49,6 +49,7 @@ /* TMC_CTL - 0x020 */ #define TMC_CTL_CAPT_EN BIT(0) /* TMC_STS - 0x00C */ +#define TMC_STS_TMCREADY_BIT 2 #define TMC_STS_TRIGGERED BIT(1) /* TMC_AXICTL - 0x110 */ #define TMC_AXICTL_PROT_CTL_B0 BIT(0) @@ -56,16 +57,14 @@ #define TMC_AXICTL_SCT_GAT_MODE BIT(7) #define TMC_AXICTL_WR_BURST_16 0xF00 /* TMC_FFCR - 0x304 */ +#define TMC_FFCR_FLUSHMAN_BIT 6 #define TMC_FFCR_EN_FMT BIT(0) #define TMC_FFCR_EN_TI BIT(1) #define TMC_FFCR_FON_FLIN BIT(4) #define TMC_FFCR_FON_TRIG_EVT BIT(5) -#define TMC_FFCR_FLUSHMAN BIT(6) #define TMC_FFCR_TRIGON_TRIGIN BIT(8) #define TMC_FFCR_STOP_ON_FLUSH BIT(12) -#define TMC_STS_TMCREADY_BIT 2 -#define TMC_FFCR_FLUSHMAN_BIT 6 enum tmc_config_type { TMC_CONFIG_TYPE_ETB,