From mboxrd@z Thu Jan  1 00:00:00 1970
From: swarren@wwwdotorg.org (Stephen Warren)
Date: Mon, 11 Feb 2013 11:03:31 -0700
Subject: [PATCH REPOST] mmc: bcm2835: set
 SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK
In-Reply-To: <87k3qest87.fsf@octavius.laptop.org>
References: <1360382187-26296-1-git-send-email-swarren@wwwdotorg.org>
 <87k3qest87.fsf@octavius.laptop.org>
Message-ID: <51193273.6000901@wwwdotorg.org>
To: linux-arm-kernel@lists.infradead.org
List-Id: linux-arm-kernel.lists.infradead.org

On 02/11/2013 09:36 AM, Chris Ball wrote:
> Hi Stephen,
> 
> On Fri, Feb 08 2013, Stephen Warren wrote:
>> SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK does basically the same as
>> implementing struct sdhci_ops .get_timeout_clock, so simply set that
>> quirk and remove the custom code to simplify the driver.
>>
>> Reported-by: Lars-Peter Clausen <lars@metafoo.de>
>> Signed-off-by: Stephen Warren <swarren@wwwdotorg.org>
> 
> This conflicts with Lars-Peter's larger patch, which I just merged --
> I could merge the changes from both, which reduces your patch to this:

Yes, that updated patch looks fine to me.

I thought Lars-Peter was going to update his series on top of this
cleanup, but either way is fine.

Thanks.