diff options
| author | Dinh Nguyen <dinguyen@opensource.altera.com> | 2014-08-26 11:19:53 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-09-08 15:47:04 -0700 |
| commit | 8df438571cdbd5c4fcd1b25b19eea1ad5c3cf777 (patch) | |
| tree | ae55895f4452c9108791d7ed2d6f2c2119e2b9c2 /drivers/usb/dwc2 | |
| parent | e006fee6ecfed5b957bdd41c236aad751ab29042 (diff) | |
| download | op-kernel-dev-8df438571cdbd5c4fcd1b25b19eea1ad5c3cf777.zip op-kernel-dev-8df438571cdbd5c4fcd1b25b19eea1ad5c3cf777.tar.gz | |
usb: dwc2: move "samsung,s3c6400-hsotg" into common platform
Move the "samsung,s3c6400-hsotg" binding as the probe function in the gadget
driver will get removed when the dual-role driver is implemented.
Signed-off-by: Dinh Nguyen <dinguyen@opensource.altera.com>
Acked-by: Paul Zimmerman <paulz@synopsys.com>
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 7c9618e..7bbac22 100644 --- a/drivers/usb/dwc2/gadget.c +++ b/drivers/usb/dwc2/gadget.c @@ -3642,7 +3642,6 @@ 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 121dbda..544a13e 100644 --- a/drivers/usb/dwc2/platform.c +++ b/drivers/usb/dwc2/platform.c @@ -129,6 +129,7 @@ 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); |
