From patchwork Tue May 24 10:23:59 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guennadi Liakhovetski X-Patchwork-Id: 811402 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.3) with ESMTP id p4OAO6x9016426 for ; Tue, 24 May 2011 10:24:06 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753681Ab1EXKYE (ORCPT ); Tue, 24 May 2011 06:24:04 -0400 Received: from moutng.kundenserver.de ([212.227.17.9]:57794 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752589Ab1EXKYE (ORCPT ); Tue, 24 May 2011 06:24:04 -0400 Received: from axis700.grange (dslb-094-221-030-047.pools.arcor-ip.net [94.221.30.47]) by mrelayeu.kundenserver.de (node=mrbap1) with ESMTP (Nemesis) id 0MZwWl-1Q5Mch0gZj-00LO6q; Tue, 24 May 2011 12:24:00 +0200 Received: by axis700.grange (Postfix, from userid 1000) id B7AF4189B6D; Tue, 24 May 2011 12:23:59 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by axis700.grange (Postfix) with ESMTP id B47CB189B6B; Tue, 24 May 2011 12:23:59 +0200 (CEST) Date: Tue, 24 May 2011 12:23:59 +0200 (CEST) From: Guennadi Liakhovetski X-X-Sender: lyakh@axis700.grange To: linux-sh@vger.kernel.org cc: linux-mmc@vger.kernel.org, Simon Horman , Magnus Damm , Ian Molton , Dan Williams , Vinod Koul Subject: [PATCH 1/3] sh: mark DMA slave ID 0 as invalid In-Reply-To: Message-ID: References: MIME-Version: 1.0 X-Provags-ID: V02:K0:JqoXJg6MBkQGfAMef9EctJy0ByNHPif98N6t2yRgKO2 D2fBvziWcirY225U22IV7fb76L6O0349ZkUz4qvKwl5d2N/Kkc Ooo2R/K8E7iBFOp3SyR+yapG7GYCQkdHjCBy5w7sLbjlVM+n1+ pIxw4M2tsmdyFWhSmv/qzgESSgrxwvNzmPI7ARyPdPx8cUj41V xMHPT/7DHrsY/4nGnUOMewZ052W1P+J3JMrZUOclOg= Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Tue, 24 May 2011 10:24:06 +0000 (UTC) This makes it possible to leave DMA slave IDs in the platform data at default 0 value without hitting DMA channel allocation error paths. Signed-off-by: Guennadi Liakhovetski --- arch/sh/include/cpu-sh4/cpu/sh7722.h | 1 + arch/sh/include/cpu-sh4/cpu/sh7724.h | 1 + arch/sh/include/cpu-sh4/cpu/sh7757.h | 1 + 3 files changed, 3 insertions(+), 0 deletions(-) diff --git a/arch/sh/include/cpu-sh4/cpu/sh7722.h b/arch/sh/include/cpu-sh4/cpu/sh7722.h index 7a5b8a3..bd06227 100644 --- a/arch/sh/include/cpu-sh4/cpu/sh7722.h +++ b/arch/sh/include/cpu-sh4/cpu/sh7722.h @@ -236,6 +236,7 @@ enum { }; enum { + SHDMA_SLAVE_INVALID, SHDMA_SLAVE_SCIF0_TX, SHDMA_SLAVE_SCIF0_RX, SHDMA_SLAVE_SCIF1_TX, diff --git a/arch/sh/include/cpu-sh4/cpu/sh7724.h b/arch/sh/include/cpu-sh4/cpu/sh7724.h index 7eb4359..3daef8e 100644 --- a/arch/sh/include/cpu-sh4/cpu/sh7724.h +++ b/arch/sh/include/cpu-sh4/cpu/sh7724.h @@ -285,6 +285,7 @@ enum { }; enum { + SHDMA_SLAVE_INVALID, SHDMA_SLAVE_SCIF0_TX, SHDMA_SLAVE_SCIF0_RX, SHDMA_SLAVE_SCIF1_TX, diff --git a/arch/sh/include/cpu-sh4/cpu/sh7757.h b/arch/sh/include/cpu-sh4/cpu/sh7757.h index 05b8196..41f9f8b 100644 --- a/arch/sh/include/cpu-sh4/cpu/sh7757.h +++ b/arch/sh/include/cpu-sh4/cpu/sh7757.h @@ -252,6 +252,7 @@ enum { }; enum { + SHDMA_SLAVE_INVALID, SHDMA_SLAVE_SDHI_TX, SHDMA_SLAVE_SDHI_RX, SHDMA_SLAVE_MMCIF_TX,