mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-06 19:07:52 +00:00
USB nop phy rename via Felipe Balbi <balbi@ti.com>:
Here's a pull request of one patch to avoid conflicts during the merge window. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQIcBAABAgAGBQJSC0ITAAoJEBvUPslcq6Vz3UIP/iv4OtCkA3hqbHRYKIzaKPas JGJSyMqWDPXWBn2hPVLFu1O0MR+S5NIXp5VMHTVxu9sT5m+QKatKu3Rx18t8+KED KkQFStVFapELwv5AHnOnKk4KoN1ytmVHQAqMRBGoi81GSaDPzPez/2KI1D8Epz2H wbrhm1BbJGkheU0kToBgww0nCOF5F12w3B0n87schihZ76k8ltymWQOlgWDwR7FE 1kpftwaJds1IC5dWVJhKSdH0F0/Y0bvwuxtDm/tgkWX3y+6f5Nl7+7tk98KM7FMz i+7W4bjGnfbOORy98tMOUf+Auf3Zev42aYlrr65AnSD8u+R2P6uO7Hn/JfyQMnrh d/8SBClNlMRAgKoiDMJCAad4CprT/uCeSdLajE3YU6vQPKKmF38zSsRoY2yEocKr 8wUSihETkrIW/FhajvZsvSoxWFG5eC3hYwprS8lhcjf+4neNDKwD7baSw0Sf+O5z 3tiLTkvlP4fGz4zMoNPfz7LZMROKpd86vD1VsJWKpY55/d7i7cGliEHUF0S2PdzI LCIdOyageD6uie5/fUsaNEsE9lb959VVIYxb/LRXCUtV9mmIp9hxd4+UQYb8aa8s qtBIr9+dAIBKE/oo5O9UVkyZe5nvxwhKEkkYr96xWzbL0Ub5KwjKEmhsnOo9sWPD XjpBTEymS0Kq7izXWmQL =2mCp -----END PGP SIGNATURE----- Merge tag 'omap-for-v3.12/usb-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/cleanup From Tony Lindgren: USB nop phy rename via Felipe Balbi <balbi@ti.com>: Here's a pull request of one patch to avoid conflicts during the merge window. * tag 'omap-for-v3.12/usb-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: usb: phy: rename nop_usb_xceiv => usb_phy_gen_xceiv Signed-off-by: Kevin Hilman <khilman@linaro.org>
This commit is contained in:
commit
47aad66c26
15 changed files with 49 additions and 49 deletions
|
@ -33,7 +33,7 @@
|
|||
#include <linux/mtd/nand.h>
|
||||
#include <linux/mmc/host.h>
|
||||
#include <linux/usb/phy.h>
|
||||
#include <linux/usb/nop-usb-xceiv.h>
|
||||
#include <linux/usb/usb_phy_gen_xceiv.h>
|
||||
|
||||
#include <linux/regulator/machine.h>
|
||||
#include <linux/i2c/twl.h>
|
||||
|
@ -279,7 +279,7 @@ static struct regulator_consumer_supply beagle_vsim_supply[] = {
|
|||
static struct gpio_led gpio_leds[];
|
||||
|
||||
/* PHY's VCC regulator might be added later, so flag that we need it */
|
||||
static struct nop_usb_xceiv_platform_data hsusb2_phy_data = {
|
||||
static struct usb_phy_gen_xceiv_platform_data hsusb2_phy_data = {
|
||||
.needs_vcc = true,
|
||||
};
|
||||
|
||||
|
|
|
@ -33,7 +33,7 @@
|
|||
#include <linux/i2c/twl.h>
|
||||
#include <linux/usb/otg.h>
|
||||
#include <linux/usb/musb.h>
|
||||
#include <linux/usb/nop-usb-xceiv.h>
|
||||
#include <linux/usb/usb_phy_gen_xceiv.h>
|
||||
#include <linux/smsc911x.h>
|
||||
|
||||
#include <linux/wl12xx.h>
|
||||
|
@ -468,7 +468,7 @@ struct wl12xx_platform_data omap3evm_wlan_data __initdata = {
|
|||
static struct regulator_consumer_supply omap3evm_vaux2_supplies[] = {
|
||||
REGULATOR_SUPPLY("VDD_CSIPHY1", "omap3isp"), /* OMAP ISP */
|
||||
REGULATOR_SUPPLY("VDD_CSIPHY2", "omap3isp"), /* OMAP ISP */
|
||||
REGULATOR_SUPPLY("vcc", "nop_usb_xceiv.2"), /* hsusb port 2 */
|
||||
REGULATOR_SUPPLY("vcc", "usb_phy_gen_xceiv.2"), /* hsusb port 2 */
|
||||
REGULATOR_SUPPLY("vaux2", NULL),
|
||||
};
|
||||
|
||||
|
|
|
@ -352,7 +352,7 @@ static struct regulator_consumer_supply pandora_vcc_lcd_supply[] = {
|
|||
};
|
||||
|
||||
static struct regulator_consumer_supply pandora_usb_phy_supply[] = {
|
||||
REGULATOR_SUPPLY("vcc", "nop_usb_xceiv.2"), /* hsusb port 2 */
|
||||
REGULATOR_SUPPLY("vcc", "usb_phy_gen_xceiv.2"), /* hsusb port 2 */
|
||||
};
|
||||
|
||||
/* ads7846 on SPI and 2 nub controllers on I2C */
|
||||
|
|
|
@ -28,7 +28,7 @@
|
|||
#include <linux/io.h>
|
||||
#include <linux/gpio.h>
|
||||
#include <linux/usb/phy.h>
|
||||
#include <linux/usb/nop-usb-xceiv.h>
|
||||
#include <linux/usb/usb_phy_gen_xceiv.h>
|
||||
|
||||
#include "soc.h"
|
||||
#include "omap_device.h"
|
||||
|
@ -349,7 +349,7 @@ static struct fixed_voltage_config hsusb_reg_config = {
|
|||
/* .init_data filled later */
|
||||
};
|
||||
|
||||
static const char *nop_name = "nop_usb_xceiv"; /* NOP PHY driver */
|
||||
static const char *nop_name = "usb_phy_gen_xceiv"; /* NOP PHY driver */
|
||||
static const char *reg_name = "reg-fixed-voltage"; /* Regulator driver */
|
||||
|
||||
/**
|
||||
|
@ -460,9 +460,9 @@ int usbhs_init_phys(struct usbhs_phy_data *phy, int num_phys)
|
|||
pdevinfo.name = nop_name;
|
||||
pdevinfo.id = phy->port;
|
||||
pdevinfo.data = phy->platform_data;
|
||||
pdevinfo.size_data = sizeof(struct nop_usb_xceiv_platform_data);
|
||||
|
||||
scnprintf(phy_id, MAX_STR, "nop_usb_xceiv.%d",
|
||||
pdevinfo.size_data =
|
||||
sizeof(struct usb_phy_gen_xceiv_platform_data);
|
||||
scnprintf(phy_id, MAX_STR, "usb_phy_gen_xceiv.%d",
|
||||
phy->port);
|
||||
pdev = platform_device_register_full(&pdevinfo);
|
||||
if (IS_ERR(pdev)) {
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
#include <linux/dma-mapping.h>
|
||||
#include <linux/clk.h>
|
||||
#include <linux/usb/otg.h>
|
||||
#include <linux/usb/nop-usb-xceiv.h>
|
||||
#include <linux/usb/usb_phy_gen_xceiv.h>
|
||||
#include <linux/of.h>
|
||||
#include <linux/of_platform.h>
|
||||
|
||||
|
@ -34,13 +34,13 @@ struct dwc3_exynos {
|
|||
|
||||
static int dwc3_exynos_register_phys(struct dwc3_exynos *exynos)
|
||||
{
|
||||
struct nop_usb_xceiv_platform_data pdata;
|
||||
struct usb_phy_gen_xceiv_platform_data pdata;
|
||||
struct platform_device *pdev;
|
||||
int ret;
|
||||
|
||||
memset(&pdata, 0x00, sizeof(pdata));
|
||||
|
||||
pdev = platform_device_alloc("nop_usb_xceiv", PLATFORM_DEVID_AUTO);
|
||||
pdev = platform_device_alloc("usb_phy_gen_xceiv", PLATFORM_DEVID_AUTO);
|
||||
if (!pdev)
|
||||
return -ENOMEM;
|
||||
|
||||
|
@ -51,7 +51,7 @@ static int dwc3_exynos_register_phys(struct dwc3_exynos *exynos)
|
|||
if (ret)
|
||||
goto err1;
|
||||
|
||||
pdev = platform_device_alloc("nop_usb_xceiv", PLATFORM_DEVID_AUTO);
|
||||
pdev = platform_device_alloc("usb_phy_gen_xceiv", PLATFORM_DEVID_AUTO);
|
||||
if (!pdev) {
|
||||
ret = -ENOMEM;
|
||||
goto err1;
|
||||
|
|
|
@ -43,7 +43,7 @@
|
|||
#include <linux/platform_device.h>
|
||||
|
||||
#include <linux/usb/otg.h>
|
||||
#include <linux/usb/nop-usb-xceiv.h>
|
||||
#include <linux/usb/usb_phy_gen_xceiv.h>
|
||||
|
||||
/* FIXME define these in <linux/pci_ids.h> */
|
||||
#define PCI_VENDOR_ID_SYNOPSYS 0x16c3
|
||||
|
@ -58,13 +58,13 @@ struct dwc3_pci {
|
|||
|
||||
static int dwc3_pci_register_phys(struct dwc3_pci *glue)
|
||||
{
|
||||
struct nop_usb_xceiv_platform_data pdata;
|
||||
struct usb_phy_gen_xceiv_platform_data pdata;
|
||||
struct platform_device *pdev;
|
||||
int ret;
|
||||
|
||||
memset(&pdata, 0x00, sizeof(pdata));
|
||||
|
||||
pdev = platform_device_alloc("nop_usb_xceiv", 0);
|
||||
pdev = platform_device_alloc("usb_phy_gen_xceiv", 0);
|
||||
if (!pdev)
|
||||
return -ENOMEM;
|
||||
|
||||
|
@ -75,7 +75,7 @@ static int dwc3_pci_register_phys(struct dwc3_pci *glue)
|
|||
if (ret)
|
||||
goto err1;
|
||||
|
||||
pdev = platform_device_alloc("nop_usb_xceiv", 1);
|
||||
pdev = platform_device_alloc("usb_phy_gen_xceiv", 1);
|
||||
if (!pdev) {
|
||||
ret = -ENOMEM;
|
||||
goto err1;
|
||||
|
|
|
@ -33,7 +33,7 @@
|
|||
#include <linux/io.h>
|
||||
#include <linux/platform_device.h>
|
||||
#include <linux/dma-mapping.h>
|
||||
#include <linux/usb/nop-usb-xceiv.h>
|
||||
#include <linux/usb/usb_phy_gen_xceiv.h>
|
||||
#include <linux/platform_data/usb-omap.h>
|
||||
|
||||
#include "musb_core.h"
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
#include <linux/platform_device.h>
|
||||
#include <linux/dma-mapping.h>
|
||||
#include <linux/prefetch.h>
|
||||
#include <linux/usb/nop-usb-xceiv.h>
|
||||
#include <linux/usb/usb_phy_gen_xceiv.h>
|
||||
|
||||
#include <asm/cacheflush.h>
|
||||
|
||||
|
|
|
@ -33,7 +33,7 @@
|
|||
#include <linux/io.h>
|
||||
#include <linux/platform_device.h>
|
||||
#include <linux/dma-mapping.h>
|
||||
#include <linux/usb/nop-usb-xceiv.h>
|
||||
#include <linux/usb/usb_phy_gen_xceiv.h>
|
||||
|
||||
#include <mach/da8xx.h>
|
||||
#include <linux/platform_data/usb-davinci.h>
|
||||
|
|
|
@ -33,7 +33,7 @@
|
|||
#include <linux/gpio.h>
|
||||
#include <linux/platform_device.h>
|
||||
#include <linux/dma-mapping.h>
|
||||
#include <linux/usb/nop-usb-xceiv.h>
|
||||
#include <linux/usb/usb_phy_gen_xceiv.h>
|
||||
|
||||
#include <mach/cputype.h>
|
||||
#include <mach/hardware.h>
|
||||
|
|
|
@ -36,7 +36,7 @@
|
|||
#include <linux/dma-mapping.h>
|
||||
#include <linux/pm_runtime.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/usb/nop-usb-xceiv.h>
|
||||
#include <linux/usb/usb_phy_gen_xceiv.h>
|
||||
#include <linux/platform_data/usb-omap.h>
|
||||
#include <linux/sizes.h>
|
||||
|
||||
|
|
|
@ -25,7 +25,7 @@
|
|||
#include <linux/io.h>
|
||||
#include <linux/platform_device.h>
|
||||
#include <linux/dma-mapping.h>
|
||||
#include <linux/usb/nop-usb-xceiv.h>
|
||||
#include <linux/usb/usb_phy_gen_xceiv.h>
|
||||
|
||||
#include "musb_core.h"
|
||||
|
||||
|
|
|
@ -14,7 +14,7 @@ phy-fsl-usb2-objs := phy-fsl-usb.o phy-fsm-usb.o
|
|||
obj-$(CONFIG_FSL_USB2_OTG) += phy-fsl-usb2.o
|
||||
obj-$(CONFIG_ISP1301_OMAP) += phy-isp1301-omap.o
|
||||
obj-$(CONFIG_MV_U3D_PHY) += phy-mv-u3d-usb.o
|
||||
obj-$(CONFIG_NOP_USB_XCEIV) += phy-nop.o
|
||||
obj-$(CONFIG_NOP_USB_XCEIV) += phy-generic.o
|
||||
obj-$(CONFIG_OMAP_CONTROL_USB) += phy-omap-control.o
|
||||
obj-$(CONFIG_OMAP_USB2) += phy-omap-usb2.o
|
||||
obj-$(CONFIG_OMAP_USB3) += phy-omap-usb3.o
|
||||
|
|
|
@ -30,13 +30,13 @@
|
|||
#include <linux/platform_device.h>
|
||||
#include <linux/dma-mapping.h>
|
||||
#include <linux/usb/otg.h>
|
||||
#include <linux/usb/nop-usb-xceiv.h>
|
||||
#include <linux/usb/usb_phy_gen_xceiv.h>
|
||||
#include <linux/slab.h>
|
||||
#include <linux/clk.h>
|
||||
#include <linux/regulator/consumer.h>
|
||||
#include <linux/of.h>
|
||||
|
||||
struct nop_usb_xceiv {
|
||||
struct usb_phy_gen_xceiv {
|
||||
struct usb_phy phy;
|
||||
struct device *dev;
|
||||
struct clk *clk;
|
||||
|
@ -50,9 +50,9 @@ void usb_nop_xceiv_register(void)
|
|||
{
|
||||
if (pd)
|
||||
return;
|
||||
pd = platform_device_register_simple("nop_usb_xceiv", -1, NULL, 0);
|
||||
pd = platform_device_register_simple("usb_phy_gen_xceiv", -1, NULL, 0);
|
||||
if (!pd) {
|
||||
printk(KERN_ERR "Unable to register usb nop transceiver\n");
|
||||
pr_err("Unable to register generic usb transceiver\n");
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
@ -72,7 +72,7 @@ static int nop_set_suspend(struct usb_phy *x, int suspend)
|
|||
|
||||
static int nop_init(struct usb_phy *phy)
|
||||
{
|
||||
struct nop_usb_xceiv *nop = dev_get_drvdata(phy->dev);
|
||||
struct usb_phy_gen_xceiv *nop = dev_get_drvdata(phy->dev);
|
||||
|
||||
if (!IS_ERR(nop->vcc)) {
|
||||
if (regulator_enable(nop->vcc))
|
||||
|
@ -93,7 +93,7 @@ static int nop_init(struct usb_phy *phy)
|
|||
|
||||
static void nop_shutdown(struct usb_phy *phy)
|
||||
{
|
||||
struct nop_usb_xceiv *nop = dev_get_drvdata(phy->dev);
|
||||
struct usb_phy_gen_xceiv *nop = dev_get_drvdata(phy->dev);
|
||||
|
||||
if (!IS_ERR(nop->reset)) {
|
||||
/* Assert RESET */
|
||||
|
@ -139,11 +139,11 @@ static int nop_set_host(struct usb_otg *otg, struct usb_bus *host)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int nop_usb_xceiv_probe(struct platform_device *pdev)
|
||||
static int usb_phy_gen_xceiv_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct device *dev = &pdev->dev;
|
||||
struct nop_usb_xceiv_platform_data *pdata = pdev->dev.platform_data;
|
||||
struct nop_usb_xceiv *nop;
|
||||
struct usb_phy_gen_xceiv_platform_data *pdata = pdev->dev.platform_data;
|
||||
struct usb_phy_gen_xceiv *nop;
|
||||
enum usb_phy_type type = USB_PHY_TYPE_USB2;
|
||||
int err;
|
||||
u32 clk_rate = 0;
|
||||
|
@ -245,9 +245,9 @@ static int nop_usb_xceiv_probe(struct platform_device *pdev)
|
|||
return err;
|
||||
}
|
||||
|
||||
static int nop_usb_xceiv_remove(struct platform_device *pdev)
|
||||
static int usb_phy_gen_xceiv_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct nop_usb_xceiv *nop = platform_get_drvdata(pdev);
|
||||
struct usb_phy_gen_xceiv *nop = platform_get_drvdata(pdev);
|
||||
|
||||
if (!IS_ERR(nop->clk))
|
||||
clk_unprepare(nop->clk);
|
||||
|
@ -264,29 +264,29 @@ static const struct of_device_id nop_xceiv_dt_ids[] = {
|
|||
|
||||
MODULE_DEVICE_TABLE(of, nop_xceiv_dt_ids);
|
||||
|
||||
static struct platform_driver nop_usb_xceiv_driver = {
|
||||
.probe = nop_usb_xceiv_probe,
|
||||
.remove = nop_usb_xceiv_remove,
|
||||
static struct platform_driver usb_phy_gen_xceiv_driver = {
|
||||
.probe = usb_phy_gen_xceiv_probe,
|
||||
.remove = usb_phy_gen_xceiv_remove,
|
||||
.driver = {
|
||||
.name = "nop_usb_xceiv",
|
||||
.name = "usb_phy_gen_xceiv",
|
||||
.owner = THIS_MODULE,
|
||||
.of_match_table = nop_xceiv_dt_ids,
|
||||
},
|
||||
};
|
||||
|
||||
static int __init nop_usb_xceiv_init(void)
|
||||
static int __init usb_phy_gen_xceiv_init(void)
|
||||
{
|
||||
return platform_driver_register(&nop_usb_xceiv_driver);
|
||||
return platform_driver_register(&usb_phy_gen_xceiv_driver);
|
||||
}
|
||||
subsys_initcall(nop_usb_xceiv_init);
|
||||
subsys_initcall(usb_phy_gen_xceiv_init);
|
||||
|
||||
static void __exit nop_usb_xceiv_exit(void)
|
||||
static void __exit usb_phy_gen_xceiv_exit(void)
|
||||
{
|
||||
platform_driver_unregister(&nop_usb_xceiv_driver);
|
||||
platform_driver_unregister(&usb_phy_gen_xceiv_driver);
|
||||
}
|
||||
module_exit(nop_usb_xceiv_exit);
|
||||
module_exit(usb_phy_gen_xceiv_exit);
|
||||
|
||||
MODULE_ALIAS("platform:nop_usb_xceiv");
|
||||
MODULE_ALIAS("platform:usb_phy_gen_xceiv");
|
||||
MODULE_AUTHOR("Texas Instruments Inc");
|
||||
MODULE_DESCRIPTION("NOP USB Transceiver driver");
|
||||
MODULE_LICENSE("GPL");
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
#include <linux/usb/otg.h>
|
||||
|
||||
struct nop_usb_xceiv_platform_data {
|
||||
struct usb_phy_gen_xceiv_platform_data {
|
||||
enum usb_phy_type type;
|
||||
unsigned long clk_rate;
|
||||
|
||||
|
@ -12,7 +12,7 @@ struct nop_usb_xceiv_platform_data {
|
|||
unsigned int needs_reset:1;
|
||||
};
|
||||
|
||||
#if defined(CONFIG_NOP_USB_XCEIV) || (defined(CONFIG_NOP_USB_XCEIV_MODULE) && defined(MODULE))
|
||||
#if IS_ENABLED(CONFIG_NOP_USB_XCEIV)
|
||||
/* sometimes transceivers are accessed only through e.g. ULPI */
|
||||
extern void usb_nop_xceiv_register(void);
|
||||
extern void usb_nop_xceiv_unregister(void);
|
Loading…
Reference in a new issue