diff options
| author |   Linus Walleij <linus.walleij@linaro.org> | 2016-01-04 02:21:55 +0100 |
|---|---|---|
| committer |   Ulf Hansson <ulf.hansson@linaro.org> | 2016-01-14 10:46:33 +0100 |
| commit | 0bcb7efdff63564e80fe84dd36a9fbdfbf6697a4 (patch) | |
| tree | 632d775d822578c1c5205606cfe34b41b56bcbc2 /drivers/mmc | |
| parent | mmc: sd: limit SD card power limit according to cards capabilities (diff) | |
| download | linux-dev-0bcb7efdff63564e80fe84dd36a9fbdfbf6697a4.tar.xz linux-dev-0bcb7efdff63564e80fe84dd36a9fbdfbf6697a4.zip | |
mmc: mmci: fix an ages old detection error
commit 4956e10903fd ("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 34fd421349ff ("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: 34fd421349ff ("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>
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/host/mmci.c | 2 |
1 files changed, 1 insertions, 1 deletions
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, |