old mode 100644new mode 100755.. | .. |
---|
2367 | 2367 | bus->deep_sleep = TRUE; |
---|
2368 | 2368 | #endif |
---|
2369 | 2369 | |
---|
| 2370 | +#ifdef CUSTOMER_HW_ROCKCHIP |
---|
| 2371 | + bus->idma_enabled = FALSE; |
---|
| 2372 | +#else |
---|
2370 | 2373 | bus->idma_enabled = TRUE; |
---|
| 2374 | +#endif |
---|
2371 | 2375 | bus->ifrm_enabled = TRUE; |
---|
2372 | 2376 | #ifdef BCMINTERNAL |
---|
2373 | 2377 | bus->dma_chan = 0; |
---|
.. | .. |
---|
3557 | 3561 | void |
---|
3558 | 3562 | dhd_set_bus_params(struct dhd_bus *bus) |
---|
3559 | 3563 | { |
---|
3560 | | - struct dhd_conf *conf = bus->dhd->conf; |
---|
3561 | | - |
---|
3562 | | - if (conf->dhd_poll >= 0) { |
---|
3563 | | - bus->poll = conf->dhd_poll; |
---|
| 3564 | + if (bus->dhd->conf->dhd_poll >= 0) { |
---|
| 3565 | + bus->poll = bus->dhd->conf->dhd_poll; |
---|
3564 | 3566 | if (!bus->pollrate) |
---|
3565 | 3567 | bus->pollrate = 1; |
---|
3566 | | - printf("%s: set polling mode %d\n", __FUNCTION__, conf->dhd_poll); |
---|
| 3568 | + printf("%s: set polling mode %d\n", __FUNCTION__, bus->dhd->conf->dhd_poll); |
---|
3567 | 3569 | } |
---|
3568 | | - if (conf->d2h_intr_control >= 0) |
---|
3569 | | - bus->d2h_intr_control = conf->d2h_intr_control; |
---|
| 3570 | + if (bus->dhd->conf->d2h_intr_control >= 0) |
---|
| 3571 | + bus->d2h_intr_control = bus->dhd->conf->d2h_intr_control; |
---|
3570 | 3572 | printf("d2h_intr_method -> %s(%d); d2h_intr_control -> %s(%d)\n", |
---|
3571 | 3573 | bus->d2h_intr_method ? "PCIE_MSI" : "PCIE_INTX", bus->d2h_intr_method, |
---|
3572 | 3574 | bus->d2h_intr_control ? "HOST_IRQ" : "D2H_INTMASK", bus->d2h_intr_control); |
---|
3573 | | - |
---|
3574 | | - if (conf->aspm != -1) { |
---|
3575 | | - bool aspm = conf->aspm ? TRUE : FALSE; |
---|
3576 | | - dhd_bus_aspm_enable_rc_ep(bus, aspm); |
---|
3577 | | - } |
---|
3578 | | - if (conf->l1ss != -1) { |
---|
3579 | | - bool l1ss = conf->l1ss ? TRUE : FALSE; |
---|
3580 | | - dhd_bus_l1ss_enable_rc_ep(bus, l1ss); |
---|
3581 | | - } |
---|
3582 | 3575 | } |
---|
3583 | 3576 | |
---|
3584 | 3577 | /** |
---|
.. | .. |
---|
9713 | 9706 | /* Got D3 Ack. Suspend the bus */ |
---|
9714 | 9707 | #ifdef OEM_ANDROID |
---|
9715 | 9708 | if (active) { |
---|
9716 | | - DHD_ERROR(("%s():Suspend failed because of wakelock " |
---|
| 9709 | + DHD_ERROR(("%s():Suspend failed because of wakelock" |
---|
9717 | 9710 | "restoring Dongle to D0\n", __FUNCTION__)); |
---|
9718 | 9711 | |
---|
9719 | 9712 | if (bus->dhd->dhd_watchdog_ms_backup) { |
---|
.. | .. |
---|
17813 | 17806 | addr = apb2_wrapper_reg + apb2_reset_ctrl_offset; |
---|
17814 | 17807 | val = 1; |
---|
17815 | 17808 | dhd_sbreg_op(dhd, addr, &val, FALSE); |
---|
17816 | | -} |
---|
17817 | | - |
---|
17818 | | -#define BUS_SLEEP_WAIT_CNT 3 |
---|
17819 | | -#define BUS_SLEEP_WAIT_MS 20 |
---|
17820 | | -int |
---|
17821 | | -dhd_bus_sleep(dhd_pub_t *dhdp, bool sleep, uint32 *intstatus) |
---|
17822 | | -{ |
---|
17823 | | - dhd_bus_t *bus = dhdp->bus; |
---|
17824 | | - int active, cnt = 0; |
---|
17825 | | - |
---|
17826 | | - if (bus) { |
---|
17827 | | - while ((active = dhd_os_check_wakelock_all(bus->dhd)) && |
---|
17828 | | - (cnt < BUS_SLEEP_WAIT_CNT)) { |
---|
17829 | | - OSL_SLEEP(BUS_SLEEP_WAIT_MS); |
---|
17830 | | - cnt++; |
---|
17831 | | - } |
---|
17832 | | - } else { |
---|
17833 | | - DHD_ERROR(("bus is NULL\n")); |
---|
17834 | | - active = -1; |
---|
17835 | | - } |
---|
17836 | | - |
---|
17837 | | - return active; |
---|
17838 | 17809 | } |
---|