summaryrefslogtreecommitdiffstats
path: root/drivers/usb/dwc2
diff options
context:
space:
mode:
authorRobert Baldyga <r.baldyga@samsung.com>2014-09-11 14:53:31 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-09-11 13:48:43 -0700
commit87df8ac3d2e4f47f3d24e6038110feebbe8954cf (patch)
tree6c7ada1655a4c741ca043b94a3afc4022598b53a /drivers/usb/dwc2
parentcd6860979522ceaaaa4d706790a880832f0d50ba (diff)
downloadblackbird-op-linux-87df8ac3d2e4f47f3d24e6038110feebbe8954cf.tar.gz
blackbird-op-linux-87df8ac3d2e4f47f3d24e6038110feebbe8954cf.zip
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>
Diffstat (limited to 'drivers/usb/dwc2')
-rw-r--r--drivers/usb/dwc2/gadget.c1
-rw-r--r--drivers/usb/dwc2/platform.c1
2 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/dwc2/gadget.c b/drivers/usb/dwc2/gadget.c
index 7bbac228bc50..7c9618e916e2 100644
--- a/drivers/usb/dwc2/gadget.c
+++ b/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 */ }
};
diff --git a/drivers/usb/dwc2/platform.c b/drivers/usb/dwc2/platform.c
index 544a13ef6836..121dbdafc06b 100644
--- a/drivers/usb/dwc2/platform.c
+++ b/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);
OpenPOWER on IntegriCloud