diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2013-02-19 08:04:19 +0400 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2013-02-19 08:04:19 +0400 |
| commit | d30bd1a365e2fc4214953588cf6aa35446242d9c (patch) | |
| tree | 7c3bcb997bbc7ca64ca516cc6d6938de8014a6ed /arch | |
| parent | 3864842accb75f11f92e89217e7250250fcc9912 (diff) | |
| parent | 298590bf5b2b6d4f8e4fdb5e2c9c6bc27bf11dae (diff) | |
Merge branch 'tracking-ste-tb-ethernet' into merge-linux-linaro-core-tracking
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-ux500/cpu-db8500.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c index 5b286e06474c..431af66f3368 100644 --- a/arch/arm/mach-ux500/cpu-db8500.c +++ b/arch/arm/mach-ux500/cpu-db8500.c @@ -284,6 +284,7 @@ static struct of_dev_auxdata u8500_auxdata_lookup[] __initdata = { OF_DEV_AUXDATA("st,nomadik-i2c", 0x80128000, "nmk-i2c.2", NULL), OF_DEV_AUXDATA("st,nomadik-i2c", 0x80110000, "nmk-i2c.3", NULL), OF_DEV_AUXDATA("st,nomadik-i2c", 0x8012a000, "nmk-i2c.4", NULL), + OF_DEV_AUXDATA("smsc,lan9115", 0x50000000, "smsc911x", NULL), /* Requires device name bindings. */ OF_DEV_AUXDATA("stericsson,nmk_pinctrl", U8500_PRCMU_BASE, "pinctrl-db8500", NULL), |