From patchwork Wed Dec 22 07:11:13 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip Rakity X-Patchwork-Id: 426301 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 oBM7DxxR022734 for ; Wed, 22 Dec 2010 07:15:44 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752076Ab0LVHPo (ORCPT ); Wed, 22 Dec 2010 02:15:44 -0500 Received: from na3sys009aog108.obsmtp.com ([74.125.149.199]:43607 "HELO na3sys009aog108.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1752007Ab0LVHPo (ORCPT ); Wed, 22 Dec 2010 02:15:44 -0500 Received: from source ([65.219.4.130]) (using TLSv1) by na3sys009aob108.postini.com ([74.125.148.12]) with SMTP ID DSNKTRGlm+IsYVjWtbNf5BK1gwNl2FzRv0n2@postini.com; Tue, 21 Dec 2010 23:15:43 PST Received: from SC-vEXCH3.marvell.com ([10.93.76.133]) by sc-owa02.marvell.com ([10.93.76.22]) with mapi; Tue, 21 Dec 2010 23:11:14 -0800 From: Philip Rakity To: "linux-mmc@vger.kernel.org" , "linux-arm-kernel@lists.infradead.org" CC: Mark Brown Date: Tue, 21 Dec 2010 23:11:13 -0800 Subject: [PATCH 21/23] Alternative mmc structure to support pxa168, pxa910, mmp2 family SD Thread-Topic: [PATCH 21/23] Alternative mmc structure to support pxa168, pxa910, mmp2 family SD Thread-Index: Acuhp2re+5FSOQCBRDe574ZwwdyR6g== Message-ID: <8C0DD4AF-253D-47E2-88BC-90375FE7A782@marvell.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: yes X-MS-TNEF-Correlator: acceptlanguage: en-US MIME-Version: 1.0 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.3 (demeter1.kernel.org [140.211.167.41]); Wed, 22 Dec 2010 07:15:44 +0000 (UTC) diff --git a/drivers/mmc/host/sdhci-mmp2.c b/drivers/mmc/host/sdhci-mmp2.c index 6824177..7303421 100644 --- a/drivers/mmc/host/sdhci-mmp2.c +++ b/drivers/mmc/host/sdhci-mmp2.c @@ -39,7 +39,6 @@ #define DRIVER_NAME "sdhci-mmp2" -#define HOST_CTRL_2 0x3E #define ASYNC_INT_EN (1 << 14) #define SD_CFG_FIFO_PARAM 0x100 @@ -148,9 +147,9 @@ static void programFIFO(struct sdhci_host *host, int enable) tmp = readw(host->ioaddr + HOST_CTRL_2); if (enable) - tmp |= ASYNC_INT_EN; + tmp |= SDCTRL_2_ASYNC_INT_EN; else - tmp &= ~ASYNC_INT_EN; + tmp &= ~SDCTRL_2_ASYNC_INT_EN; writew(tmp, host->ioaddr + HOST_CTRL_2); }