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/arm/boards/edb93xx/edb93xx.c | |
parent | 849e910d07a2e6d9f1e8562f2d6ce1adf0034c51 (diff) | |
parent | 81d2b141e709505fcdf9a6c4df160894ddf28667 (diff) | |
download | barebox-43c1881110b28f42c58d45465a6b8cad06540ad0.tar.gz barebox-43c1881110b28f42c58d45465a6b8cad06540ad0.tar.xz |
Merge branch 'next'
Diffstat (limited to 'arch/arm/boards/edb93xx/edb93xx.c')
-rw-r--r-- | arch/arm/boards/edb93xx/edb93xx.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/arch/arm/boards/edb93xx/edb93xx.c b/arch/arm/boards/edb93xx/edb93xx.c index b0078a5227..0f127b5c5e 100644 --- a/arch/arm/boards/edb93xx/edb93xx.c +++ b/arch/arm/boards/edb93xx/edb93xx.c @@ -28,7 +28,7 @@ #include <partition.h> #include <asm/armlinux.h> #include <asm/io.h> -#include <asm/mach-types.h> +#include <generated/mach-types.h> #include <mach/ep93xx-regs.h> #include "edb93xx.h" @@ -39,6 +39,7 @@ * CS line 6, data width is 16 bit */ static struct device_d cfi_dev = { + .id = -1, .name = "cfi_flash", .map_base = 0x60000000, .size = EDB93XX_CFI_FLASH_SIZE, @@ -50,6 +51,7 @@ static struct memory_platform_data ram_dev_pdata0 = { }; static struct device_d sdram0_dev = { + .id = -1, .name = "mem", .map_base = CONFIG_EP93XX_SDRAM_BANK0_BASE, .size = CONFIG_EP93XX_SDRAM_BANK0_SIZE, @@ -63,6 +65,7 @@ static struct memory_platform_data ram_dev_pdata1 = { }; static struct device_d sdram1_dev = { + .id = -1, .name = "mem", .map_base = CONFIG_EP93XX_SDRAM_BANK1_BASE, .size = CONFIG_EP93XX_SDRAM_BANK1_SIZE, @@ -77,6 +80,7 @@ static struct memory_platform_data ram_dev_pdata2 = { }; static struct device_d sdram2_dev = { + .id = -1, .name = "mem", .map_base = CONFIG_EP93XX_SDRAM_BANK2_BASE, .size = CONFIG_EP93XX_SDRAM_BANK2_SIZE, @@ -91,6 +95,7 @@ static struct memory_platform_data ram_dev_pdata3 = { }; static struct device_d sdram3_dev = { + .id = -1, .name = "mem", .map_base = CONFIG_EP93XX_SDRAM_BANK3_BASE, .size = CONFIG_EP93XX_SDRAM_BANK3_SIZE, @@ -99,6 +104,7 @@ static struct device_d sdram3_dev = { #endif static struct device_d eth_dev = { + .id = -1, .name = "ep93xx_eth", }; @@ -149,6 +155,7 @@ static int ep93xx_devices_init(void) device_initcall(ep93xx_devices_init); static struct device_d edb93xx_serial_device = { + .id = -1, .name = "pl010_serial", .map_base = UART1_BASE, .size = 4096, |