diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-09-05 12:59:54 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-09-05 12:59:54 +0200 |
| commit | 6662e16dbbe426933a09d0564943b43fa10b9457 (patch) | |
| tree | db85d5358cfc50a3941b6a5a26e3b536e4092b92 /arch/ppc/boards | |
| parent | bed1a6ffab6ba8f59146af07ccbdc7a625b6496f (diff) | |
| parent | fa345fa012fda102e6e0f428f45bbe5c0bfcff66 (diff) | |
| download | barebox-6662e16dbbe426933a09d0564943b43fa10b9457.tar.gz barebox-6662e16dbbe426933a09d0564943b43fa10b9457.tar.xz | |
Merge branch 'for-next/ppc'
Conflicts:
arch/ppc/boards/freescale-p2020rdb/p2020rdb.c
arch/ppc/configs/p2020rdb_defconfig
arch/ppc/mach-mpc85xx/include/mach/immap_85xx.h
Diffstat (limited to 'arch/ppc/boards')
| -rw-r--r-- | arch/ppc/boards/freescale-p2020rdb/p2020rdb.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/arch/ppc/boards/freescale-p2020rdb/p2020rdb.c b/arch/ppc/boards/freescale-p2020rdb/p2020rdb.c index c5fae0d7aa..2431cb5d37 100644 --- a/arch/ppc/boards/freescale-p2020rdb/p2020rdb.c +++ b/arch/ppc/boards/freescale-p2020rdb/p2020rdb.c @@ -35,6 +35,7 @@ #include <mach/mpc85xx.h> #include <mach/mmu.h> #include <mach/immap_85xx.h> +#include <mach/gianfar.h> #include <mach/clock.h> #include <mach/early_udelay.h> @@ -62,6 +63,15 @@ #define SYSCLK_50 50000000 #define SYSCLK_100 100000000 +/* Ethernet. Use eTSEC3 */ +static struct gfar_info_struct gfar_info[] = { + { + .phyaddr = 1, + .tbiana = 0, + .tbicr = 0, + }, +}; + /* I2C busses. */ struct i2c_platform_data i2cplat = { .bitrate = 400000, @@ -76,6 +86,9 @@ static int devices_init(void) add_generic_device("i2c-fsl", 1, NULL, I2C2_BASE_ADDR, 0x100, IORESOURCE_MEM, &i2cplat); + /* eTSEC3 */ + fsl_eth_init(3, &gfar_info[0]); + devfs_add_partition("nor0", 0xf80000, 0x80000, DEVFS_PARTITION_FIXED, "self0"); return 0; |