From 35e8490a63fda5c0c55cfa1232da6e7b44f191e2 Mon Sep 17 00:00:00 2001 From: Dino Li Date: Fri, 8 Apr 2016 16:33:43 +0800 Subject: [PATCH] chip: it83xx: disable USB module's clock at default The GPIOH.5/6 are reserved for USB module and the clock is disabled before configuring it. Signed-off-by: Dino Li BRANCH=none BUG=none TEST=Clock is disabled at default. Change-Id: If679ab3de13019f19a936b9a412b20973fb8989f Reviewed-on: https://chromium-review.googlesource.com/338066 Commit-Ready: Dino Li Tested-by: Dino Li Reviewed-by: Randall Spangler --- board/it8380dev/board.c | 17 ----------------- chip/it83xx/clock.c | 3 ++- 2 files changed, 2 insertions(+), 18 deletions(-) diff --git a/board/it8380dev/board.c b/board/it8380dev/board.c index 61ffbacf05..5b4f7dcbab 100644 --- a/board/it8380dev/board.c +++ b/board/it8380dev/board.c @@ -181,23 +181,6 @@ static void board_init(void) * use console command "sleepmask" to enable it if necessary. */ disable_sleep(SLEEP_MASK_FORCE_NO_DSLEEP); - /* - * The GPIOH.5/6 may be used for flashing purposes if WP pin - * is deasserted. The clock of this module needs to be enabled. - * So we disable the clock when WP pin is asserted, - * this can help to reduce power consumption. - */ -#ifdef CONFIG_WP_ACTIVE_HIGH - if (gpio_get_level(GPIO_WP)) - clock_disable_peripheral(CGC_OFFSET_USB, 0, 0); - else - clock_enable_peripheral(CGC_OFFSET_USB, 0, 0); -#else - if (!gpio_get_level(GPIO_WP_L)) - clock_disable_peripheral(CGC_OFFSET_USB, 0, 0); - else - clock_enable_peripheral(CGC_OFFSET_USB, 0, 0); -#endif } DECLARE_HOOK(HOOK_INIT, board_init, HOOK_PRIO_DEFAULT); diff --git a/chip/it83xx/clock.c b/chip/it83xx/clock.c index 895211cac2..b24341b062 100644 --- a/chip/it83xx/clock.c +++ b/chip/it83xx/clock.c @@ -61,7 +61,8 @@ static void clock_module_disable(void) clock_disable_peripheral((CGC_OFFSET_SMBA | CGC_OFFSET_SMBB | CGC_OFFSET_SMBC | CGC_OFFSET_SMBD | CGC_OFFSET_SMBE | CGC_OFFSET_SMBF), 0, 0); - clock_disable_peripheral((CGC_OFFSET_SSPI | CGC_OFFSET_PECI), 0, 0); + clock_disable_peripheral((CGC_OFFSET_SSPI | CGC_OFFSET_PECI | + CGC_OFFSET_USB), 0, 0); } void clock_init(void)