From: Linus Walleij Date: Tue, 10 Apr 2012 16:43:59 +0000 (+0100) Subject: ARM: 7378/1: mmci: add support for the Nomadik MMCI variant X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=34fd421349ff;p=linux-beck.git ARM: 7378/1: mmci: add support for the Nomadik MMCI variant The Nomadik variant is somewhere inbetween the U300 and the Ux500 variant, its actually expose the same primecell ID as the U300 but had different characteristics so it needs a small revision bump and hard-coding from the board/device tree. After this it works just fine. Acked-by: Ulf Hansson Signed-off-by: Linus Walleij Signed-off-by: Russell King --- diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c index 032b84791a16..d11591601d3e 100644 --- a/drivers/mmc/host/mmci.c +++ b/drivers/mmc/host/mmci.c @@ -94,6 +94,17 @@ static struct variant_data variant_u300 = { .signal_direction = true, }; +static struct variant_data variant_nomadik = { + .fifosize = 16 * 4, + .fifohalfsize = 8 * 4, + .clkreg = MCI_CLK_ENABLE, + .datalength_bits = 24, + .sdio = true, + .st_clkdiv = true, + .pwrreg_powerup = MCI_PWR_ON, + .signal_direction = true, +}; + static struct variant_data variant_ux500 = { .fifosize = 30 * 4, .fifohalfsize = 8 * 4, @@ -1568,6 +1579,11 @@ static struct amba_id mmci_ids[] = { .mask = 0x00ffffff, .data = &variant_u300, }, + { + .id = 0x10180180, + .mask = 0xf0ffffff, + .data = &variant_nomadik, + }, { .id = 0x00280180, .mask = 0x00ffffff,