]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
ARM: ux500: Stop passing MMC's platform data for Device Tree boots
authorLee Jones <lee.jones@linaro.org>
Wed, 15 May 2013 09:51:28 +0000 (10:51 +0100)
committerLinus Walleij <linus.walleij@stericsson.com>
Tue, 6 Aug 2013 21:48:49 +0000 (23:48 +0200)
It was required to pass DMA channel configuration information to the
MMC driver before the new DMA API was in place. Now that it is, and
is fully compatible with Device Tree we can stop doing that.

Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
arch/arm/mach-ux500/cpu-db8500.c

index 12eee8167525dfd3f6e8cf6bec401408516b9dd1..2061b6a2a766aa947feda9e789c221355f08dbcb 100644 (file)
@@ -223,10 +223,10 @@ static struct of_dev_auxdata u8500_auxdata_lookup[] __initdata = {
        OF_DEV_AUXDATA("arm,pl011", 0x80121000, "uart1", NULL),
        OF_DEV_AUXDATA("arm,pl011", 0x80007000, "uart2", NULL),
        OF_DEV_AUXDATA("arm,pl022", 0x80002000, "ssp0",  &ssp0_plat),
-       OF_DEV_AUXDATA("arm,pl18x", 0x80126000, "sdi0",  &mop500_sdi0_data),
-       OF_DEV_AUXDATA("arm,pl18x", 0x80118000, "sdi1",  &mop500_sdi1_data),
-       OF_DEV_AUXDATA("arm,pl18x", 0x80005000, "sdi2",  &mop500_sdi2_data),
-       OF_DEV_AUXDATA("arm,pl18x", 0x80114000, "sdi4",  &mop500_sdi4_data),
+       OF_DEV_AUXDATA("arm,pl18x", 0x80126000, "sdi0",  NULL),
+       OF_DEV_AUXDATA("arm,pl18x", 0x80118000, "sdi1",  NULL),
+       OF_DEV_AUXDATA("arm,pl18x", 0x80005000, "sdi2",  NULL),
+       OF_DEV_AUXDATA("arm,pl18x", 0x80114000, "sdi4",  NULL),
        /* Requires clock name bindings. */
        OF_DEV_AUXDATA("st,nomadik-gpio", 0x8012e000, "gpio.0", NULL),
        OF_DEV_AUXDATA("st,nomadik-gpio", 0x8012e080, "gpio.1", NULL),