From patchwork Wed Apr 21 15:14:19 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guennadi Liakhovetski X-Patchwork-Id: 93882 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o3LFF6Px000928 for ; Wed, 21 Apr 2010 15:15:23 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755624Ab0DUPOH (ORCPT ); Wed, 21 Apr 2010 11:14:07 -0400 Received: from mail.gmx.net ([213.165.64.20]:49148 "HELO mail.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1755615Ab0DUPOF (ORCPT ); Wed, 21 Apr 2010 11:14:05 -0400 Received: (qmail invoked by alias); 21 Apr 2010 15:14:01 -0000 Received: from p57BD1949.dip0.t-ipconnect.de (EHLO axis700.grange) [87.189.25.73] by mail.gmx.net (mp027) with SMTP; 21 Apr 2010 17:14:01 +0200 X-Authenticated: #20450766 X-Provags-ID: V01U2FsdGVkX1+V8oQQLLqVrqmC3aDFxqm4xdYCNCbIH8Mn79AEph gFwaQIHryWZK24 Received: from lyakh (helo=localhost) by axis700.grange with local-esmtp (Exim 4.63) (envelope-from ) id 1O4bd5-0004YW-8q; Wed, 21 Apr 2010 17:14:19 +0200 Date: Wed, 21 Apr 2010 17:14:19 +0200 (CEST) From: Guennadi Liakhovetski To: "linux-sh@vger.kernel.org" cc: Paul Mundt Subject: [PATCH] SH: fix TS field shift calculation for DMA drivers Message-ID: MIME-Version: 1.0 X-Y-GMX-Trusted: 0 X-FuHaFi: 0.5 Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Wed, 21 Apr 2010 15:15:43 +0000 (UTC) diff --git a/arch/sh/include/cpu-sh4/cpu/dma-register.h b/arch/sh/include/cpu-sh4/cpu/dma-register.h index 55f9fec..de23595 100644 --- a/arch/sh/include/cpu-sh4/cpu/dma-register.h +++ b/arch/sh/include/cpu-sh4/cpu/dma-register.h @@ -76,7 +76,7 @@ enum { } #define TS_INDEX2VAL(i) ((((i) & 3) << CHCR_TS_LOW_SHIFT) | \ - ((((i) >> 2) & 3) << CHCR_TS_HIGH_SHIFT)) + (((i) & 0xc) << CHCR_TS_HIGH_SHIFT)) #else /* CONFIG_CPU_SH4A */