| From ded3e9a9ab6dfd1f41079ba20955bcbc2f84f3a7 Mon Sep 17 00:00:00 2001 |
| From: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> |
| Date: Mon, 18 May 2015 20:04:14 +0900 |
| Subject: [PATCH 322/326] 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> |
| (cherry picked from commit e0213bc5467ca5fe44ab04527f0e47998f30c046) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/usb/renesas_usbhs/common.c | 15 ++++----------- |
| include/linux/usb/renesas_usbhs.h | 3 +-- |
| 2 files changed, 5 insertions(+), 13 deletions(-) |
| |
| diff --git a/drivers/usb/renesas_usbhs/common.c b/drivers/usb/renesas_usbhs/common.c |
| index da321f034e3c..8442805b3753 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) |
| static const struct of_device_id usbhs_of_match[] = { |
| { |
| .compatible = "renesas,usbhs-r8a7790", |
| - .data = (void *)USBHS_TYPE_R8A7790, |
| + .data = (void *)USBHS_TYPE_RCAR_GEN2, |
| }, |
| { |
| .compatible = "renesas,usbhs-r8a7791", |
| - .data = (void *)USBHS_TYPE_R8A7791, |
| + .data = (void *)USBHS_TYPE_RCAR_GEN2, |
| }, |
| { }, |
| }; |
| @@ -497,14 +497,8 @@ static struct renesas_usbhs_platform_info *usbhs_parse_dt(struct device *dev) |
| if (gpio > 0) |
| dparam->enable_gpio = gpio; |
| |
| - switch (dparam->type) { |
| - case USBHS_TYPE_R8A7790: |
| - case USBHS_TYPE_R8A7791: |
| + if (dparam->type == USBHS_TYPE_RCAR_GEN2) |
| dparam->has_usb_dmac = 1; |
| - break; |
| - default: |
| - break; |
| - } |
| |
| return info; |
| } |
| @@ -559,8 +553,7 @@ static int usbhs_probe(struct platform_device *pdev) |
| sizeof(struct renesas_usbhs_driver_param)); |
| |
| switch (priv->dparam.type) { |
| - case USBHS_TYPE_R8A7790: |
| - case USBHS_TYPE_R8A7791: |
| + case USBHS_TYPE_RCAR_GEN2: |
| priv->pfunc = usbhs_rcar2_ops; |
| if (!priv->dparam.pipe_type) { |
| priv->dparam.pipe_type = usbhsc_new_pipe_type; |
| diff --git a/include/linux/usb/renesas_usbhs.h b/include/linux/usb/renesas_usbhs.h |
| index f06529c14141..3dd5a781da99 100644 |
| --- a/include/linux/usb/renesas_usbhs.h |
| +++ b/include/linux/usb/renesas_usbhs.h |
| @@ -169,8 +169,7 @@ struct renesas_usbhs_driver_param { |
| #define USBHS_USB_DMAC_XFER_SIZE 32 /* hardcode the xfer size */ |
| }; |
| |
| -#define USBHS_TYPE_R8A7790 1 |
| -#define USBHS_TYPE_R8A7791 2 |
| +#define USBHS_TYPE_RCAR_GEN2 1 |
| |
| /* |
| * option: |
| -- |
| 2.6.2 |
| |