Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-11 23:47:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

sunxi: usb: Protect phy-init and phy-power-on against multiple calls

Browse source 
Once we add support for the ohci controller the phy-init and phy-power-on
functions may be called twice (once by the ehci code and once by the ohci
code) protect them against this.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Ian Campbell <ijc@hellion.org.uk>
This commit is contained in:
Hans de Goede 2015-04-27 16:57:54 +02:00
parent e13afeef6f
commit fd01ae1384
1 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
arch/arm/cpu/armv7/sunxi/usb_phy.c
View file

@ -45,6 +45,8 @@ static struct sunxi_usb_phy {
int gpio_vbus; int gpio_vbus;
int gpio_vbus_det; int gpio_vbus_det;
int id; int id;
int init_count;
int power_on_count;
} sunxi_usb_phy[] = { } sunxi_usb_phy[] = {
{ {
.usb_rst_mask = CCM_USB_CTRL_PHY0_RST | CCM_USB_CTRL_PHY0_CLK, .usb_rst_mask = CCM_USB_CTRL_PHY0_RST | CCM_USB_CTRL_PHY0_CLK,
@ -170,6 +172,10 @@ void sunxi_usb_phy_init(int index)
struct sunxi_usb_phy *phy = &sunxi_usb_phy[index]; struct sunxi_usb_phy *phy = &sunxi_usb_phy[index];
struct sunxi_ccm_reg *ccm = (struct sunxi_ccm_reg *)SUNXI_CCM_BASE; struct sunxi_ccm_reg *ccm = (struct sunxi_ccm_reg *)SUNXI_CCM_BASE;
phy->init_count++;
if (phy->init_count != 1)
return;
setbits_le32(&ccm->usb_clk_cfg, phy->usb_rst_mask); setbits_le32(&ccm->usb_clk_cfg, phy->usb_rst_mask);
sunxi_usb_phy_config(phy); sunxi_usb_phy_config(phy);
@ -183,6 +189,10 @@ void sunxi_usb_phy_exit(int index)
struct sunxi_usb_phy *phy = &sunxi_usb_phy[index]; struct sunxi_usb_phy *phy = &sunxi_usb_phy[index];
struct sunxi_ccm_reg *ccm = (struct sunxi_ccm_reg *)SUNXI_CCM_BASE; struct sunxi_ccm_reg *ccm = (struct sunxi_ccm_reg *)SUNXI_CCM_BASE;
phy->init_count--;
if (phy->init_count != 0)
return;
if (phy->id != 0) if (phy->id != 0)
sunxi_usb_phy_passby(index, !SUNXI_USB_PASSBY_EN); sunxi_usb_phy_passby(index, !SUNXI_USB_PASSBY_EN);
@ -193,6 +203,10 @@ void sunxi_usb_phy_power_on(int index)
{ {
struct sunxi_usb_phy *phy = &sunxi_usb_phy[index]; struct sunxi_usb_phy *phy = &sunxi_usb_phy[index];
phy->power_on_count++;
if (phy->power_on_count != 1)
return;
if (phy->gpio_vbus >= 0) if (phy->gpio_vbus >= 0)
gpio_set_value(phy->gpio_vbus, 1); gpio_set_value(phy->gpio_vbus, 1);
} }
@ -201,6 +215,10 @@ void sunxi_usb_phy_power_off(int index)
{ {
struct sunxi_usb_phy *phy = &sunxi_usb_phy[index]; struct sunxi_usb_phy *phy = &sunxi_usb_phy[index];
phy->power_on_count--;
if (phy->power_on_count != 0)
return;
if (phy->gpio_vbus >= 0) if (phy->gpio_vbus >= 0)
gpio_set_value(phy->gpio_vbus, 0); gpio_set_value(phy->gpio_vbus, 0);
} }