lkml.org 
[lkml]   [2016]   [Mar]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.12 089/116] mmc: mmci: fix an ages old detection error
    Date
    From: Linus Walleij <linus.walleij@linaro.org>

    3.12-stable review patch. If anyone has any objections, please let me know.

    ===============

    commit 0bcb7efdff63564e80fe84dd36a9fbdfbf6697a4 upstream.

    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.

    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>
    Signed-off-by: Jiri Slaby <jslaby@suse.cz>
    ---
    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 c3785edc0e92..3755f4a43622 100644
    --- a/drivers/mmc/host/mmci.c
    +++ b/drivers/mmc/host/mmci.c
    @@ -1827,7 +1827,7 @@ static struct amba_id mmci_ids[] = {
    {
    .id = 0x00280180,
    .mask = 0x00ffffff,
    - .data = &variant_u300,
    + .data = &variant_nomadik,
    },
    {
    .id = 0x00480180,
    --
    2.7.2
    \
     
     \ /
      Last update: 2016-03-04 11:01    [W:3.470 / U:0.688 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site