diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2010-10-04 08:32:52 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2010-10-04 08:32:52 +0200 |
commit | 43c1881110b28f42c58d45465a6b8cad06540ad0 (patch) | |
tree | 4b964b15e2ed7e6acd6e375c39e575348fd988a2 /arch/m68k/boards/phycore_mcf54xx/phyCore_MCF54xx.c | |
parent | 849e910d07a2e6d9f1e8562f2d6ce1adf0034c51 (diff) | |
parent | 81d2b141e709505fcdf9a6c4df160894ddf28667 (diff) | |
download | barebox-43c1881110b28f42c58d45465a6b8cad06540ad0.tar.gz barebox-43c1881110b28f42c58d45465a6b8cad06540ad0.tar.xz |
Merge branch 'next'
Diffstat (limited to 'arch/m68k/boards/phycore_mcf54xx/phyCore_MCF54xx.c')
-rw-r--r-- | arch/m68k/boards/phycore_mcf54xx/phyCore_MCF54xx.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/m68k/boards/phycore_mcf54xx/phyCore_MCF54xx.c b/arch/m68k/boards/phycore_mcf54xx/phyCore_MCF54xx.c index 3bc2d12a42..3744950699 100644 --- a/arch/m68k/boards/phycore_mcf54xx/phyCore_MCF54xx.c +++ b/arch/m68k/boards/phycore_mcf54xx/phyCore_MCF54xx.c @@ -46,6 +46,7 @@ ulong mcfv4e_get_bus_clk(void) */ static struct device_d cfi_dev = { + .id = -1, .name = "cfi_flash", .map_base = CFG_FLASH_ADDRESS, .size = CFG_FLASH_SIZE, @@ -61,6 +62,7 @@ static struct fec_platform_data fec_info = static struct device_d network_dev0 = { + .id = -1, .name = "fec_mcf54xx", .map_base = MCF_FEC_ADDR(0), .size = MCF_FEC_SIZE(0), /* area size */ @@ -68,6 +70,7 @@ static struct device_d network_dev0 = }; static struct device_d network_dev1 = { + .id = -1, .name = "fec_mcf54xx", .map_base = MCF_FEC_ADDR(1), .size = MCF_FEC_SIZE(1), /* area size */ @@ -84,6 +87,7 @@ static struct memory_platform_data ram_pdata = { static struct device_d sdram_dev = { + .id = -1, .name = "mem", .map_base = CFG_SDRAM_ADDRESS, .size = CFG_SDRAM_SIZE, @@ -116,6 +120,7 @@ device_initcall(mcfv4e_devices_init); static struct device_d mcfv4e_serial_device = { + .id = -1, .name = "mcfv4e_serial", .map_base = 1 + CFG_EARLY_UART_PORT, .size = 16 * 1024, |