From patchwork Fri May 23 10:31:41 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 30716 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oa0-f71.google.com (mail-oa0-f71.google.com [209.85.219.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 03FB320369 for ; Fri, 23 May 2014 10:36:16 +0000 (UTC) Received: by mail-oa0-f71.google.com with SMTP id m1sf22256175oag.10 for ; Fri, 23 May 2014 03:36:16 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=rlRxNG1MFr2EZ/nWWI25VrfPfL4wM2SDgsxXrrGdADo=; b=Ftcwd02C9r2aJjOmnfnFk9weniOHHL/Ery+VIm+BprioVZUQqoJiWS6JEdV28FGNU/ nKumDoY2X1hg/U5sT5nX4IHS6n1buvVpNvx+VpmKGhtcsVUAGvX4QFAJcOOpZH4ELWPr XkiZkKrBzWAgo7k6ETBpWHuYAe8PKBfxEqK3KwI2a2o1wfvLjJ+ZlDV8SeVawfkNilUW kcYgt3igQUm4rduOtvCMeMYbDogKRb+x62tK9tjmDWQJKQSj8w8W75jeSfES0Jyh7DCV oYfVUMfC+BQjzuMKY2hENuhYf9RC2UACMjyTwC8ysI3nDSSxqbO3vSoTMv0O5XyLkxz3 QUoA== X-Gm-Message-State: ALoCoQno8gVbWWUjV5IwmlhML8Dcvq+XhQkaLsq2fN0RbhcgDXcJblMyFeLpNskszLh0iE/CIFJe X-Received: by 10.50.30.40 with SMTP id p8mr1221658igh.6.1400841376588; Fri, 23 May 2014 03:36:16 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.18.200 with SMTP id 66ls1672761qgf.24.gmail; Fri, 23 May 2014 03:36:16 -0700 (PDT) X-Received: by 10.52.103.74 with SMTP id fu10mr2878378vdb.7.1400841376468; Fri, 23 May 2014 03:36:16 -0700 (PDT) Received: from mail-ve0-f175.google.com (mail-ve0-f175.google.com [209.85.128.175]) by mx.google.com with ESMTPS id pz3si1385196vec.56.2014.05.23.03.36.16 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 23 May 2014 03:36:16 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.175 as permitted sender) client-ip=209.85.128.175; Received: by mail-ve0-f175.google.com with SMTP id jw12so5947079veb.6 for ; Fri, 23 May 2014 03:36:16 -0700 (PDT) X-Received: by 10.58.228.163 with SMTP id sj3mr3457305vec.28.1400841376397; Fri, 23 May 2014 03:36:16 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.221.72 with SMTP id ib8csp20056vcb; Fri, 23 May 2014 03:36:15 -0700 (PDT) X-Received: by 10.66.147.99 with SMTP id tj3mr4677467pab.47.1400841375654; Fri, 23 May 2014 03:36:15 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id bz3si3247541pbd.157.2014.05.23.03.36.15 for ; Fri, 23 May 2014 03:36:15 -0700 (PDT) Received-SPF: none (google.com: linux-kernel-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753352AbaEWKf6 (ORCPT + 27 others); Fri, 23 May 2014 06:35:58 -0400 Received: from mail-we0-f174.google.com ([74.125.82.174]:40705 "EHLO mail-we0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753133AbaEWKcx (ORCPT ); Fri, 23 May 2014 06:32:53 -0400 Received: by mail-we0-f174.google.com with SMTP id k48so4682430wev.19 for ; Fri, 23 May 2014 03:32:52 -0700 (PDT) X-Received: by 10.180.185.244 with SMTP id ff20mr2459981wic.42.1400841172336; Fri, 23 May 2014 03:32:52 -0700 (PDT) Received: from localhost.localdomain (AToulouse-654-1-404-187.w82-125.abo.wanadoo.fr. [82.125.3.187]) by mx.google.com with ESMTPSA id s9sm2200908wix.13.2014.05.23.03.32.51 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 23 May 2014 03:32:51 -0700 (PDT) From: Daniel Lezcano To: tglx@linutronix.de, mingo@kernel.org Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 61/71] clocksource: sh_tmu: Fix channel IRQ retrieval in legacy case Date: Fri, 23 May 2014 12:31:41 +0200 Message-Id: <1400841111-6683-61-git-send-email-daniel.lezcano@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1400841111-6683-1-git-send-email-daniel.lezcano@linaro.org> References: <537F214C.8000700@linaro.org> <1400841111-6683-1-git-send-email-daniel.lezcano@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: daniel.lezcano@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.175 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: Laurent Pinchart In the legacy platform data case each TMU platform device handles a single channel with a single IRQ for the platform device. Retrieve the IRQ using the logical channel number instead of the hardware channel number. Signed-off-by: Laurent Pinchart Signed-off-by: Daniel Lezcano --- drivers/clocksource/sh_tmu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/clocksource/sh_tmu.c b/drivers/clocksource/sh_tmu.c index 4ba2c0f..ec34095 100644 --- a/drivers/clocksource/sh_tmu.c +++ b/drivers/clocksource/sh_tmu.c @@ -498,7 +498,7 @@ static int sh_tmu_channel_setup(struct sh_tmu_channel *ch, unsigned int index, ch->base = tmu->mapbase + 8 + ch->index * 12; } - ch->irq = platform_get_irq(tmu->pdev, ch->index); + ch->irq = platform_get_irq(tmu->pdev, index); if (ch->irq < 0) { dev_err(&tmu->pdev->dev, "ch%u: failed to get irq\n", ch->index);