Revision b9d38e95 hw/omap2.c
b/hw/omap2.c | ||
---|---|---|
1055 | 1055 |
s->modules = modules; |
1056 | 1056 |
for (i = 0; i < modules; i ++) |
1057 | 1057 |
omap_gpio_module_init(s->module + i, ta, region[i], |
1058 |
irq[i], 0, 0, fclk[i], iclk);
|
|
1058 |
irq[i], NULL, NULL, fclk[i], iclk);
|
|
1059 | 1059 |
|
1060 | 1060 |
omap_gpif_reset(s); |
1061 | 1061 |
|
... | ... | |
1615 | 1615 |
if (s->codec.in_voice) { |
1616 | 1616 |
AUD_set_active_in(s->codec.in_voice, 0); |
1617 | 1617 |
AUD_close_in(&s->codec.card, s->codec.in_voice); |
1618 |
s->codec.in_voice = 0;
|
|
1618 |
s->codec.in_voice = NULL;
|
|
1619 | 1619 |
} |
1620 | 1620 |
if (s->codec.out_voice) { |
1621 | 1621 |
omap_eac_out_empty(s); |
1622 | 1622 |
AUD_set_active_out(s->codec.out_voice, 0); |
1623 | 1623 |
AUD_close_out(&s->codec.card, s->codec.out_voice); |
1624 |
s->codec.out_voice = 0;
|
|
1624 |
s->codec.out_voice = NULL;
|
|
1625 | 1625 |
s->codec.txavail = 0; |
1626 | 1626 |
} |
1627 | 1627 |
/* Discard what couldn't be written */ |
... | ... | |
2555 | 2555 |
struct omap_target_agent_s *omap_l4ta_get(struct omap_l4_s *bus, int cs) |
2556 | 2556 |
{ |
2557 | 2557 |
int i, iomemtype; |
2558 |
struct omap_target_agent_s *ta = 0;
|
|
2559 |
struct omap_l4_agent_info_s *info = 0;
|
|
2558 |
struct omap_target_agent_s *ta = NULL;
|
|
2559 |
struct omap_l4_agent_info_s *info = NULL;
|
|
2560 | 2560 |
|
2561 | 2561 |
for (i = 0; i < bus->ta_num; i ++) |
2562 | 2562 |
if (omap_l4_agent_info[i].ta == cs) { |
... | ... | |
4559 | 4559 |
omap_findclk(s, "uart2_iclk"), |
4560 | 4560 |
s->drq[OMAP24XX_DMA_UART2_TX], |
4561 | 4561 |
s->drq[OMAP24XX_DMA_UART2_RX], |
4562 |
serial_hds[0] ? serial_hds[1] : 0);
|
|
4562 |
serial_hds[0] ? serial_hds[1] : NULL);
|
|
4563 | 4563 |
s->uart[2] = omap2_uart_init(omap_l4ta(s->l4, 21), |
4564 | 4564 |
s->irq[0][OMAP_INT_24XX_UART3_IRQ], |
4565 | 4565 |
omap_findclk(s, "uart3_fclk"), |
4566 | 4566 |
omap_findclk(s, "uart3_iclk"), |
4567 | 4567 |
s->drq[OMAP24XX_DMA_UART3_TX], |
4568 | 4568 |
s->drq[OMAP24XX_DMA_UART3_RX], |
4569 |
serial_hds[0] && serial_hds[1] ? serial_hds[2] : 0);
|
|
4569 |
serial_hds[0] && serial_hds[1] ? serial_hds[2] : NULL);
|
|
4570 | 4570 |
|
4571 | 4571 |
s->gptimer[0] = omap_gp_timer_init(omap_l4ta(s->l4, 7), |
4572 | 4572 |
s->irq[0][OMAP_INT_24XX_GPTIMER1], |
... | ... | |
4677 | 4677 |
omap_sti_init(omap_l4ta(s->l4, 18), 0x54000000, |
4678 | 4678 |
s->irq[0][OMAP_INT_24XX_STI], omap_findclk(s, "emul_ck"), |
4679 | 4679 |
serial_hds[0] && serial_hds[1] && serial_hds[2] ? |
4680 |
serial_hds[3] : 0);
|
|
4680 |
serial_hds[3] : NULL);
|
|
4681 | 4681 |
|
4682 | 4682 |
s->eac = omap_eac_init(omap_l4ta(s->l4, 32), |
4683 | 4683 |
s->irq[0][OMAP_INT_24XX_EAC_IRQ], |
Also available in: Unified diff