commit 4956e10903fd3459306dd9438c1e714ba3068a2a
"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
34fd421349ffc6a4280b71276bf7c6d48f92156f
"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@xxxxxxxxxxxxxxx
Fixes: 34fd421349ff "ARM: 7378/1: mmci: add support for the Nomadik MMCI variant"
Signed-off-by: Linus Walleij <linus.walleij@xxxxxxxxxx>
---
drivers/mmc/host/mmci.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
index fb266745f824..acece3299756 100644
--- a/drivers/mmc/host/mmci.c
+++ b/drivers/mmc/host/mmci.c
@@ -1886,7 +1886,7 @@ static struct amba_id mmci_ids[] = {
{
.id = 0x00280180,
.mask = 0x00ffffff,
- .data = &variant_u300,
+ .data = &variant_nomadik,
},
{
.id = 0x00480180,
--
2.4.3
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html