Browse Source

Revert "usb: dwc2: move "samsung,s3c6400-hsotg" into common platform"

This reverts commit 8df438571cdbd5c4fcd1b25b19eea1ad5c3cf777.

This patch breaks building dwc2 driver in gadget mode at samsung
platforms.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Robert Baldyga 11 years ago
parent
commit
87df8ac3d2
2 changed files with 1 additions and 1 deletions
  1. 1 0
      drivers/usb/dwc2/gadget.c
  2. 0 1
      drivers/usb/dwc2/platform.c

+ 1 - 0
drivers/usb/dwc2/gadget.c

@@ -3642,6 +3642,7 @@ static int s3c_hsotg_resume(struct platform_device *pdev)
 
 #ifdef CONFIG_OF
 static const struct of_device_id s3c_hsotg_of_ids[] = {
+	{ .compatible = "samsung,s3c6400-hsotg", },
 	{ .compatible = "snps,dwc2", },
 	{ /* sentinel */ }
 };

+ 0 - 1
drivers/usb/dwc2/platform.c

@@ -129,7 +129,6 @@ static const struct of_device_id dwc2_of_match_table[] = {
 	{ .compatible = "brcm,bcm2835-usb", .data = &params_bcm2835 },
 	{ .compatible = "rockchip,rk3066-usb", .data = &params_rk3066 },
 	{ .compatible = "snps,dwc2", .data = NULL },
-	{ .compatible = "samsung,s3c6400-hsotg", .data = NULL},
 	{},
 };
 MODULE_DEVICE_TABLE(of, dwc2_of_match_table);