Commit bf64271c authored by Linus Walleij's avatar Linus Walleij Committed by Greg Kroah-Hartman

mmc: mmci: fix an ages old detection error

commit 0bcb7efd upstream.

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.

Fixes: 34fd4213 ("ARM: 7378/1: mmci: add support for the Nomadik...")
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 794c33bd
...@@ -1740,7 +1740,7 @@ static struct amba_id mmci_ids[] = { ...@@ -1740,7 +1740,7 @@ static struct amba_id mmci_ids[] = {
{ {
.id = 0x00280180, .id = 0x00280180,
.mask = 0x00ffffff, .mask = 0x00ffffff,
.data = &variant_u300, .data = &variant_nomadik,
}, },
{ {
.id = 0x00480180, .id = 0x00480180,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment