91a687d8fe
The Tegra EHCI driver directly calls various functions in the Tegra USB
PHY driver. The reverse is also true; the PHY driver calls into the EHCI
driver. This is problematic when the two are built as modules.
The calls from the PHY to EHCI driver were originally added in commit
bbdabdb "usb: add APIs to access host registers from Tegra PHY", for the
following reasons:
1) The register being touched is an EHCI register, so logically only the
EHCI driver should touch it.
2) (1) implies that some locking may be needed to correctly implement the
r/m/w access to this shared register.
3) We were expecting to pass only the PHY register space to the Tegra PHY
driver, and hence it would not have access to touch the shared
registers.
To solve this, that commit added functions in the EHCI driver to touch the
shared register on behalf of the PHY driver.
In practice, we ended up not having any locking in the implementaiton of
those functions, and I've been led to believe this is safe. Equally, (3)
did not happen either. Hence, it is possible for the PHY driver to touch
the shared register directly.
Given that, this patch moves the code to touch the shared register back
into the PHY driver, to eliminate the module problems. If we actually
need locking or co-ordination in the future, I propose we put the lock
support into some pre-existing core module, or into a third separate
module, in order to avoid the circular dependencies.
I apologize for my contribution to code churn here.
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Tested-by: Thierry Reding <thierry.reding@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
80 lines
1.8 KiB
C
80 lines
1.8 KiB
C
/*
|
|
* Copyright (C) 2010 Google, Inc.
|
|
*
|
|
* This software is licensed under the terms of the GNU General Public
|
|
* License version 2, as published by the Free Software Foundation, and
|
|
* may be copied, distributed, and modified under those terms.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
*/
|
|
|
|
#ifndef __TEGRA_USB_PHY_H
|
|
#define __TEGRA_USB_PHY_H
|
|
|
|
#include <linux/clk.h>
|
|
#include <linux/usb/otg.h>
|
|
|
|
struct tegra_utmip_config {
|
|
u8 hssync_start_delay;
|
|
u8 elastic_limit;
|
|
u8 idle_wait_delay;
|
|
u8 term_range_adj;
|
|
u8 xcvr_setup;
|
|
u8 xcvr_lsfslew;
|
|
u8 xcvr_lsrslew;
|
|
};
|
|
|
|
struct tegra_ulpi_config {
|
|
int reset_gpio;
|
|
const char *clk;
|
|
};
|
|
|
|
enum tegra_usb_phy_port_speed {
|
|
TEGRA_USB_PHY_PORT_SPEED_FULL = 0,
|
|
TEGRA_USB_PHY_PORT_SPEED_LOW,
|
|
TEGRA_USB_PHY_PORT_SPEED_HIGH,
|
|
};
|
|
|
|
enum tegra_usb_phy_mode {
|
|
TEGRA_USB_PHY_MODE_DEVICE,
|
|
TEGRA_USB_PHY_MODE_HOST,
|
|
TEGRA_USB_PHY_MODE_OTG,
|
|
};
|
|
|
|
struct tegra_xtal_freq;
|
|
|
|
struct tegra_usb_phy {
|
|
int instance;
|
|
const struct tegra_xtal_freq *freq;
|
|
void __iomem *regs;
|
|
void __iomem *pad_regs;
|
|
struct clk *clk;
|
|
struct clk *pll_u;
|
|
struct clk *pad_clk;
|
|
enum tegra_usb_phy_mode mode;
|
|
void *config;
|
|
struct usb_phy *ulpi;
|
|
struct usb_phy u_phy;
|
|
struct device *dev;
|
|
bool is_legacy_phy;
|
|
bool is_ulpi_phy;
|
|
int reset_gpio;
|
|
};
|
|
|
|
struct usb_phy *tegra_usb_get_phy(struct device_node *dn);
|
|
|
|
void tegra_usb_phy_preresume(struct usb_phy *phy);
|
|
|
|
void tegra_usb_phy_postresume(struct usb_phy *phy);
|
|
|
|
void tegra_ehci_phy_restore_start(struct usb_phy *phy,
|
|
enum tegra_usb_phy_port_speed port_speed);
|
|
|
|
void tegra_ehci_phy_restore_end(struct usb_phy *phy);
|
|
|
|
#endif /* __TEGRA_USB_PHY_H */
|