summaryrefslogtreecommitdiff
path: root/board/sunxi/board.c
diff options
context:
space:
mode:
authorHans de Goede <hdegoede@redhat.com>2015-04-27 16:50:04 +0200
committerHans de Goede <hdegoede@redhat.com>2015-05-04 16:51:55 +0200
commite13afeef6f5d3c9c4fc130b21ee7c885f96d55f2 (patch)
tree04dc727e522a1da35829383144c009efd92d95a7 /board/sunxi/board.c
parent2aacc4239c32aa732621f3a432d576c68c3016d8 (diff)
downloadu-boot-imx-e13afeef6f5d3c9c4fc130b21ee7c885f96d55f2.zip
u-boot-imx-e13afeef6f5d3c9c4fc130b21ee7c885f96d55f2.tar.gz
u-boot-imx-e13afeef6f5d3c9c4fc130b21ee7c885f96d55f2.tar.bz2
sunxi: usb: Do not call phy_probe from hcd code
The 2/3 usb-phys on the sunxi SoCs are really a single separate functional block, and are modelled as such in devicetree. So once we've moved all the sunxi usb code to the driver-model then phy_probe will be called once for the entire block from the driver-model enumeration code. Move to this now as this also avoids problems with phy_probe being called multiple times once we introduce ohci support. This also allows us to get rid of the sunxi_usb_phy_enabled_count variable as phy_probe now is guaranteed to be called only once. Since we're effectively rewriting the probe / remove functions, move them to the end of the file while we are at it, as that is the most logical place for them. Signed-off-by: Hans de Goede <hdegoede@redhat.com> Acked-by: Ian Campbell <ijc@hellion.org.uk>
Diffstat (limited to 'board/sunxi/board.c')
-rw-r--r--board/sunxi/board.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/board/sunxi/board.c b/board/sunxi/board.c
index be76e62..d9f7691 100644
--- a/board/sunxi/board.c
+++ b/board/sunxi/board.c
@@ -510,6 +510,10 @@ int misc_init_r(void)
}
}
+ ret = sunxi_usb_phy_probe();
+ if (ret)
+ return ret;
+
#if defined(CONFIG_MUSB_HOST) || defined(CONFIG_MUSB_GADGET)
musb_register(&musb_plat, NULL, (void *)SUNXI_USB0_BASE);
#endif