diff options
Diffstat (limited to 'arch/arm/mach-davinci/board-sffsdr.c')
-rw-r--r-- | arch/arm/mach-davinci/board-sffsdr.c | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/arch/arm/mach-davinci/board-sffsdr.c b/arch/arm/mach-davinci/board-sffsdr.c index 08d373bfcc8..23e664a1a80 100644 --- a/arch/arm/mach-davinci/board-sffsdr.c +++ b/arch/arm/mach-davinci/board-sffsdr.c | |||
@@ -45,10 +45,7 @@ | |||
45 | #define SFFSDR_PHY_MASK (0x2) | 45 | #define SFFSDR_PHY_MASK (0x2) |
46 | #define SFFSDR_MDIO_FREQUENCY (2200000) /* PHY bus frequency */ | 46 | #define SFFSDR_MDIO_FREQUENCY (2200000) /* PHY bus frequency */ |
47 | 47 | ||
48 | #define DAVINCI_ASYNC_EMIF_CONTROL_BASE 0x01e00000 | 48 | static struct mtd_partition davinci_sffsdr_nandflash_partition[] = { |
49 | #define DAVINCI_ASYNC_EMIF_DATA_CE0_BASE 0x02000000 | ||
50 | |||
51 | struct mtd_partition davinci_sffsdr_nandflash_partition[] = { | ||
52 | /* U-Boot Environment: Block 0 | 49 | /* U-Boot Environment: Block 0 |
53 | * UBL: Block 1 | 50 | * UBL: Block 1 |
54 | * U-Boot: Blocks 6-7 (256 kb) | 51 | * U-Boot: Blocks 6-7 (256 kb) |
@@ -76,12 +73,12 @@ static struct flash_platform_data davinci_sffsdr_nandflash_data = { | |||
76 | 73 | ||
77 | static struct resource davinci_sffsdr_nandflash_resource[] = { | 74 | static struct resource davinci_sffsdr_nandflash_resource[] = { |
78 | { | 75 | { |
79 | .start = DAVINCI_ASYNC_EMIF_DATA_CE0_BASE, | 76 | .start = DM644X_ASYNC_EMIF_DATA_CE0_BASE, |
80 | .end = DAVINCI_ASYNC_EMIF_DATA_CE0_BASE + SZ_16M - 1, | 77 | .end = DM644X_ASYNC_EMIF_DATA_CE0_BASE + SZ_16M - 1, |
81 | .flags = IORESOURCE_MEM, | 78 | .flags = IORESOURCE_MEM, |
82 | }, { | 79 | }, { |
83 | .start = DAVINCI_ASYNC_EMIF_CONTROL_BASE, | 80 | .start = DM644X_ASYNC_EMIF_CONTROL_BASE, |
84 | .end = DAVINCI_ASYNC_EMIF_CONTROL_BASE + SZ_4K - 1, | 81 | .end = DM644X_ASYNC_EMIF_CONTROL_BASE + SZ_4K - 1, |
85 | .flags = IORESOURCE_MEM, | 82 | .flags = IORESOURCE_MEM, |
86 | }, | 83 | }, |
87 | }; | 84 | }; |
@@ -155,18 +152,13 @@ static __init void davinci_sffsdr_init(void) | |||
155 | davinci_cfg_reg(DM644X_VLYNQWD); | 152 | davinci_cfg_reg(DM644X_VLYNQWD); |
156 | } | 153 | } |
157 | 154 | ||
158 | static __init void davinci_sffsdr_irq_init(void) | ||
159 | { | ||
160 | davinci_irq_init(); | ||
161 | } | ||
162 | |||
163 | MACHINE_START(SFFSDR, "Lyrtech SFFSDR") | 155 | MACHINE_START(SFFSDR, "Lyrtech SFFSDR") |
164 | /* Maintainer: Hugo Villeneuve hugo.villeneuve@lyrtech.com */ | 156 | /* Maintainer: Hugo Villeneuve hugo.villeneuve@lyrtech.com */ |
165 | .phys_io = IO_PHYS, | 157 | .phys_io = IO_PHYS, |
166 | .io_pg_offst = (__IO_ADDRESS(IO_PHYS) >> 18) & 0xfffc, | 158 | .io_pg_offst = (__IO_ADDRESS(IO_PHYS) >> 18) & 0xfffc, |
167 | .boot_params = (DAVINCI_DDR_BASE + 0x100), | 159 | .boot_params = (DAVINCI_DDR_BASE + 0x100), |
168 | .map_io = davinci_sffsdr_map_io, | 160 | .map_io = davinci_sffsdr_map_io, |
169 | .init_irq = davinci_sffsdr_irq_init, | 161 | .init_irq = davinci_irq_init, |
170 | .timer = &davinci_timer, | 162 | .timer = &davinci_timer, |
171 | .init_machine = davinci_sffsdr_init, | 163 | .init_machine = davinci_sffsdr_init, |
172 | MACHINE_END | 164 | MACHINE_END |