[PATCH] ARM: mach-shmobile: mackerel: tidyup usbhs driver settings

[PATCH] ARM: mach-shmobile: mackerel: tidyup usbhs driver settings

[Kuninori Morimoto]

- 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>
---
 arch/arm/mach-shmobile/board-mackerel.c |   21 ++++++---------------
 1 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/arch/arm/mach-shmobile/board-mackerel.c b/arch/arm/mach-shmobile/board-mackerel.c
index 1037bd2..7e1d375 100644
--- a/arch/arm/mach-shmobile/board-mackerel.c
+++ b/arch/arm/mach-shmobile/board-mackerel.c
@@ -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 = {
@@ -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),
 		},
 	},
 };
@@ -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,
@@ -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,
 		},
-- 
1.7.4.1

Re: [PATCH] ARM: mach-shmobile: mackerel: tidyup usbhs driver settings

[Paul Mundt]

On Wed, Jun 15, 2011 at 03:16:35PM +0900, Kuninori Morimoto wrote:
> - 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>

Looks good. Magnus, does this work for you?

Re: [PATCH] ARM: mach-shmobile: mackerel: tidyup usbhs driver settings

[Magnus Damm]

On Wed, Jun 15, 2011 at 3:34 PM, Paul Mundt <lethal@linux-sh.org> wrote:
> On Wed, Jun 15, 2011 at 03:16:35PM +0900, Kuninori Morimoto wrote:
>> - 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>
>
> Looks good. Magnus, does this work for you?

Yes, I tested the pipe portion of this patch yesterday. I trust that
Morimoto-san got the get_id bit right.

Acked-by: Magnus Damm <damm@opensource.se>

Thanks,

/ magnus

Re: [PATCH] ARM: mach-shmobile: mackerel: tidyup usbhs driver settings

[Paul Mundt]

On Wed, Jun 15, 2011 at 03:58:13PM +0900, Magnus Damm wrote:
> On Wed, Jun 15, 2011 at 3:34 PM, Paul Mundt <lethal@linux-sh.org> wrote:
> > On Wed, Jun 15, 2011 at 03:16:35PM +0900, Kuninori Morimoto wrote:
> >> - 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>
> >
> > Looks good. Magnus, does this work for you?
> 
> Yes, I tested the pipe portion of this patch yesterday. I trust that
> Morimoto-san got the get_id bit right.
> 
> Acked-by: Magnus Damm <damm@opensource.se>
> 
Good enough for me. Applied, thanks.

Re: [PATCH] ARM: mach-shmobile: mackerel: tidyup usbhs driver settings

[Paul Mundt]

On Wed, Jun 15, 2011 at 03:16:35PM +0900, Kuninori Morimoto wrote:
> Signed-off-by: Kuninori Morimoto <morimoto.kuninori@renesas.com>

[snip]

> <morimoto.kuninori@renesas.com>: host 10.200.68.187[10.200.68.187] said: 550
>     5.1.1 unknown or illegal alias: morimoto.kuninori@renesas.com (in reply to
>     RCPT TO command)

It would also be good if your sign-off and reply-to actually were valid
addresses, too. While I share your affinity for wanting to cut down on
excessive mail, it's generally considered good form to at least give
people a sporting chance.