Skip to content

Commit

Permalink
ARM: mach-shmobile: mackerel: tidyup usbhs driver settings
Browse files Browse the repository at this point in the history
- usb0 pipe is same as default. own pipe config is not needed
- usb1 lost get_id function

Signed-off-by: Kuninori Morimoto <morimoto.kuninori@renesas.com>
Acked-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
  • Loading branch information
Kuninori Morimoto authored and Paul Mundt committed Jun 15, 2011
1 parent 3110572 commit 05a7929
Showing 1 changed file with 6 additions and 15 deletions.
21 changes: 6 additions & 15 deletions arch/arm/mach-shmobile/board-mackerel.c
Original file line number Diff line number Diff line change
Expand Up @@ -629,19 +629,6 @@ static void usbhs0_hardware_exit(struct platform_device *pdev)
cancel_delayed_work_sync(&priv->work);
}

static u32 usbhs0_pipe_cfg[] = {
USB_ENDPOINT_XFER_CONTROL,
USB_ENDPOINT_XFER_ISOC,
USB_ENDPOINT_XFER_ISOC,
USB_ENDPOINT_XFER_BULK,
USB_ENDPOINT_XFER_BULK,
USB_ENDPOINT_XFER_BULK,
USB_ENDPOINT_XFER_INT,
USB_ENDPOINT_XFER_INT,
USB_ENDPOINT_XFER_INT,
USB_ENDPOINT_XFER_BULK,
};

static struct usbhs_private usbhs0_private = {
.usbcrcaddr = 0xe605810c, /* USBCR2 */
.info = {
Expand All @@ -654,8 +641,6 @@ static struct usbhs_private usbhs0_private = {
},
.driver_param = {
.buswait_bwait = 4,
.pipe_type = usbhs0_pipe_cfg,
.pipe_size = ARRAY_SIZE(usbhs0_pipe_cfg),
},
},
};
Expand Down Expand Up @@ -786,6 +771,11 @@ static void usbhs1_hardware_exit(struct platform_device *pdev)
free_irq(IRQ8, pdev);
}

static int usbhs1_get_id(struct platform_device *pdev)
{
return USBHS_GADGET;
}

static u32 usbhs1_pipe_cfg[] = {
USB_ENDPOINT_XFER_CONTROL,
USB_ENDPOINT_XFER_ISOC,
Expand All @@ -812,6 +802,7 @@ static struct usbhs_private usbhs1_private = {
.platform_callback = {
.hardware_init = usbhs1_hardware_init,
.hardware_exit = usbhs1_hardware_exit,
.get_id = usbhs1_get_id,
.phy_reset = usbhs_phy_reset,
.get_vbus = usbhs_get_vbus,
},
Expand Down

0 comments on commit 05a7929

Please sign in to comment.