Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755461AbZG0I6I (ORCPT ); Mon, 27 Jul 2009 04:58:08 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755370AbZG0I6I (ORCPT ); Mon, 27 Jul 2009 04:58:08 -0400 Received: from smtp.nokia.com ([192.100.122.230]:47286 "EHLO mgw-mx03.nokia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755266AbZG0I6G (ORCPT ); Mon, 27 Jul 2009 04:58:06 -0400 Message-ID: <4A6D6C2E.6060306@nokia.com> Date: Mon, 27 Jul 2009 11:58:22 +0300 From: Adrian Hunter User-Agent: Thunderbird 2.0.0.21 (X11/20090318) MIME-Version: 1.0 To: Matt Fleming CC: Pierre Ossman , "Lavinen Jarkko (Nokia-D/Helsinki)" , "Karpov Denis.2 (EXT-Teleca/Helsinki)" , lkml , linux-omap Mailing List Subject: Re: [PATCH 32/32] ARM: OMAP: RX51: set MMC capabilities and power-saving flag References: <20090710124004.1262.10422.sendpatchset@ahunter-tower> <20090710124353.1262.22788.sendpatchset@ahunter-tower> <20090725235329.GE12665@console-pimps.org> <4A6D5E40.7030608@nokia.com> <20090727082721.GG12665@console-pimps.org> In-Reply-To: <20090727082721.GG12665@console-pimps.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-OriginalArrivalTime: 27 Jul 2009 08:57:49.0067 (UTC) FILETIME=[51065DB0:01CA0E98] X-Nokia-AV: Clean Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2153 Lines: 59 ext Matt Fleming wrote: > On Mon, Jul 27, 2009 at 10:58:56AM +0300, Adrian Hunter wrote: >> Matt Fleming wrote: >>> On Fri, Jul 10, 2009 at 03:43:53PM +0300, Adrian Hunter wrote: >>>> >From 3865867159f25cf706480236f6d4f0e4adde5dac Mon Sep 17 00:00:00 2001 >>>> From: Adrian Hunter >>>> Date: Fri, 10 Jul 2009 10:32:44 +0300 >>>> Subject: [PATCH] ARM: OMAP: RX51: set MMC capabilities and power-saving flag >>>> >>>> Specify MMC capabilities and set the power-saving flag >>>> for RX51. >>>> >>> After the changes to [PATCH 7/32], this becomes, >> I think this will leave every other board that uses omap_hsmmc >> without any card caps. >> > > Doh. You're right, good catch! > >> What about adding something like this: >> >> >> diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c >> index 8900bae..f2548f1 100644 >> --- a/drivers/mmc/host/omap_hsmmc.c >> +++ b/drivers/mmc/host/omap_hsmmc.c >> @@ -1720,6 +1720,11 @@ static int __init omap_hsmmc_probe(struct platform_device *pdev) >> mmc->caps |= MMC_CAP_4_BIT_DATA; >> >> mmc->caps |= mmc_slot(host).caps; >> + /* If no card caps specified then assume them all */ >> + if (!((mmc->caps & MMC_CAP_SD) || >> + (mmc->caps & MMC_CAP_MMC) || >> + (mmc->caps & MMC_CAP_SDIO))) >> + mmc->caps |= MMC_CAP_SD & MMC_CAP_MMC & MMC_CAP_SDIO; >> >> omap_hsmmc_conf_bus_power(host); >> > > Those & should be | > > /* If no card caps specified then assume them all */ > if (!((mmc->caps & MMC_CAP_SD) || > (mmc->caps & MMC_CAP_MMC) || > (mmc->caps & MMC_CAP_SDIO))) > mmc->caps |= MMC_CAP_SD | MMC_CAP_MMC | MMC_CAP_SDIO; > > or more compactly, > > /* If no card caps specified then assume them all */ > if (!(mmc->caps & (MMC_CAP_SD | MMC_CAP_SDIO | MMC_CAP_MMC))) > mmc->caps |= MMC_CAP_SD | MMC_CAP_MMC | MMC_CAP_SDIO; Yes much nicer. Will you add it to your patch? -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/