From patchwork Mon Mar 7 18:47: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: 616481 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 p27Im8l1030437 for ; Mon, 7 Mar 2011 18:48:12 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755407Ab1CGSsD (ORCPT ); Mon, 7 Mar 2011 13:48:03 -0500 Received: from moutng.kundenserver.de ([212.227.126.187]:63732 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755562Ab1CGSsB (ORCPT ); Mon, 7 Mar 2011 13:48:01 -0500 Received: from axis700.grange (pD9EB8CE6.dip0.t-ipconnect.de [217.235.140.230]) by mrelayeu.kundenserver.de (node=mrbap2) with ESMTP (Nemesis) id 0LhTpQ-1QImsh37qK-00n7Ds; Mon, 07 Mar 2011 19:48:00 +0100 Received: by axis700.grange (Postfix, from userid 1000) id 6976F189B86; Mon, 7 Mar 2011 19:47:59 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by axis700.grange (Postfix) with ESMTP id 66821189B85; Mon, 7 Mar 2011 19:47:59 +0100 (CET) Date: Mon, 7 Mar 2011 19:47:59 +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 4/5] sh: 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:gL+xxYVL57jQjABfuqDN7OmPw08r6gBnsRvsZrYd02Q zZgxH0iEXnZeXnHY6h1pogGR55dbCRzfUoUzfEy6CLnci6SW79 7o5LNh7azmp8Sx3kg2eLsD//W9AKKqhY7NbpjA87VNgk06fbWM OIaeL0yAdILkDtawmSVnWvfdN+xBgJY2xmnRML1FCaU5ZQrcAB H+cG5TGNrfzD5PsQm3bK0wJoETYK2MHMEYTLFgh8GQ= 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:12 +0000 (UTC) diff --git a/arch/sh/boards/mach-ap325rxa/setup.c b/arch/sh/boards/mach-ap325rxa/setup.c index 33bfebc..ea1f1a3 100644 --- a/arch/sh/boards/mach-ap325rxa/setup.c +++ b/arch/sh/boards/mach-ap325rxa/setup.c @@ -15,6 +15,7 @@ #include #include #include +#include #include #include #include @@ -427,6 +428,7 @@ static struct resource sdhi0_cn3_resources[] = { }; static struct sh_mobile_sdhi_info sdhi0_cn3_data = { + .tmio_flags = TMIO_MMC_HI_REGS_MISSING, .tmio_caps = MMC_CAP_SDIO_IRQ, }; @@ -457,6 +459,7 @@ static struct resource sdhi1_cn7_resources[] = { }; static struct sh_mobile_sdhi_info sdhi1_cn7_data = { + .tmio_flags = TMIO_MMC_HI_REGS_MISSING, .tmio_caps = MMC_CAP_SDIO_IRQ, }; diff --git a/arch/sh/boards/mach-ecovec24/setup.c b/arch/sh/boards/mach-ecovec24/setup.c index aa620fd..0cc86a4 100644 --- a/arch/sh/boards/mach-ecovec24/setup.c +++ b/arch/sh/boards/mach-ecovec24/setup.c @@ -12,6 +12,7 @@ #include #include #include +#include #include #include #include @@ -473,6 +474,7 @@ static struct sh_mobile_sdhi_info sdhi0_info = { .dma_slave_tx = SHDMA_SLAVE_SDHI0_TX, .dma_slave_rx = SHDMA_SLAVE_SDHI0_RX, .set_pwr = sdhi0_set_pwr, + .tmio_flags = TMIO_MMC_HI_REGS_MISSING, .tmio_caps = MMC_CAP_SDIO_IRQ | MMC_CAP_POWER_OFF_CARD, }; @@ -512,6 +514,7 @@ static void sdhi1_set_pwr(struct platform_device *pdev, int state) static struct sh_mobile_sdhi_info sdhi1_info = { .dma_slave_tx = SHDMA_SLAVE_SDHI1_TX, .dma_slave_rx = SHDMA_SLAVE_SDHI1_RX, + .tmio_flags = TMIO_MMC_HI_REGS_MISSING, .tmio_caps = MMC_CAP_SDIO_IRQ | MMC_CAP_POWER_OFF_CARD, .set_pwr = sdhi1_set_pwr, }; diff --git a/arch/sh/boards/mach-kfr2r09/setup.c b/arch/sh/boards/mach-kfr2r09/setup.c index 7504daa..fa473d4 100644 --- a/arch/sh/boards/mach-kfr2r09/setup.c +++ b/arch/sh/boards/mach-kfr2r09/setup.c @@ -366,7 +366,7 @@ static struct resource kfr2r09_sh_sdhi0_resources[] = { static struct sh_mobile_sdhi_info sh7724_sdhi0_data = { .dma_slave_tx = SHDMA_SLAVE_SDHI0_TX, .dma_slave_rx = SHDMA_SLAVE_SDHI0_RX, - .tmio_flags = TMIO_MMC_WRPROTECT_DISABLE, + .tmio_flags = TMIO_MMC_WRPROTECT_DISABLE | TMIO_MMC_HI_REGS_MISSING, .tmio_caps = MMC_CAP_SDIO_IRQ, }; diff --git a/arch/sh/boards/mach-migor/setup.c b/arch/sh/boards/mach-migor/setup.c index 03a7ffe..20e641e 100644 --- a/arch/sh/boards/mach-migor/setup.c +++ b/arch/sh/boards/mach-migor/setup.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #include @@ -411,6 +412,7 @@ static struct resource sdhi_cn9_resources[] = { static struct sh_mobile_sdhi_info sh7724_sdhi_data = { .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, }; diff --git a/arch/sh/boards/mach-se/7724/setup.c b/arch/sh/boards/mach-se/7724/setup.c index 5276793..2ca3253 100644 --- a/arch/sh/boards/mach-se/7724/setup.c +++ b/arch/sh/boards/mach-se/7724/setup.c @@ -15,6 +15,7 @@ #include #include #include +#include #include #include #include @@ -472,6 +473,7 @@ static struct resource sdhi0_cn7_resources[] = { static struct sh_mobile_sdhi_info sh7724_sdhi0_data = { .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, }; @@ -504,6 +506,7 @@ static struct resource sdhi1_cn8_resources[] = { static struct sh_mobile_sdhi_info sh7724_sdhi1_data = { .dma_slave_tx = SHDMA_SLAVE_SDHI1_TX, .dma_slave_rx = SHDMA_SLAVE_SDHI1_RX, + .tmio_flags = TMIO_MMC_HI_REGS_MISSING, .tmio_caps = MMC_CAP_SDIO_IRQ, };