Revision 5c6f4f17 hw/z2.c
b/hw/z2.c | ||
---|---|---|
301 | 301 |
{ |
302 | 302 |
MemoryRegion *address_space_mem = get_system_memory(); |
303 | 303 |
uint32_t sector_len = 0x10000; |
304 |
PXA2xxState *cpu;
|
|
304 |
PXA2xxState *mpu;
|
|
305 | 305 |
DriveInfo *dinfo; |
306 | 306 |
int be; |
307 | 307 |
void *z2_lcd; |
... | ... | |
313 | 313 |
} |
314 | 314 |
|
315 | 315 |
/* Setup CPU & memory */ |
316 |
cpu = pxa270_init(address_space_mem, z2_binfo.ram_size, cpu_model);
|
|
316 |
mpu = pxa270_init(address_space_mem, z2_binfo.ram_size, cpu_model);
|
|
317 | 317 |
|
318 | 318 |
#ifdef TARGET_WORDS_BIGENDIAN |
319 | 319 |
be = 1; |
... | ... | |
337 | 337 |
} |
338 | 338 |
|
339 | 339 |
/* setup keypad */ |
340 |
pxa27x_register_keypad(cpu->kp, map, 0x100);
|
|
340 |
pxa27x_register_keypad(mpu->kp, map, 0x100);
|
|
341 | 341 |
|
342 | 342 |
/* MMC/SD host */ |
343 |
pxa2xx_mmci_handlers(cpu->mmc,
|
|
343 |
pxa2xx_mmci_handlers(mpu->mmc,
|
|
344 | 344 |
NULL, |
345 |
qdev_get_gpio_in(cpu->gpio, Z2_GPIO_SD_DETECT));
|
|
345 |
qdev_get_gpio_in(mpu->gpio, Z2_GPIO_SD_DETECT));
|
|
346 | 346 |
|
347 | 347 |
type_register_static(&zipit_lcd_info); |
348 | 348 |
type_register_static(&aer915_info); |
349 |
z2_lcd = ssi_create_slave(cpu->ssp[1], "zipit-lcd");
|
|
350 |
bus = pxa2xx_i2c_bus(cpu->i2c[0]);
|
|
349 |
z2_lcd = ssi_create_slave(mpu->ssp[1], "zipit-lcd");
|
|
350 |
bus = pxa2xx_i2c_bus(mpu->i2c[0]);
|
|
351 | 351 |
i2c_create_slave(bus, "aer915", 0x55); |
352 | 352 |
wm = i2c_create_slave(bus, "wm8750", 0x1b); |
353 |
cpu->i2s->opaque = wm;
|
|
354 |
cpu->i2s->codec_out = wm8750_dac_dat;
|
|
355 |
cpu->i2s->codec_in = wm8750_adc_dat;
|
|
356 |
wm8750_data_req_set(wm, cpu->i2s->data_req, cpu->i2s);
|
|
353 |
mpu->i2s->opaque = wm;
|
|
354 |
mpu->i2s->codec_out = wm8750_dac_dat;
|
|
355 |
mpu->i2s->codec_in = wm8750_adc_dat;
|
|
356 |
wm8750_data_req_set(wm, mpu->i2s->data_req, mpu->i2s);
|
|
357 | 357 |
|
358 |
qdev_connect_gpio_out(cpu->gpio, Z2_GPIO_LCD_CS,
|
|
358 |
qdev_connect_gpio_out(mpu->gpio, Z2_GPIO_LCD_CS,
|
|
359 | 359 |
qemu_allocate_irqs(z2_lcd_cs, z2_lcd, 1)[0]); |
360 | 360 |
|
361 | 361 |
if (kernel_filename) { |
... | ... | |
363 | 363 |
z2_binfo.kernel_cmdline = kernel_cmdline; |
364 | 364 |
z2_binfo.initrd_filename = initrd_filename; |
365 | 365 |
z2_binfo.board_id = 0x6dd; |
366 |
arm_load_kernel(&cpu->cpu->env, &z2_binfo);
|
|
366 |
arm_load_kernel(&mpu->cpu->env, &z2_binfo);
|
|
367 | 367 |
} |
368 | 368 |
} |
369 | 369 |
|
Also available in: Unified diff