From patchwork Mon Mar 7 18:47:55 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guennadi Liakhovetski X-Patchwork-Id: 616441 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p27Im8kx030437 for ; Mon, 7 Mar 2011 18:48:11 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755570Ab1CGSr7 (ORCPT ); Mon, 7 Mar 2011 13:47:59 -0500 Received: from moutng.kundenserver.de ([212.227.126.171]:55469 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755562Ab1CGSr6 (ORCPT ); Mon, 7 Mar 2011 13:47:58 -0500 Received: from axis700.grange (pD9EB8CE6.dip0.t-ipconnect.de [217.235.140.230]) by mrelayeu.kundenserver.de (node=mrbap2) with ESMTP (Nemesis) id 0M2XRt-1QD6Ug227R-00syXn; Mon, 07 Mar 2011 19:47:55 +0100 Received: by axis700.grange (Postfix, from userid 1000) id 2B916189B86; Mon, 7 Mar 2011 19:47:55 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by axis700.grange (Postfix) with ESMTP id 19DD8189B85; Mon, 7 Mar 2011 19:47:55 +0100 (CET) Date: Mon, 7 Mar 2011 19:47:55 +0100 (CET) From: Guennadi Liakhovetski X-X-Sender: lyakh@axis700.grange To: linux-sh@vger.kernel.org cc: linux-mmc@vger.kernel.org, Chris Ball , Ian Molton Subject: [PATCH 3/5] ARM: mach-shmobile: use the new TMIO_MMC_HI_REGS_MISSING flag for SDHI In-Reply-To: Message-ID: References: MIME-Version: 1.0 X-Provags-ID: V02:K0:s1t8BGIEIdBTCTH6WwQxk4ey+HpqCjqsn93wMSs/DNa j+tIYOEPtG9/Jp3lBJQVYajfWjOiFg4PzuOyQ5t/fRWPeJEWQe /3JHCGEw4E/OjHjj8WDJC6DPqk/XZnz6FlhD4vaNwhZc3+cldv OnyWXsLhnr6/tPm3FzaiF8z0UQXCoA6IelSNnwpq9HshfkCVyi TV+jXtgsrVblUyIpVtqjqPy+YjO/cNubMBzzFqqi/o= 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 (demeter1.kernel.org [140.211.167.41]); Mon, 07 Mar 2011 18:48:11 +0000 (UTC) diff --git a/arch/arm/mach-shmobile/board-ap4evb.c b/arch/arm/mach-shmobile/board-ap4evb.c index 3cf0951..7a7b472 100644 --- a/arch/arm/mach-shmobile/board-ap4evb.c +++ b/arch/arm/mach-shmobile/board-ap4evb.c @@ -305,6 +305,7 @@ static struct platform_device sh_mmcif_device = { static struct sh_mobile_sdhi_info sdhi0_info = { .dma_slave_tx = SHDMA_SLAVE_SDHI0_TX, .dma_slave_rx = SHDMA_SLAVE_SDHI0_RX, + .tmio_flags = TMIO_MMC_HI_REGS_MISSING, .tmio_caps = MMC_CAP_SDIO_IRQ, }; @@ -336,7 +337,7 @@ static struct sh_mobile_sdhi_info sdhi1_info = { .dma_slave_tx = SHDMA_SLAVE_SDHI1_TX, .dma_slave_rx = SHDMA_SLAVE_SDHI1_RX, .tmio_ocr_mask = MMC_VDD_165_195, - .tmio_flags = TMIO_MMC_WRPROTECT_DISABLE, + .tmio_flags = TMIO_MMC_WRPROTECT_DISABLE | TMIO_MMC_HI_REGS_MISSING, .tmio_caps = MMC_CAP_NEEDS_POLL | MMC_CAP_SDIO_IRQ, .get_cd = slot_cn7_get_cd, }; diff --git a/arch/arm/mach-shmobile/board-mackerel.c b/arch/arm/mach-shmobile/board-mackerel.c index 6c9d8b8..2e81352 100644 --- a/arch/arm/mach-shmobile/board-mackerel.c +++ b/arch/arm/mach-shmobile/board-mackerel.c @@ -663,6 +663,7 @@ static int slot_cn7_get_cd(struct platform_device *pdev) static struct sh_mobile_sdhi_info sdhi0_info = { .dma_slave_tx = SHDMA_SLAVE_SDHI0_TX, .dma_slave_rx = SHDMA_SLAVE_SDHI0_RX, + .tmio_flags = TMIO_MMC_HI_REGS_MISSING, .tmio_caps = MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ, }; @@ -695,7 +696,7 @@ static struct sh_mobile_sdhi_info sdhi1_info = { .dma_slave_tx = SHDMA_SLAVE_SDHI1_TX, .dma_slave_rx = SHDMA_SLAVE_SDHI1_RX, .tmio_ocr_mask = MMC_VDD_165_195, - .tmio_flags = TMIO_MMC_WRPROTECT_DISABLE, + .tmio_flags = TMIO_MMC_WRPROTECT_DISABLE | TMIO_MMC_HI_REGS_MISSING, .tmio_caps = MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ | MMC_CAP_NEEDS_POLL, .get_cd = slot_cn7_get_cd, @@ -738,7 +739,7 @@ static int slot_cn23_get_cd(struct platform_device *pdev) static struct sh_mobile_sdhi_info sdhi2_info = { .dma_slave_tx = SHDMA_SLAVE_SDHI2_TX, .dma_slave_rx = SHDMA_SLAVE_SDHI2_RX, - .tmio_flags = TMIO_MMC_WRPROTECT_DISABLE, + .tmio_flags = TMIO_MMC_WRPROTECT_DISABLE | TMIO_MMC_HI_REGS_MISSING, .tmio_caps = MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ | MMC_CAP_NEEDS_POLL, .get_cd = slot_cn23_get_cd,