diff options
author | Faiz Abbas <faiz_abbas@ti.com> | 2018-02-15 14:42:11 +0300 |
---|---|---|
committer | Marek Vasut <marex@denx.de> | 2018-02-15 15:44:30 +0300 |
commit | b16c129c2290d26e7b16b4309713c78f6146bc8a (patch) | |
tree | b8185dabe62b6b6a89e2b974d7910f31826a1fc1 /board | |
parent | 163f8858ae8bfcd94ef8d6c4ed75ff3abb642450 (diff) | |
download | u-boot-b16c129c2290d26e7b16b4309713c78f6146bc8a.tar.xz |
usb: host: xhci-omap: Remove redundant board_usb_init and board_usb_cleanup functions
board_usb_init()/_cleanup() should be in board files and don't have
a place in the xhci-omap driver. Weak versions for
board_usb_init()/_cleanup() already exist in common/usb.c
(for host mode) and drivers/usb/gadget/g_dnl.c (for gadget mode).
Therefore, remove init and cleanup functions from xhci-omap and
implement them in the board files.
Signed-off-by: Faiz Abbas <faiz_abbas@ti.com>
Reviewed-by: Marek Vasut <marex@denx.de>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Diffstat (limited to 'board')
-rw-r--r-- | board/compulab/cl-som-am57x/cl-som-am57x.c | 13 | ||||
-rw-r--r-- | board/compulab/cm_t43/cm_t43.c | 14 | ||||
-rw-r--r-- | board/ti/am43xx/board.c | 4 | ||||
-rw-r--r-- | board/ti/am57xx/board.c | 4 | ||||
-rw-r--r-- | board/ti/dra7xx/evm.c | 4 |
5 files changed, 33 insertions, 6 deletions
diff --git a/board/compulab/cl-som-am57x/cl-som-am57x.c b/board/compulab/cl-som-am57x/cl-som-am57x.c index 389eebb589..d7dc8a42e4 100644 --- a/board/compulab/cl-som-am57x/cl-som-am57x.c +++ b/board/compulab/cl-som-am57x/cl-som-am57x.c @@ -16,6 +16,7 @@ #include <asm/arch/sys_proto.h> #include "../common/common.h" #include "../common/eeprom.h" +#include <asm/omap_common.h> DECLARE_GLOBAL_DATA_PTR; @@ -64,3 +65,15 @@ u32 get_board_rev(void) { return cl_eeprom_get_board_rev(CONFIG_SYS_I2C_EEPROM_BUS); } + +int board_usb_init(int index, enum usb_init_type init) +{ + enable_usb_clocks(index); + return 0; +} + +int board_usb_cleanup(int index, enum usb_init_type init) +{ + disable_usb_clocks(index); + return 0; +} diff --git a/board/compulab/cm_t43/cm_t43.c b/board/compulab/cm_t43/cm_t43.c index 0d5da6f5e9..bdbea4f5e5 100644 --- a/board/compulab/cm_t43/cm_t43.c +++ b/board/compulab/cm_t43/cm_t43.c @@ -14,6 +14,8 @@ #include <power/pmic.h> #include <power/tps65218.h> #include "board.h" +#include <usb.h> +#include <asm/omap_common.h> DECLARE_GLOBAL_DATA_PTR; @@ -50,6 +52,18 @@ int board_init(void) return 0; } +int board_usb_init(int index, enum usb_init_type init) +{ + enable_usb_clocks(index); + return 0; +} + +int board_usb_cleanup(int index, enum usb_init_type init) +{ + disable_usb_clocks(index); + return 0; +} + #ifdef CONFIG_DRIVER_TI_CPSW static void cpsw_control(int enabled) diff --git a/board/ti/am43xx/board.c b/board/ti/am43xx/board.c index 16150ad30a..715960a596 100644 --- a/board/ti/am43xx/board.c +++ b/board/ti/am43xx/board.c @@ -687,7 +687,7 @@ int usb_gadget_handle_interrupts(int index) #endif /* CONFIG_USB_DWC3 */ #if defined(CONFIG_USB_DWC3) || defined(CONFIG_USB_XHCI_OMAP) -int omap_xhci_board_usb_init(int index, enum usb_init_type init) +int board_usb_init(int index, enum usb_init_type init) { enable_usb_clocks(index); #ifdef CONFIG_USB_DWC3 @@ -718,7 +718,7 @@ int omap_xhci_board_usb_init(int index, enum usb_init_type init) return 0; } -int omap_xhci_board_usb_cleanup(int index, enum usb_init_type init) +int board_usb_cleanup(int index, enum usb_init_type init) { #ifdef CONFIG_USB_DWC3 switch (index) { diff --git a/board/ti/am57xx/board.c b/board/ti/am57xx/board.c index 11287846e0..c3f60f60c8 100644 --- a/board/ti/am57xx/board.c +++ b/board/ti/am57xx/board.c @@ -867,7 +867,7 @@ int usb_gadget_handle_interrupts(int index) #endif /* CONFIG_USB_DWC3 */ #if defined(CONFIG_USB_DWC3) || defined(CONFIG_USB_XHCI_OMAP) -int omap_xhci_board_usb_init(int index, enum usb_init_type init) +int board_usb_init(int index, enum usb_init_type init) { enable_usb_clocks(index); switch (index) { @@ -901,7 +901,7 @@ int omap_xhci_board_usb_init(int index, enum usb_init_type init) return 0; } -int omap_xhci_board_usb_cleanup(int index, enum usb_init_type init) +int board_usb_cleanup(int index, enum usb_init_type init) { #ifdef CONFIG_USB_DWC3 switch (index) { diff --git a/board/ti/dra7xx/evm.c b/board/ti/dra7xx/evm.c index 6ecf971a92..519475e01f 100644 --- a/board/ti/dra7xx/evm.c +++ b/board/ti/dra7xx/evm.c @@ -907,7 +907,7 @@ static struct ti_usb_phy_device usb_phy2_device = { .index = 1, }; -int omap_xhci_board_usb_init(int index, enum usb_init_type init) +int board_usb_init(int index, enum usb_init_type init) { enable_usb_clocks(index); switch (index) { @@ -944,7 +944,7 @@ int omap_xhci_board_usb_init(int index, enum usb_init_type init) return 0; } -int omap_xhci_board_usb_cleanup(int index, enum usb_init_type init) +int board_usb_cleanup(int index, enum usb_init_type init) { switch (index) { case 0: |