| author | Rongjun Chen <rongjun.chen@amlogic.com> | 2018-01-22 08:54:55 (GMT) |
|---|---|---|
| committer | Xiaobo Gu <xiaobo.gu@amlogic.com> | 2018-02-08 08:10:12 (GMT) |
| commit | c217ff166e4e9498a885ef4bc04a1ee93086bc5c (patch) | |
| tree | 3c93ceb4521055ed5ba4bb0789c66f66367cd522 | |
| parent | de2a2dd531f5a38785cb7ec12ee6590869c52f13 (diff) | |
| download | uboot-c217ff166e4e9498a885ef4bc04a1ee93086bc5c.zip uboot-c217ff166e4e9498a885ef4bc04a1ee93086bc5c.tar.gz uboot-c217ff166e4e9498a885ef4bc04a1ee93086bc5c.tar.bz2 | |
wifi: fix wifi resume open fail issue
PD# 159343
Change-Id: I5b415c13b12d2eb045c0f15fa0f42ba928c27bfe
wifi:change the bt wake up irq num
| -rw-r--r-- | board/amlogic/configs/gxl_p212_v1.h | 2 | ||||
| -rw-r--r-- | board/amlogic/gxl_p212_v1/firmware/scp_task/pwr_ctrl.c | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/board/amlogic/configs/gxl_p212_v1.h b/board/amlogic/configs/gxl_p212_v1.h index e5466e6..184a9d7 100644 --- a/board/amlogic/configs/gxl_p212_v1.h +++ b/board/amlogic/configs/gxl_p212_v1.h @@ -44,7 +44,7 @@ /* configs for CEC */ #define CONFIG_CEC_OSD_NAME "Mbox" #define CONFIG_CEC_WAKEUP - +//#define CONFIG_BT_WAKEUP #define CONFIG_INSTABOOT /* configs for dtb in boot.img */ //#define DTB_BIND_KERNEL diff --git a/board/amlogic/gxl_p212_v1/firmware/scp_task/pwr_ctrl.c b/board/amlogic/gxl_p212_v1/firmware/scp_task/pwr_ctrl.c index 6e75686..1f8d010 100644 --- a/board/amlogic/gxl_p212_v1/firmware/scp_task/pwr_ctrl.c +++ b/board/amlogic/gxl_p212_v1/firmware/scp_task/pwr_ctrl.c @@ -154,16 +154,17 @@ void get_wakeup_source(void *response, unsigned int suspend_from) gpio->irq = IRQ_AO_GPIO0_NUM; gpio->trig_type = GPIO_IRQ_FALLING_EDGE; p->gpio_info_count = ++i; - +#ifdef CONFIG_BT_WAKEUP gpio = &(p->gpio_info[i]); gpio->wakeup_id = BT_WAKEUP_SRC; gpio->gpio_in_idx = GPIOX_18; gpio->gpio_in_ao = 0; gpio->gpio_out_idx = -1; gpio->gpio_out_ao = -1; - gpio->irq = IRQ_GPIO0_NUM; + gpio->irq = IRQ_GPIO1_NUM; gpio->trig_type = GPIO_IRQ_FALLING_EDGE; p->gpio_info_count = ++i; +#endif } void wakeup_timer_setup(void) { @@ -249,6 +250,7 @@ static unsigned int detect_key(unsigned int suspend_from) if ((readl(AO_GPIO_I) & (1<<2)) == 0) exit_reason = POWER_KEY_WAKEUP; } +#ifdef CONFIG_BT_WAKEUP if (irq[IRQ_GPIO0] == IRQ_GPIO0_NUM) { irq[IRQ_GPIO0] = 0xFFFFFFFF; if (!(readl(PREG_PAD_GPIO4_I) & (0x01 << 18)) @@ -256,6 +258,7 @@ static unsigned int detect_key(unsigned int suspend_from) && !(readl(PREG_PAD_GPIO4_EN_N) & (0x01 << 17))) exit_reason = BT_WAKEUP; } +#endif if (irq[IRQ_ETH_PHY] == IRQ_ETH_PHY_NUM) { irq[IRQ_ETH_PHY] = 0xFFFFFFFF; exit_reason = ETH_PHY_WAKEUP; |