From patchwork Wed Jun 13 02:01:19 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 9248 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 909A623E37 for ; Wed, 13 Jun 2012 02:01:50 +0000 (UTC) Received: from mail-yx0-f180.google.com (mail-yx0-f180.google.com [209.85.213.180]) by fiordland.canonical.com (Postfix) with ESMTP id 4536FA18221 for ; Wed, 13 Jun 2012 02:01:50 +0000 (UTC) Received: by yenq6 with SMTP id q6so155440yen.11 for ; Tue, 12 Jun 2012 19:01:49 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references :mime-version:content-type:content-transfer-encoding :x-content-scanned:x-cbid:x-gm-message-state; bh=N11cXDCmGzCfxYD3ePgSPlY2MsbOY8ZzFKNkjOK+zP8=; b=maAyk5zEtM0B8x3o4y0kB1WJtJgr8CRQJStfgy7hmnFZhlIoTqWKKugdzoUzal8cY/ QE+G7XcGwfbX1R64KddO17ANFKkx042Qa7pCLSGrxotfee2hKaMASFVEVYRLJXdTUQjk ov1W8CNBRpNsPomcqT+eEsOj5aDztGDltfT+RicvMK6B7OywL75g/vcMmR494c0hw7DY rE4sFTTs3iWk15Wp+K+CtdiauQ3wco6CYRtdkAU0RIpukU9JX+vaHE2UZHv0oksIjT04 3Q+vem8TD0UrmGTpaiBDE+zIuwb9BExexoq+zVwYEhWY6bCH7//J8Q07QMwkfHK5Qr+s FQdg== Received: by 10.50.87.227 with SMTP id bb3mr9522105igb.57.1339552909295; Tue, 12 Jun 2012 19:01:49 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.231.24.148 with SMTP id v20csp200423ibb; Tue, 12 Jun 2012 19:01:48 -0700 (PDT) Received: by 10.236.109.196 with SMTP id s44mr30341753yhg.35.1339552907335; Tue, 12 Jun 2012 19:01:47 -0700 (PDT) Received: from e4.ny.us.ibm.com (e4.ny.us.ibm.com. [32.97.182.144]) by mx.google.com with ESMTPS id a2si1703110yhe.2.2012.06.12.19.01.47 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 12 Jun 2012 19:01:47 -0700 (PDT) Received-SPF: pass (google.com: domain of jstultz@us.ibm.com designates 32.97.182.144 as permitted sender) client-ip=32.97.182.144; Authentication-Results: mx.google.com; spf=pass (google.com: domain of jstultz@us.ibm.com designates 32.97.182.144 as permitted sender) smtp.mail=jstultz@us.ibm.com Received: from /spool/local by e4.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 12 Jun 2012 22:01:46 -0400 Received: from d01dlp01.pok.ibm.com (9.56.224.56) by e4.ny.us.ibm.com (192.168.1.104) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Tue, 12 Jun 2012 22:01:43 -0400 Received: from d01relay05.pok.ibm.com (d01relay05.pok.ibm.com [9.56.227.237]) by d01dlp01.pok.ibm.com (Postfix) with ESMTP id E7D5638C801C; Tue, 12 Jun 2012 22:01:42 -0400 (EDT) Received: from d01av04.pok.ibm.com (d01av04.pok.ibm.com [9.56.224.64]) by d01relay05.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q5D21ge0194616; Tue, 12 Jun 2012 22:01:42 -0400 Received: from d01av04.pok.ibm.com (loopback [127.0.0.1]) by d01av04.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q5D21gQt016200; Tue, 12 Jun 2012 22:01:42 -0400 Received: from kernel.beaverton.ibm.com (kernel.beaverton.ibm.com [9.47.67.96]) by d01av04.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id q5D21f2r016122; Tue, 12 Jun 2012 22:01:42 -0400 Received: by kernel.beaverton.ibm.com (Postfix, from userid 1056) id BA8E7C061F; Tue, 12 Jun 2012 19:01:40 -0700 (PDT) From: John Stultz To: LKML Cc: =?UTF-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?= , Russell King , Paul Gortmaker , Alexander Shishkin , Mathieu Poirier , John Stultz Subject: [PATCH 01/15] ARM: etm: Don't require clock control Date: Tue, 12 Jun 2012 19:01:19 -0700 Message-Id: <1339552887-17204-2-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 1.7.3.2.146.gca209 In-Reply-To: <1339552887-17204-1-git-send-email-john.stultz@linaro.org> References: <1339552887-17204-1-git-send-email-john.stultz@linaro.org> MIME-Version: 1.0 X-Content-Scanned: Fidelis XPS MAILER x-cbid: 12061302-3534-0000-0000-0000094E44E7 X-Gm-Message-State: ALoCoQmyD6z2MDLvuUKjoY2eWjkkb4GppWA8NnjbdvDMwgWnXrrJgEqtMuyJVbg/kqM3EChQzsxx From: Arve Hjønnevåg If clk_get fail, assume the etb does not need a separate clock. CC: Russell King CC: Paul Gortmaker CC: Alexander Shishkin CC: Mathieu Poirier Acked-by: Alexander Shishkin Signed-off-by: Arve Hjønnevåg Signed-off-by: John Stultz --- arch/arm/kernel/etm.c | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/arch/arm/kernel/etm.c b/arch/arm/kernel/etm.c index 36d20bd..bd295e8 100644 --- a/arch/arm/kernel/etm.c +++ b/arch/arm/kernel/etm.c @@ -362,13 +362,12 @@ static int __devinit etb_probe(struct amba_device *dev, const struct amba_id *id if (ret) goto out_unmap; + /* Get optional clock. Currently used to select clock source on omap3 */ t->emu_clk = clk_get(&dev->dev, "emu_src_ck"); - if (IS_ERR(t->emu_clk)) { + if (IS_ERR(t->emu_clk)) dev_dbg(&dev->dev, "Failed to obtain emu_src_ck.\n"); - return -EFAULT; - } - - clk_enable(t->emu_clk); + else + clk_enable(t->emu_clk); etb_unlock(t); t->etb_bufsz = etb_readl(t, ETBR_DEPTH); @@ -403,8 +402,10 @@ static int etb_remove(struct amba_device *dev) iounmap(t->etb_regs); t->etb_regs = NULL; - clk_disable(t->emu_clk); - clk_put(t->emu_clk); + if (!IS_ERR(t->emu_clk)) { + clk_disable(t->emu_clk); + clk_put(t->emu_clk); + } amba_release_regions(dev);