Commit 0bcb7efd authored Jan 04, 2016 by Linus Walleij Committed by Ulf Hansson Jan 14, 2016

mmc: mmci: fix an ages old detection error



commit 4956e109 ("ARM: 6244/1: mmci: add variant data and default
MCICLOCK support") added variant data for ARM, U300 and Ux500 variants.
The Nomadik NHK8815/8820 variant was erroneously labeled as a U300
variant, and when the proper Nomadik variant was later introduced in
commit 34fd4213 ("ARM: 7378/1: mmci: add support for the Nomadik MMCI
variant") this was not fixes. Let's say this fixes the latter commit as
there was no proper Nomadik support until then.

Cc: stable@vger.kernel.org
Fixes: 34fd4213 ("ARM: 7378/1: mmci: add support for the Nomadik...")
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

parent d9812780

drivers/mmc/host/mmci.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1886,7 +1886,7 @@ static struct amba_id mmci_ids[] = {
		{
		.id = 0x00280180,
		.mask = 0x00ffffff,
		.data = &variant_u300,
		.data = &variant_nomadik,
		},
		{
		.id = 0x00480180,

Admin message