mirror of
https://github.com/torvalds/linux.git
synced 2024-12-30 06:41:43 +00:00
64dc9e2e73
Here is the big Gadget & PHY pull request. Many of us have been really busy lately getting multiple drivers to a better position. Since this pull request is so large, I will divide it in sections so it's easier to grasp what's included. - cleanups: . UDC drivers no longer touch gadget->dev, that's now udc-core responsibility . Many more UDC drivers converted to usb_gadget_map/unmap_request() . UDC drivers no longer initialize DMA-related fields from gadget's device structure . UDC drivers don't touch gadget.dev.driver directly . UDC drivers don't assign gadget.dev.release directly . Removal of some unused DMA_ADDR_INVALID . Introduction of CONFIG_USB_PHY . All phy drivers have been moved to drivers/usb/phy and renamed to a common naming scheme . Fix PHY layer so it never returns a NULL pointer, also fix all callers to avoid using IS_ERR_OR_NULL() . Sparse fixes all over the place . drivers/usb/otg/ has been deleted . Marvel drivers (mv_udc, ehci-mv, mv_otg and mv_u3d) improved clock usage - new features: . UDC core now provides a generic way for tracking and reporting UDC's state (not attached, resuming, suspended, addressed, default, etc) . twl4030-usb learned that it shouldn't be enabled during init . Full DT support for DWC3 has been implemented . ab8500-usb learned about pinctrl framework . nop PHY learned about DeviceTree and regulators . DWC3 learned about suspend/resume . DWC3 can now be compiled in host-only and gadget-only (as well as DRD) configurations . UVC now enables streaming endpoint based on negotiated speed . isp1301 now implements the PHY API properly . configfs-based interface for gadget drivers which will lead to the removal of all code which just combines functions together to build functional gadget drivers. . f_serial and f_obex were converted to new configfs interface while maintaining old interface around. - non-critical fixes: . UVC gadget driver got fixes for Endpoint usage and stream calculation . ab8500-usb fixed unbalanced clock and regulator API usage . twl4030-usb got a fix for when OMAP3 is booted with cable connected . fusb300_udc got a fix for DMA usage . UVC got fixes for two assertions of the USB Video Class Compliance specification revision 1.1 . build warning issues caused by recent addition of __must_check to regulator API These are all changes which deserve a mention, all other changes are related to these one or minor spelling fixes and other similar tasks. Signed-of-by: Felipe Balbi <balbi@ti.com> -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQIcBAABAgAGBQJRXG8GAAoJEIaOsuA1yqREJzYQAKMLW3J/TKTWS1DDuf7qMtMz Ug6qChKZXgT1/QrNjsq2tx4jYIkNdSMtRKiUx0BnIptlUx6gM22gcsN8mXX/UJjC FYAiWl+tYe85e9uayqqt+qVCZjTZCc7St4wQalugDHefvA7yCbiZpSaJRGlJMK+x mePJ7MfrulDsYBXr0u+m2LOJ0qxMDi40k3/UN3aUu5yzrmBiRpVq1mySruvLwGFp Pr6vBnprEc6bW5sRdUR4SICKLvLk5sHwHpvpkzDLYBIb/jXQwbfQri/HKeh4VMk8 trbsvHZyB7H8uuFsCHiBc6VtjcbZ4mxPUK+1PCq8hG077avdkm3ox0BERk9aRTeC jg4mdpyWjgovwi882woPEQXNZoaAXpVDyI8tBRx92a+rGJjXSHhLQI+4Ffi4ZvzV d+q1ZzrHxuzwa/BwcPETY76umXQqXWXg+ap1bHDY0RZFoPLdXMpl583NXGSn3gOD dUlD0UlgYwb75333tRIPNQn3qOx0HVd6MlYPMNzl9t9c9qqfX78AYRny6ZucupRg t9VZ6FO3D2yre9W7u3U3q2c9H7uSAKr/8xaNfvdsIWPncgvvYVIyE8MnR7AiHoPv ZYESs/Gs6w9vUsHa9K4J16Ape7D3AMcGpXUoPUxTBHrwBexzt4j27VWtcL4ns/9r 0kcltUJ4Zq+PIjc7xgxe =aF4r -----END PGP SIGNATURE----- Merge tag 'usb-for-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-next Felipe writes: usb: patches for v3.10 merge window Here is the big Gadget & PHY pull request. Many of us have been really busy lately getting multiple drivers to a better position. Since this pull request is so large, I will divide it in sections so it's easier to grasp what's included. - cleanups: . UDC drivers no longer touch gadget->dev, that's now udc-core responsibility . Many more UDC drivers converted to usb_gadget_map/unmap_request() . UDC drivers no longer initialize DMA-related fields from gadget's device structure . UDC drivers don't touch gadget.dev.driver directly . UDC drivers don't assign gadget.dev.release directly . Removal of some unused DMA_ADDR_INVALID . Introduction of CONFIG_USB_PHY . All phy drivers have been moved to drivers/usb/phy and renamed to a common naming scheme . Fix PHY layer so it never returns a NULL pointer, also fix all callers to avoid using IS_ERR_OR_NULL() . Sparse fixes all over the place . drivers/usb/otg/ has been deleted . Marvel drivers (mv_udc, ehci-mv, mv_otg and mv_u3d) improved clock usage - new features: . UDC core now provides a generic way for tracking and reporting UDC's state (not attached, resuming, suspended, addressed, default, etc) . twl4030-usb learned that it shouldn't be enabled during init . Full DT support for DWC3 has been implemented . ab8500-usb learned about pinctrl framework . nop PHY learned about DeviceTree and regulators . DWC3 learned about suspend/resume . DWC3 can now be compiled in host-only and gadget-only (as well as DRD) configurations . UVC now enables streaming endpoint based on negotiated speed . isp1301 now implements the PHY API properly . configfs-based interface for gadget drivers which will lead to the removal of all code which just combines functions together to build functional gadget drivers. . f_serial and f_obex were converted to new configfs interface while maintaining old interface around. - non-critical fixes: . UVC gadget driver got fixes for Endpoint usage and stream calculation . ab8500-usb fixed unbalanced clock and regulator API usage . twl4030-usb got a fix for when OMAP3 is booted with cable connected . fusb300_udc got a fix for DMA usage . UVC got fixes for two assertions of the USB Video Class Compliance specification revision 1.1 . build warning issues caused by recent addition of __must_check to regulator API These are all changes which deserve a mention, all other changes are related to these one or minor spelling fixes and other similar tasks. Signed-of-by: Felipe Balbi <balbi@ti.com>
344 lines
9.0 KiB
C
344 lines
9.0 KiB
C
/*
|
|
* Copyright (C) 2011 Marvell International Ltd. All rights reserved.
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify it
|
|
* under the terms and conditions of the GNU General Public License,
|
|
* version 2, as published by the Free Software Foundation.
|
|
*/
|
|
|
|
#include <linux/module.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/clk.h>
|
|
#include <linux/delay.h>
|
|
#include <linux/err.h>
|
|
#include <linux/io.h>
|
|
#include <linux/usb/otg.h>
|
|
#include <linux/platform_data/mv_usb.h>
|
|
|
|
#include "phy-mv-u3d-usb.h"
|
|
|
|
/*
|
|
* struct mv_u3d_phy - transceiver driver state
|
|
* @phy: transceiver structure
|
|
* @dev: The parent device supplied to the probe function
|
|
* @clk: usb phy clock
|
|
* @base: usb phy register memory base
|
|
*/
|
|
struct mv_u3d_phy {
|
|
struct usb_phy phy;
|
|
struct mv_usb_platform_data *plat;
|
|
struct device *dev;
|
|
struct clk *clk;
|
|
void __iomem *base;
|
|
};
|
|
|
|
static u32 mv_u3d_phy_read(void __iomem *base, u32 reg)
|
|
{
|
|
void __iomem *addr, *data;
|
|
|
|
addr = base;
|
|
data = base + 0x4;
|
|
|
|
writel_relaxed(reg, addr);
|
|
return readl_relaxed(data);
|
|
}
|
|
|
|
static void mv_u3d_phy_set(void __iomem *base, u32 reg, u32 value)
|
|
{
|
|
void __iomem *addr, *data;
|
|
u32 tmp;
|
|
|
|
addr = base;
|
|
data = base + 0x4;
|
|
|
|
writel_relaxed(reg, addr);
|
|
tmp = readl_relaxed(data);
|
|
tmp |= value;
|
|
writel_relaxed(tmp, data);
|
|
}
|
|
|
|
static void mv_u3d_phy_clear(void __iomem *base, u32 reg, u32 value)
|
|
{
|
|
void __iomem *addr, *data;
|
|
u32 tmp;
|
|
|
|
addr = base;
|
|
data = base + 0x4;
|
|
|
|
writel_relaxed(reg, addr);
|
|
tmp = readl_relaxed(data);
|
|
tmp &= ~value;
|
|
writel_relaxed(tmp, data);
|
|
}
|
|
|
|
static void mv_u3d_phy_write(void __iomem *base, u32 reg, u32 value)
|
|
{
|
|
void __iomem *addr, *data;
|
|
|
|
addr = base;
|
|
data = base + 0x4;
|
|
|
|
writel_relaxed(reg, addr);
|
|
writel_relaxed(value, data);
|
|
}
|
|
|
|
void mv_u3d_phy_shutdown(struct usb_phy *phy)
|
|
{
|
|
struct mv_u3d_phy *mv_u3d_phy;
|
|
void __iomem *base;
|
|
u32 val;
|
|
|
|
mv_u3d_phy = container_of(phy, struct mv_u3d_phy, phy);
|
|
base = mv_u3d_phy->base;
|
|
|
|
/* Power down Reference Analog current, bit 15
|
|
* Power down PLL, bit 14
|
|
* Power down Receiver, bit 13
|
|
* Power down Transmitter, bit 12
|
|
* of USB3_POWER_PLL_CONTROL register
|
|
*/
|
|
val = mv_u3d_phy_read(base, USB3_POWER_PLL_CONTROL);
|
|
val &= ~(USB3_POWER_PLL_CONTROL_PU);
|
|
mv_u3d_phy_write(base, USB3_POWER_PLL_CONTROL, val);
|
|
|
|
if (mv_u3d_phy->clk)
|
|
clk_disable(mv_u3d_phy->clk);
|
|
}
|
|
|
|
static int mv_u3d_phy_init(struct usb_phy *phy)
|
|
{
|
|
struct mv_u3d_phy *mv_u3d_phy;
|
|
void __iomem *base;
|
|
u32 val, count;
|
|
|
|
/* enable usb3 phy */
|
|
mv_u3d_phy = container_of(phy, struct mv_u3d_phy, phy);
|
|
|
|
if (mv_u3d_phy->clk)
|
|
clk_enable(mv_u3d_phy->clk);
|
|
|
|
base = mv_u3d_phy->base;
|
|
|
|
val = mv_u3d_phy_read(base, USB3_POWER_PLL_CONTROL);
|
|
val &= ~(USB3_POWER_PLL_CONTROL_PU_MASK);
|
|
val |= 0xF << USB3_POWER_PLL_CONTROL_PU_SHIFT;
|
|
mv_u3d_phy_write(base, USB3_POWER_PLL_CONTROL, val);
|
|
udelay(100);
|
|
|
|
mv_u3d_phy_write(base, USB3_RESET_CONTROL,
|
|
USB3_RESET_CONTROL_RESET_PIPE);
|
|
udelay(100);
|
|
|
|
mv_u3d_phy_write(base, USB3_RESET_CONTROL,
|
|
USB3_RESET_CONTROL_RESET_PIPE
|
|
| USB3_RESET_CONTROL_RESET_PHY);
|
|
udelay(100);
|
|
|
|
val = mv_u3d_phy_read(base, USB3_POWER_PLL_CONTROL);
|
|
val &= ~(USB3_POWER_PLL_CONTROL_REF_FREF_SEL_MASK
|
|
| USB3_POWER_PLL_CONTROL_PHY_MODE_MASK);
|
|
val |= (USB3_PLL_25MHZ << USB3_POWER_PLL_CONTROL_REF_FREF_SEL_SHIFT)
|
|
| (0x5 << USB3_POWER_PLL_CONTROL_PHY_MODE_SHIFT);
|
|
mv_u3d_phy_write(base, USB3_POWER_PLL_CONTROL, val);
|
|
udelay(100);
|
|
|
|
mv_u3d_phy_clear(base, USB3_KVCO_CALI_CONTROL,
|
|
USB3_KVCO_CALI_CONTROL_USE_MAX_PLL_RATE_MASK);
|
|
udelay(100);
|
|
|
|
val = mv_u3d_phy_read(base, USB3_SQUELCH_FFE);
|
|
val &= ~(USB3_SQUELCH_FFE_FFE_CAP_SEL_MASK
|
|
| USB3_SQUELCH_FFE_FFE_RES_SEL_MASK
|
|
| USB3_SQUELCH_FFE_SQ_THRESH_IN_MASK);
|
|
val |= ((0xD << USB3_SQUELCH_FFE_FFE_CAP_SEL_SHIFT)
|
|
| (0x7 << USB3_SQUELCH_FFE_FFE_RES_SEL_SHIFT)
|
|
| (0x8 << USB3_SQUELCH_FFE_SQ_THRESH_IN_SHIFT));
|
|
mv_u3d_phy_write(base, USB3_SQUELCH_FFE, val);
|
|
udelay(100);
|
|
|
|
val = mv_u3d_phy_read(base, USB3_GEN1_SET0);
|
|
val &= ~USB3_GEN1_SET0_G1_TX_SLEW_CTRL_EN_MASK;
|
|
val |= 1 << USB3_GEN1_SET0_G1_TX_EMPH_EN_SHIFT;
|
|
mv_u3d_phy_write(base, USB3_GEN1_SET0, val);
|
|
udelay(100);
|
|
|
|
val = mv_u3d_phy_read(base, USB3_GEN2_SET0);
|
|
val &= ~(USB3_GEN2_SET0_G2_TX_AMP_MASK
|
|
| USB3_GEN2_SET0_G2_TX_EMPH_AMP_MASK
|
|
| USB3_GEN2_SET0_G2_TX_SLEW_CTRL_EN_MASK);
|
|
val |= ((0x14 << USB3_GEN2_SET0_G2_TX_AMP_SHIFT)
|
|
| (1 << USB3_GEN2_SET0_G2_TX_AMP_ADJ_SHIFT)
|
|
| (0xA << USB3_GEN2_SET0_G2_TX_EMPH_AMP_SHIFT)
|
|
| (1 << USB3_GEN2_SET0_G2_TX_EMPH_EN_SHIFT));
|
|
mv_u3d_phy_write(base, USB3_GEN2_SET0, val);
|
|
udelay(100);
|
|
|
|
mv_u3d_phy_read(base, USB3_TX_EMPPH);
|
|
val &= ~(USB3_TX_EMPPH_AMP_MASK
|
|
| USB3_TX_EMPPH_EN_MASK
|
|
| USB3_TX_EMPPH_AMP_FORCE_MASK
|
|
| USB3_TX_EMPPH_PAR1_MASK
|
|
| USB3_TX_EMPPH_PAR2_MASK);
|
|
val |= ((0xB << USB3_TX_EMPPH_AMP_SHIFT)
|
|
| (1 << USB3_TX_EMPPH_EN_SHIFT)
|
|
| (1 << USB3_TX_EMPPH_AMP_FORCE_SHIFT)
|
|
| (0x1C << USB3_TX_EMPPH_PAR1_SHIFT)
|
|
| (1 << USB3_TX_EMPPH_PAR2_SHIFT));
|
|
|
|
mv_u3d_phy_write(base, USB3_TX_EMPPH, val);
|
|
udelay(100);
|
|
|
|
val = mv_u3d_phy_read(base, USB3_GEN2_SET1);
|
|
val &= ~(USB3_GEN2_SET1_G2_RX_SELMUPI_MASK
|
|
| USB3_GEN2_SET1_G2_RX_SELMUPF_MASK
|
|
| USB3_GEN2_SET1_G2_RX_SELMUFI_MASK
|
|
| USB3_GEN2_SET1_G2_RX_SELMUFF_MASK);
|
|
val |= ((1 << USB3_GEN2_SET1_G2_RX_SELMUPI_SHIFT)
|
|
| (1 << USB3_GEN2_SET1_G2_RX_SELMUPF_SHIFT)
|
|
| (1 << USB3_GEN2_SET1_G2_RX_SELMUFI_SHIFT)
|
|
| (1 << USB3_GEN2_SET1_G2_RX_SELMUFF_SHIFT));
|
|
mv_u3d_phy_write(base, USB3_GEN2_SET1, val);
|
|
udelay(100);
|
|
|
|
val = mv_u3d_phy_read(base, USB3_DIGITAL_LOOPBACK_EN);
|
|
val &= ~USB3_DIGITAL_LOOPBACK_EN_SEL_BITS_MASK;
|
|
val |= 1 << USB3_DIGITAL_LOOPBACK_EN_SEL_BITS_SHIFT;
|
|
mv_u3d_phy_write(base, USB3_DIGITAL_LOOPBACK_EN, val);
|
|
udelay(100);
|
|
|
|
val = mv_u3d_phy_read(base, USB3_IMPEDANCE_TX_SSC);
|
|
val &= ~USB3_IMPEDANCE_TX_SSC_SSC_AMP_MASK;
|
|
val |= 0xC << USB3_IMPEDANCE_TX_SSC_SSC_AMP_SHIFT;
|
|
mv_u3d_phy_write(base, USB3_IMPEDANCE_TX_SSC, val);
|
|
udelay(100);
|
|
|
|
val = mv_u3d_phy_read(base, USB3_IMPEDANCE_CALI_CTRL);
|
|
val &= ~USB3_IMPEDANCE_CALI_CTRL_IMP_CAL_THR_MASK;
|
|
val |= 0x4 << USB3_IMPEDANCE_CALI_CTRL_IMP_CAL_THR_SHIFT;
|
|
mv_u3d_phy_write(base, USB3_IMPEDANCE_CALI_CTRL, val);
|
|
udelay(100);
|
|
|
|
val = mv_u3d_phy_read(base, USB3_PHY_ISOLATION_MODE);
|
|
val &= ~(USB3_PHY_ISOLATION_MODE_PHY_GEN_RX_MASK
|
|
| USB3_PHY_ISOLATION_MODE_PHY_GEN_TX_MASK
|
|
| USB3_PHY_ISOLATION_MODE_TX_DRV_IDLE_MASK);
|
|
val |= ((1 << USB3_PHY_ISOLATION_MODE_PHY_GEN_RX_SHIFT)
|
|
| (1 << USB3_PHY_ISOLATION_MODE_PHY_GEN_TX_SHIFT));
|
|
mv_u3d_phy_write(base, USB3_PHY_ISOLATION_MODE, val);
|
|
udelay(100);
|
|
|
|
val = mv_u3d_phy_read(base, USB3_TXDETRX);
|
|
val &= ~(USB3_TXDETRX_VTHSEL_MASK);
|
|
val |= 0x1 << USB3_TXDETRX_VTHSEL_SHIFT;
|
|
mv_u3d_phy_write(base, USB3_TXDETRX, val);
|
|
udelay(100);
|
|
|
|
dev_dbg(mv_u3d_phy->dev, "start calibration\n");
|
|
|
|
calstart:
|
|
/* Perform Manual Calibration */
|
|
mv_u3d_phy_set(base, USB3_KVCO_CALI_CONTROL,
|
|
1 << USB3_KVCO_CALI_CONTROL_CAL_START_SHIFT);
|
|
|
|
mdelay(1);
|
|
|
|
count = 0;
|
|
while (1) {
|
|
val = mv_u3d_phy_read(base, USB3_KVCO_CALI_CONTROL);
|
|
if (val & (1 << USB3_KVCO_CALI_CONTROL_CAL_DONE_SHIFT))
|
|
break;
|
|
else if (count > 50) {
|
|
dev_dbg(mv_u3d_phy->dev, "calibration failure, retry...\n");
|
|
goto calstart;
|
|
}
|
|
count++;
|
|
mdelay(1);
|
|
}
|
|
|
|
/* active PIPE interface */
|
|
mv_u3d_phy_write(base, USB3_PIPE_SM_CTRL,
|
|
1 << USB3_PIPE_SM_CTRL_PHY_INIT_DONE);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int mv_u3d_phy_probe(struct platform_device *pdev)
|
|
{
|
|
struct mv_u3d_phy *mv_u3d_phy;
|
|
struct mv_usb_platform_data *pdata;
|
|
struct device *dev = &pdev->dev;
|
|
struct resource *res;
|
|
void __iomem *phy_base;
|
|
int ret;
|
|
|
|
pdata = pdev->dev.platform_data;
|
|
if (!pdata) {
|
|
dev_err(&pdev->dev, "%s: no platform data defined\n", __func__);
|
|
return -EINVAL;
|
|
}
|
|
|
|
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
|
if (!res) {
|
|
dev_err(dev, "missing mem resource\n");
|
|
return -ENODEV;
|
|
}
|
|
|
|
phy_base = devm_ioremap_resource(dev, res);
|
|
if (IS_ERR(phy_base))
|
|
return PTR_ERR(phy_base);
|
|
|
|
mv_u3d_phy = devm_kzalloc(dev, sizeof(*mv_u3d_phy), GFP_KERNEL);
|
|
if (!mv_u3d_phy)
|
|
return -ENOMEM;
|
|
|
|
mv_u3d_phy->dev = &pdev->dev;
|
|
mv_u3d_phy->plat = pdata;
|
|
mv_u3d_phy->base = phy_base;
|
|
mv_u3d_phy->phy.dev = mv_u3d_phy->dev;
|
|
mv_u3d_phy->phy.label = "mv-u3d-phy";
|
|
mv_u3d_phy->phy.init = mv_u3d_phy_init;
|
|
mv_u3d_phy->phy.shutdown = mv_u3d_phy_shutdown;
|
|
|
|
ret = usb_add_phy(&mv_u3d_phy->phy, USB_PHY_TYPE_USB3);
|
|
if (ret)
|
|
goto err;
|
|
|
|
if (!mv_u3d_phy->clk)
|
|
mv_u3d_phy->clk = clk_get(mv_u3d_phy->dev, "u3dphy");
|
|
|
|
platform_set_drvdata(pdev, mv_u3d_phy);
|
|
|
|
dev_info(&pdev->dev, "Initialized Marvell USB 3.0 PHY\n");
|
|
err:
|
|
return ret;
|
|
}
|
|
|
|
static int mv_u3d_phy_remove(struct platform_device *pdev)
|
|
{
|
|
struct mv_u3d_phy *mv_u3d_phy = platform_get_drvdata(pdev);
|
|
|
|
usb_remove_phy(&mv_u3d_phy->phy);
|
|
|
|
if (mv_u3d_phy->clk) {
|
|
clk_put(mv_u3d_phy->clk);
|
|
mv_u3d_phy->clk = NULL;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static struct platform_driver mv_u3d_phy_driver = {
|
|
.probe = mv_u3d_phy_probe,
|
|
.remove = mv_u3d_phy_remove,
|
|
.driver = {
|
|
.name = "mv-u3d-phy",
|
|
.owner = THIS_MODULE,
|
|
},
|
|
};
|
|
|
|
module_platform_driver(mv_u3d_phy_driver);
|
|
MODULE_DESCRIPTION("Marvell USB 3.0 PHY controller");
|
|
MODULE_AUTHOR("Yu Xu <yuxu@marvell.com>");
|
|
MODULE_LICENSE("GPL");
|
|
MODULE_ALIAS("platform:mv-u3d-phy");
|