Просмотр исходного кода

usb: musb: split blackfin to its own platform_driver

Just adding its own platform_driver, not really
using it yet.

Later patches will come to split power management
code from musb_core and move it completely to HW
glue layer.

Signed-off-by: Felipe Balbi <balbi@ti.com>
Felipe Balbi 14 лет назад
Родитель
Сommit
9cb0308eec

+ 1 - 1
arch/blackfin/mach-bf527/boards/ad7160eval.c

@@ -83,7 +83,7 @@ static struct musb_hdrc_platform_data musb_plat = {
 static u64 musb_dmamask = ~(u32)0;
 static u64 musb_dmamask = ~(u32)0;
 
 
 static struct platform_device musb_device = {
 static struct platform_device musb_device = {
-	.name		= "musb-hdrc",
+	.name		= "musb-blackfin",
 	.id		= 0,
 	.id		= 0,
 	.dev = {
 	.dev = {
 		.dma_mask		= &musb_dmamask,
 		.dma_mask		= &musb_dmamask,

+ 1 - 1
arch/blackfin/mach-bf527/boards/cm_bf527.c

@@ -120,7 +120,7 @@ static struct musb_hdrc_platform_data musb_plat = {
 static u64 musb_dmamask = ~(u32)0;
 static u64 musb_dmamask = ~(u32)0;
 
 
 static struct platform_device musb_device = {
 static struct platform_device musb_device = {
-	.name		= "musb-hdrc",
+	.name		= "musb-blackfin",
 	.id		= 0,
 	.id		= 0,
 	.dev = {
 	.dev = {
 		.dma_mask		= &musb_dmamask,
 		.dma_mask		= &musb_dmamask,

+ 1 - 1
arch/blackfin/mach-bf527/boards/ezbrd.c

@@ -84,7 +84,7 @@ static struct musb_hdrc_platform_data musb_plat = {
 static u64 musb_dmamask = ~(u32)0;
 static u64 musb_dmamask = ~(u32)0;
 
 
 static struct platform_device musb_device = {
 static struct platform_device musb_device = {
-	.name		= "musb-hdrc",
+	.name		= "musb-blackfin",
 	.id		= 0,
 	.id		= 0,
 	.dev = {
 	.dev = {
 		.dma_mask		= &musb_dmamask,
 		.dma_mask		= &musb_dmamask,

+ 1 - 1
arch/blackfin/mach-bf527/boards/ezkit.c

@@ -124,7 +124,7 @@ static struct musb_hdrc_platform_data musb_plat = {
 static u64 musb_dmamask = ~(u32)0;
 static u64 musb_dmamask = ~(u32)0;
 
 
 static struct platform_device musb_device = {
 static struct platform_device musb_device = {
-	.name		= "musb-hdrc",
+	.name		= "musb-blackfin",
 	.id		= 0,
 	.id		= 0,
 	.dev = {
 	.dev = {
 		.dma_mask		= &musb_dmamask,
 		.dma_mask		= &musb_dmamask,

+ 1 - 1
arch/blackfin/mach-bf527/boards/tll6527m.c

@@ -91,7 +91,7 @@ static struct musb_hdrc_platform_data musb_plat = {
 static u64 musb_dmamask = ~(u32)0;
 static u64 musb_dmamask = ~(u32)0;
 
 
 static struct platform_device musb_device = {
 static struct platform_device musb_device = {
-	.name		= "musb-hdrc",
+	.name		= "musb-blackfin",
 	.id		= 0,
 	.id		= 0,
 	.dev = {
 	.dev = {
 		.dma_mask		= &musb_dmamask,
 		.dma_mask		= &musb_dmamask,

+ 1 - 1
arch/blackfin/mach-bf548/boards/cm_bf548.c

@@ -520,7 +520,7 @@ static struct musb_hdrc_platform_data musb_plat = {
 static u64 musb_dmamask = ~(u32)0;
 static u64 musb_dmamask = ~(u32)0;
 
 
 static struct platform_device musb_device = {
 static struct platform_device musb_device = {
-	.name		= "musb-hdrc",
+	.name		= "musb-blackfin",
 	.id		= 0,
 	.id		= 0,
 	.dev = {
 	.dev = {
 		.dma_mask		= &musb_dmamask,
 		.dma_mask		= &musb_dmamask,

+ 1 - 1
arch/blackfin/mach-bf548/boards/ezkit.c

@@ -625,7 +625,7 @@ static struct musb_hdrc_platform_data musb_plat = {
 static u64 musb_dmamask = ~(u32)0;
 static u64 musb_dmamask = ~(u32)0;
 
 
 static struct platform_device musb_device = {
 static struct platform_device musb_device = {
-	.name		= "musb-hdrc",
+	.name		= "musb-blackfin",
 	.id		= 0,
 	.id		= 0,
 	.dev = {
 	.dev = {
 		.dma_mask		= &musb_dmamask,
 		.dma_mask		= &musb_dmamask,

+ 1 - 3
drivers/usb/musb/Makefile

@@ -13,14 +13,12 @@ musb_hdrc-$(CONFIG_USB_MUSB_HDRC_HCD)		+= musb_virthub.o musb_host.o
 musb_hdrc-$(CONFIG_DEBUG_FS)			+= musb_debugfs.o
 musb_hdrc-$(CONFIG_DEBUG_FS)			+= musb_debugfs.o
 
 
 # Hardware Glue Layer
 # Hardware Glue Layer
-
-musb_hdrc-$(CONFIG_USB_MUSB_BLACKFIN)		+= blackfin.o
-
 obj-$(CONFIG_USB_MUSB_OMAP2PLUS)		+= omap2430.o
 obj-$(CONFIG_USB_MUSB_OMAP2PLUS)		+= omap2430.o
 obj-$(CONFIG_USB_MUSB_AM35X)			+= am35x.o
 obj-$(CONFIG_USB_MUSB_AM35X)			+= am35x.o
 obj-$(CONFIG_USB_MUSB_TUSB6010)			+= tusb6010.o
 obj-$(CONFIG_USB_MUSB_TUSB6010)			+= tusb6010.o
 obj-$(CONFIG_USB_MUSB_DAVINCI)			+= davinci.o
 obj-$(CONFIG_USB_MUSB_DAVINCI)			+= davinci.o
 obj-$(CONFIG_USB_MUSB_DA8XX)			+= da8xx.o
 obj-$(CONFIG_USB_MUSB_DA8XX)			+= da8xx.o
+obj-$(CONFIG_USB_MUSB_BLACKFIN)			+= blackfin.o
 
 
 # the kconfig must guarantee that only one of the
 # the kconfig must guarantee that only one of the
 # possible I/O schemes will be enabled at a time ...
 # possible I/O schemes will be enabled at a time ...

+ 84 - 0
drivers/usb/musb/blackfin.c

@@ -15,6 +15,8 @@
 #include <linux/list.h>
 #include <linux/list.h>
 #include <linux/gpio.h>
 #include <linux/gpio.h>
 #include <linux/io.h>
 #include <linux/io.h>
+#include <linux/platform_device.h>
+#include <linux/dma-mapping.h>
 
 
 #include <asm/cacheflush.h>
 #include <asm/cacheflush.h>
 
 
@@ -442,3 +444,85 @@ const struct musb_platform_ops musb_ops = {
 	.vbus_status	= bfin_musb_vbus_status,
 	.vbus_status	= bfin_musb_vbus_status,
 	.set_vbus	= bfin_musb_set_vbus,
 	.set_vbus	= bfin_musb_set_vbus,
 };
 };
+
+static u64 bfin_dmamask = DMA_BIT_MASK(32);
+
+static int __init bfin_probe(struct platform_device *pdev)
+{
+	struct musb_hdrc_platform_data	*pdata = pdev->dev.platform_data;
+	struct platform_device		*musb;
+
+	int				ret = -ENOMEM;
+
+	musb = platform_device_alloc("musb-hdrc", -1);
+	if (!musb) {
+		dev_err(&pdev->dev, "failed to allocate musb device\n");
+		goto err0;
+	}
+
+	musb->dev.parent		= &pdev->dev;
+	musb->dev.dma_mask		= &bfin_dmamask;
+	musb->dev.coherent_dma_mask	= bfin_dmamask;
+
+	platform_set_drvdata(pdev, musb);
+
+	ret = platform_device_add_resources(musb, pdev->resource,
+			pdev->num_resources);
+	if (ret) {
+		dev_err(&pdev->dev, "failed to add resources\n");
+		goto err1;
+	}
+
+	ret = platform_device_add_data(musb, pdata, sizeof(*pdata));
+	if (ret) {
+		dev_err(&pdev->dev, "failed to add platform_data\n");
+		goto err1;
+	}
+
+	ret = platform_device_add(musb);
+	if (ret) {
+		dev_err(&pdev->dev, "failed to register musb device\n");
+		goto err1;
+	}
+
+	return 0;
+
+err1:
+	platform_device_put(musb);
+
+err0:
+	return ret;
+}
+
+static int __exit bfin_remove(struct platform_device *pdev)
+{
+	struct platform_device		*musb = platform_get_drvdata(pdev);
+
+	platform_device_del(musb);
+	platform_device_put(musb);
+
+	return 0;
+}
+
+static struct platform_driver bfin_driver = {
+	.remove		= __exit_p(bfin_remove),
+	.driver		= {
+		.name	= "musb-bfin",
+	},
+};
+
+MODULE_DESCRIPTION("Blackfin MUSB Glue Layer");
+MODULE_AUTHOR("Bryan Wy <cooloney@kernel.org>");
+MODULE_LICENSE("GPL v2");
+
+static int __init bfin_init(void)
+{
+	return platform_driver_probe(&bfin_driver, bfin_probe);
+}
+subsys_initcall(bfin_init);
+
+static void __exit bfin_exit(void)
+{
+	platform_driver_unregister(&bfin_driver);
+}
+module_exit(bfin_exit);