X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/463c4d86fe6b5a6b58cf6e2d69da781a7876654f..ef4dee93859641e2f695ef44891e8a61df86a8ba:/target/linux/adm5120-2.6/files/drivers/usb/host/adm5120-hcd.c

diff --git a/target/linux/adm5120-2.6/files/drivers/usb/host/adm5120-hcd.c b/target/linux/adm5120-2.6/files/drivers/usb/host/adm5120-hcd.c
index a0ccaefd5..c8be7393f 100644
--- a/target/linux/adm5120-2.6/files/drivers/usb/host/adm5120-hcd.c
+++ b/target/linux/adm5120-2.6/files/drivers/usb/host/adm5120-hcd.c
@@ -18,6 +18,7 @@
 #include <linux/usb.h>
 #include <linux/platform_device.h>
 
+#include <asm/bootinfo.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/system.h>
@@ -30,6 +31,8 @@ MODULE_DESCRIPTION("ADM5120 USB Host Controller Driver");
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Jeroen Vreeken (pe1rxq@amsat.org)");
 
+#define PFX	"adm5120-hcd: "
+
 #define ADMHCD_REG_CONTROL		0x00
 #define ADMHCD_REG_INTSTATUS		0x04
 #define ADMHCD_REG_INTENABLE		0x08
@@ -749,7 +752,7 @@ static int __init adm5120hcd_probe(struct platform_device *pdev)
                 err = -ENOMEM;
                 goto out_mem;
         }
-	
+
 	hcd = usb_create_hcd(&adm5120_hc_driver, &pdev->dev, pdev->dev.bus_id);
         if (!hcd)
                 goto out_mem;
@@ -819,19 +822,30 @@ static struct platform_driver adm5120hcd_driver = {
 	.probe =	adm5120hcd_probe,
 	.remove =	adm5120hcd_remove,
 	.driver	=	{
-		.name 	= "adm5120-hcd",
+		.name 	= "adm5120-usbc",
 		.owner 	= THIS_MODULE,
 	},
 };
 
 static int __init adm5120hcd_init(void)
 {
-	if (usb_disabled())
+	int ret;
+
+	if (usb_disabled()) {
+		printk(KERN_DEBUG PFX "USB support is disabled\n");
 		return -ENODEV;
-	if (!adm5120_board.has_usb)
+	}
+
+	if (mips_machgroup != MACH_GROUP_ADM5120) {
+		printk(KERN_DEBUG PFX "unsupported machine group\n");
 		return -ENODEV;
+	}
 
-	return platform_driver_register(&adm5120hcd_driver);
+	ret = platform_driver_register(&adm5120hcd_driver);
+	if (ret == 0)
+		printk(KERN_INFO PFX "registered\n");
+
+	return ret;
 }
 
 static void __exit adm5120hcd_exit(void)