diff options
author | Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> | 2015-05-18 07:04:14 -0400 |
---|---|---|
committer | Felipe Balbi <balbi@ti.com> | 2015-05-26 11:39:39 -0400 |
commit | e0213bc5467ca5fe44ab04527f0e47998f30c046 (patch) | |
tree | 2c0ef3cd8a6194237624245f9b92efd8db0d3b6e /drivers | |
parent | f14e9ad17f46051b02bffffac2036486097de19e (diff) |
usb: renesas_usbhs: Change USBHS_TYPE_R8A779x to USBHS_TYPE_RCAR_GEN2
Since the HSUSB controllers of R-Car Gen2 are the same specification
(they have 16 pipes and usb-dmac), this patch changes USBHS_TYPE_R8A7790
and USBHS_TYPE_R8A7791 to USBHS_TYPE_RCAR_GEN2.
Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/usb/renesas_usbhs/common.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/drivers/usb/renesas_usbhs/common.c b/drivers/usb/renesas_usbhs/common.c index 0f7e850fd4aa..b56bb9d882fc 100644 --- a/drivers/usb/renesas_usbhs/common.c +++ b/drivers/usb/renesas_usbhs/common.c | |||
@@ -466,11 +466,11 @@ static int usbhsc_drvcllbck_notify_hotplug(struct platform_device *pdev) | |||
466 | static const struct of_device_id usbhs_of_match[] = { | 466 | static const struct of_device_id usbhs_of_match[] = { |
467 | { | 467 | { |
468 | .compatible = "renesas,usbhs-r8a7790", | 468 | .compatible = "renesas,usbhs-r8a7790", |
469 | .data = (void *)USBHS_TYPE_R8A7790, | 469 | .data = (void *)USBHS_TYPE_RCAR_GEN2, |
470 | }, | 470 | }, |
471 | { | 471 | { |
472 | .compatible = "renesas,usbhs-r8a7791", | 472 | .compatible = "renesas,usbhs-r8a7791", |
473 | .data = (void *)USBHS_TYPE_R8A7791, | 473 | .data = (void *)USBHS_TYPE_RCAR_GEN2, |
474 | }, | 474 | }, |
475 | { }, | 475 | { }, |
476 | }; | 476 | }; |
@@ -497,14 +497,8 @@ static struct renesas_usbhs_platform_info *usbhs_parse_dt(struct device *dev) | |||
497 | if (gpio > 0) | 497 | if (gpio > 0) |
498 | dparam->enable_gpio = gpio; | 498 | dparam->enable_gpio = gpio; |
499 | 499 | ||
500 | switch (dparam->type) { | 500 | if (dparam->type == USBHS_TYPE_RCAR_GEN2) |
501 | case USBHS_TYPE_R8A7790: | ||
502 | case USBHS_TYPE_R8A7791: | ||
503 | dparam->has_usb_dmac = 1; | 501 | dparam->has_usb_dmac = 1; |
504 | break; | ||
505 | default: | ||
506 | break; | ||
507 | } | ||
508 | 502 | ||
509 | return info; | 503 | return info; |
510 | } | 504 | } |
@@ -559,8 +553,7 @@ static int usbhs_probe(struct platform_device *pdev) | |||
559 | sizeof(struct renesas_usbhs_driver_param)); | 553 | sizeof(struct renesas_usbhs_driver_param)); |
560 | 554 | ||
561 | switch (priv->dparam.type) { | 555 | switch (priv->dparam.type) { |
562 | case USBHS_TYPE_R8A7790: | 556 | case USBHS_TYPE_RCAR_GEN2: |
563 | case USBHS_TYPE_R8A7791: | ||
564 | priv->pfunc = usbhs_rcar2_ops; | 557 | priv->pfunc = usbhs_rcar2_ops; |
565 | if (!priv->dparam.pipe_type) { | 558 | if (!priv->dparam.pipe_type) { |
566 | priv->dparam.pipe_type = usbhsc_new_pipe_type; | 559 | priv->dparam.pipe_type = usbhsc_new_pipe_type; |