diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2015-06-17 15:49:26 +0200 |
|---|---|---|
| committer | Hans de Goede <hdegoede@redhat.com> | 2015-07-25 11:22:55 +0200 |
| commit | d42faf3198262710d17548950e1ab41413e8b7f9 (patch) | |
| tree | c97b569101cd05beb88aadfc1bf3dc2192e6703c /board/sunxi | |
| parent | 71cbe0d681d4288d090a404273ce6b0c1c14b617 (diff) | |
| download | blackbird-obmc-uboot-d42faf3198262710d17548950e1ab41413e8b7f9.tar.gz blackbird-obmc-uboot-d42faf3198262710d17548950e1ab41413e8b7f9.zip | |
sunxi: musb: Move musb config and platdata to the sunxi-musb glue
Move the musb config and platdata to the sunxi-musb glue, which is where
it really belongs. This is preparation patch for adding device-model
support for the sunxi-musb-host code.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Ian Campbell <ijc@hellion.org.uk>
Diffstat (limited to 'board/sunxi')
| -rw-r--r-- | board/sunxi/board.c | 28 |
1 files changed, 2 insertions, 26 deletions
diff --git a/board/sunxi/board.c b/board/sunxi/board.c index 7220af3454..afed6a31ca 100644 --- a/board/sunxi/board.c +++ b/board/sunxi/board.c @@ -31,7 +31,6 @@ #include <asm/arch/usb_phy.h> #include <asm/gpio.h> #include <asm/io.h> -#include <linux/usb/musb.h> #include <net.h> #if defined CONFIG_VIDEO_LCD_PANEL_I2C && !(defined CONFIG_SPL_BUILD) @@ -449,28 +448,6 @@ void sunxi_board_init(void) } #endif -#if defined(CONFIG_MUSB_HOST) || defined(CONFIG_MUSB_GADGET) -extern const struct musb_platform_ops sunxi_musb_ops; - -static struct musb_hdrc_config musb_config = { - .multipoint = 1, - .dyn_fifo = 1, - .num_eps = 6, - .ram_bits = 11, -}; - -static struct musb_hdrc_platform_data musb_plat = { -#if defined(CONFIG_MUSB_HOST) - .mode = MUSB_HOST, -#else - .mode = MUSB_PERIPHERAL, -#endif - .config = &musb_config, - .power = 250, - .platform_ops = &sunxi_musb_ops, -}; -#endif - #ifdef CONFIG_USB_GADGET int g_dnl_board_usb_cable_connected(void) { @@ -533,9 +510,8 @@ int misc_init_r(void) if (ret) return ret; #endif -#if defined(CONFIG_MUSB_HOST) || defined(CONFIG_MUSB_GADGET) - musb_register(&musb_plat, NULL, (void *)SUNXI_USB0_BASE); -#endif + sunxi_musb_board_init(); + return 0; } #endif |
