]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
ARM: ux500: Provide device enumeration number suffix for SMSC911x
authorLee Jones <lee.jones@linaro.org>
Wed, 8 May 2013 13:29:06 +0000 (14:29 +0100)
committerLinus Walleij <linus.walleij@linaro.org>
Tue, 14 May 2013 08:30:55 +0000 (10:30 +0200)
First Ethernet device has a ".0" appended onto the device name.
Since on a non-DT boot the ethernet will be named "smsc911x.0"
and since the clocks are not converted to device tree these
names need to be matched when providing the name from
auxdata.

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

index 8894327283e18790e5881072c4124e05a759cdc8..46cca52890bcfd486f30018556059c12bcf22391 100644 (file)
@@ -276,7 +276,7 @@ static struct of_dev_auxdata u8500_auxdata_lookup[] __initdata = {
        OF_DEV_AUXDATA("st,nomadik-i2c", 0x8012a000, "nmk-i2c.4", NULL),
        OF_DEV_AUXDATA("stericsson,db8500-prcmu", 0x80157000, "db8500-prcmu",
                        &db8500_prcmu_pdata),
-       OF_DEV_AUXDATA("smsc,lan9115", 0x50000000, "smsc911x", NULL),
+       OF_DEV_AUXDATA("smsc,lan9115", 0x50000000, "smsc911x.0", NULL),
        /* Requires device name bindings. */
        OF_DEV_AUXDATA("stericsson,nmk-pinctrl", U8500_PRCMU_BASE,
                "pinctrl-db8500", NULL),