Dear Stefano,
in message 4707DAFB.8030407@denx.de you wrote:
MMC support for X_Scale PXA is broken and does not work. Mainly, the mmc_init() function cannot recognize current SD/MMC cards. There were already some patches around the world but none of them was merged into the official u-boot tree.
This patch makes order fixing this issue.
Applied and tested on PXA 270 (TrizepsIV module).
Signed-off-by: Stefano Babic sbabic@denx.de
I'm sorry, but this patch violates the coding style and does not apply:
Space in indent is followed by a tab. .dotest/patch:76: /* Linux says: Space in indent is followed by a tab. .dotest/patch:77: * Did I mention this is Sick. We always need to Space in indent is followed by a tab. .dotest/patch:78: * discard the upper 8 bits of the first 16-bit word. Space in indent is followed by a tab. .dotest/patch:79: */ Space in indent is followed by a tab. .dotest/patch:359: udelay(200000); error: patch failed: cpu/pxa/mmc.c:392 error: cpu/pxa/mmc.c: patch does not apply Using index info to reconstruct a base tree... Space in indent is followed by a tab. <stdin>:76: /* Linux says: Space in indent is followed by a tab. <stdin>:77: * Did I mention this is Sick. We always need to Space in indent is followed by a tab. <stdin>:78: * discard the upper 8 bits of the first 16-bit word. Space in indent is followed by a tab. <stdin>:79: */ Space in indent is followed by a tab. <stdin>:359: udelay(200000); warning: squelched 2 whitespace errors warning: 7 lines add trailing whitespaces. Falling back to patching base and 3-way merge... Auto-merged cpu/pxa/mmc.c CONFLICT (content): Merge conflict in cpu/pxa/mmc.c Failed to merge in the changes. Patch failed at 0001.
Please clean up and rebase if needed, then resubmit (ideally *soon* so it can go into the 1.3.0 release). Thanks in advance.
Ciao,
Wolfgang Denk