diff options
| author | Robert Baldyga | 2014-09-11 14:53:31 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2014-09-11 22:48:43 +0200 |
| commit | 87df8ac3d2e4f47f3d24e6038110feebbe8954cf (patch) | |
| tree | 6c7ada1655a4c741ca043b94a3afc4022598b53a /drivers/usb/dwc2 | |
| parent | Revert "usb: dwc2: Update Kconfig to support dual-role" (diff) | |
| download | kernel-qcow2-linux-87df8ac3d2e4f47f3d24e6038110feebbe8954cf.tar.gz kernel-qcow2-linux-87df8ac3d2e4f47f3d24e6038110feebbe8954cf.tar.xz kernel-qcow2-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.c | 1 | ||||
| -rw-r--r-- | drivers/usb/dwc2/platform.c | 1 |
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 = ¶ms_bcm2835 }, { .compatible = "rockchip,rk3066-usb", .data = ¶ms_rk3066 }, { .compatible = "snps,dwc2", .data = NULL }, - { .compatible = "samsung,s3c6400-hsotg", .data = NULL}, {}, }; MODULE_DEVICE_TABLE(of, dwc2_of_match_table); |