All of lore.kernel.org
 help / color / mirror / Atom feed
* USB: option: Add MEDIATEK product ids
@ 2012-07-06 13:50 gaosen
  2012-07-06 17:28 ` Sergei Shtylyov
  2012-07-06 17:33 ` Greg KH
  0 siblings, 2 replies; 4+ messages in thread
From: gaosen @ 2012-07-06 13:50 UTC (permalink / raw)
  To: smurf, gregkh; +Cc: linux-usb, linux-kernel

>From 86fcd5bb701bd927d588386c480c37784d10040a Mon Sep 17 00:00:00 2001
From: Gaosen Zhang <gaosen.zhang@mediatek.com>
Date: Fri, 6 Jul 2012 21:44:10 +0800
Subject: [PATCH 1/1] USB: option: Add MEDIATEK product ids


Signed-off-by: Gaosen Zhang <gaosen.zhang@mediatek.com>
---
 drivers/usb/serial/option.c |   20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
index e668a24..f342a2c 100644
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -496,6 +496,15 @@ static void option_instat_callback(struct urb *urb);

 /* MediaTek products */
 #define MEDIATEK_VENDOR_ID			0x0e8d
+#define MTK_FP_1COM				0x0003
+#define MTK_FP_2COM				0x0023
+#define MTK_FPDC_2COM				0x0033
+#define MTK_FPDC_1COM				0x0043
+#define MTK_DC_1COM				0x00a0
+#define MTK_DC_5COM				0x00a4
+#define MTK_DC_4COM				0x00a5
+#define MTK_7208_1COM				0x7101
+#define MTK_7208_2COM				0x7102

 /* some devices interfaces need special handling due to a number of reasons */
 enum option_blacklist_reason {
@@ -1233,6 +1242,17 @@ static const struct usb_device_id option_ids[] = {
 	{ USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, 0x00a1, 0xff,
0x02, 0x01) },
 	{ USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, 0x00a2, 0xff,
0x00, 0x00) },
 	{ USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, 0x00a2, 0xff,
0x02, 0x01) },        /* MediaTek MT6276M modem & app port */
+	{ USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, MTK_FP_1COM,
0x0a, 0x00, 0x00) },
+	{ USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, MTK_FP_2COM,
0x0a, 0x00, 0x00) },
+	{ USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, MTK_FPDC_1COM,
0x0a, 0x00, 0x00) },
+	{ USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, MTK_FPDC_2COM,
0x0a, 0x00, 0x00) },
+	{ USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, MTK_DC_1COM,
0x0a, 0x00, 0x00) },
+	{ USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, MTK_DC_5COM,
0xff, 0x02, 0x01) },
+	{ USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, MTK_DC_5COM,
0xff, 0x00, 0x00) },
+	{ USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, MTK_DC_4COM,
0xff, 0x02, 0x01) },
+	{ USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, MTK_DC_4COM,
0xff, 0x00, 0x00) },
+	{ USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, MTK_7208_1COM,
0x02, 0x00, 0x00) },
+	{ USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, MTK_7208_2COM,
0x02, 0x02, 0x01) },
 	{ } /* Terminating entry */
 };
 MODULE_DEVICE_TABLE(usb, option_ids);
-- 
1.7.9.5

^ permalink raw reply related	[flat|nested] 4+ messages in thread
* Re: USB: option: Add MEDIATEK product ids
  2012-07-06 13:50 USB: option: Add MEDIATEK product ids gaosen
@ 2012-07-06 17:28 ` Sergei Shtylyov
  2012-07-09  3:39   ` Gaosen Zhang (张高森)
  2012-07-06 17:33 ` Greg KH
  1 sibling, 1 reply; 4+ messages in thread
From: Sergei Shtylyov @ 2012-07-06 17:28 UTC (permalink / raw)
  To: gaosen; +Cc: smurf, gregkh, linux-usb, linux-kernel

On 07/06/2012 05:50 PM, gaosen wrote:

> From 86fcd5bb701bd927d588386c480c37784d10040a Mon Sep 17 00:00:00 2001
> From: Gaosen Zhang <gaosen.zhang@mediatek.com>
> Date: Fri, 6 Jul 2012 21:44:10 +0800
> Subject: [PATCH 1/1] USB: option: Add MEDIATEK product ids

> Signed-off-by: Gaosen Zhang <gaosen.zhang@mediatek.com>
> ---
>  drivers/usb/serial/option.c |   20 ++++++++++++++++++++
>  1 file changed, 20 insertions(+)

> diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
> index e668a24..f342a2c 100644
> --- a/drivers/usb/serial/option.c
> +++ b/drivers/usb/serial/option.c
[...]
>  	{ USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, 0x00a1, 0xff,
> 0x02, 0x01) },
>  	{ USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, 0x00a2, 0xff,
> 0x00, 0x00) },
>  	{ USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, 0x00a2, 0xff,
> 0x02, 0x01) },        /* MediaTek MT6276M modem & app port */
> +	{ USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, MTK_FP_1COM,
> 0x0a, 0x00, 0x00) },
> +	{ USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, MTK_FP_2COM,
> 0x0a, 0x00, 0x00) },
> +	{ USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, MTK_FPDC_1COM,
> 0x0a, 0x00, 0x00) },
> +	{ USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, MTK_FPDC_2COM,
> 0x0a, 0x00, 0x00) },
> +	{ USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, MTK_DC_1COM,
> 0x0a, 0x00, 0x00) },
> +	{ USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, MTK_DC_5COM,
> 0xff, 0x02, 0x01) },
> +	{ USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, MTK_DC_5COM,
> 0xff, 0x00, 0x00) },
> +	{ USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, MTK_DC_4COM,
> 0xff, 0x02, 0x01) },
> +	{ USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, MTK_DC_4COM,
> 0xff, 0x00, 0x00) },
> +	{ USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, MTK_7208_1COM,
> 0x02, 0x00, 0x00) },
> +	{ USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, MTK_7208_2COM,
> 0x02, 0x02, 0x01) },
>  	{ } /* Terminating entry */
>  };
>  MODULE_DEVICE_TABLE(usb, option_ids);

   Still line wrapped.

WBR, Sergei

^ permalink raw reply	[flat|nested] 4+ messages in thread
* Re: USB: option: Add MEDIATEK product ids
  2012-07-06 13:50 USB: option: Add MEDIATEK product ids gaosen
  2012-07-06 17:28 ` Sergei Shtylyov
@ 2012-07-06 17:33 ` Greg KH
  1 sibling, 0 replies; 4+ messages in thread
From: Greg KH @ 2012-07-06 17:33 UTC (permalink / raw)
  To: gaosen; +Cc: smurf, linux-usb, linux-kernel

On Fri, Jul 06, 2012 at 09:50:50PM +0800, gaosen wrote:
> >From 86fcd5bb701bd927d588386c480c37784d10040a Mon Sep 17 00:00:00 2001
> From: Gaosen Zhang <gaosen.zhang@mediatek.com>
> Date: Fri, 6 Jul 2012 21:44:10 +0800
> Subject: [PATCH 1/1] USB: option: Add MEDIATEK product ids
> 
> 
> Signed-off-by: Gaosen Zhang <gaosen.zhang@mediatek.com>
> ---
>  drivers/usb/serial/option.c |   20 ++++++++++++++++++++
>  1 file changed, 20 insertions(+)

This conflicts with the patch that you sent me a few days ago which I've
already applied.  What is the difference and why did you rename some of
the #defines?

Can you please send me an incremental patch on top of the other patch
that you previous sent me, so that I can properly include this one, as
it looks like it does add support for a few more devices?

thanks,

greg k-h

^ permalink raw reply	[flat|nested] 4+ messages in thread
* RE: USB: option: Add MEDIATEK product ids
  2012-07-06 17:28 ` Sergei Shtylyov
@ 2012-07-09  3:39   ` Gaosen Zhang (张高森)
  0 siblings, 0 replies; 4+ messages in thread
From: Gaosen Zhang (张高森) @ 2012-07-09  3:39 UTC (permalink / raw)
  To: Sergei Shtylyov
  Cc: smurf@smurf.noris.de, gregkh@linuxfoundation.org,
	linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset="gb2312", Size: 2667 bytes --]

Dear Shtylyov,
	
	Sorry, I send this patch use web mail(in my mail line not wrapped), I will use git client to send mail again.
	Thank you very much.

BR,
Gaosen

-----Original Message-----
From: Sergei Shtylyov [mailto:sshtylyov@mvista.com] 
Sent: 2012Äê7ÔÂ7ÈÕ 1:28
To: Gaosen Zhang (ÕŸßÉ­)
Cc: smurf@smurf.noris.de; gregkh@linuxfoundation.org; linux-usb@vger.kernel.org; linux-kernel@vger.kernel.org
Subject: Re: USB: option: Add MEDIATEK product ids

On 07/06/2012 05:50 PM, gaosen wrote:

> From 86fcd5bb701bd927d588386c480c37784d10040a Mon Sep 17 00:00:00 2001
> From: Gaosen Zhang <gaosen.zhang@mediatek.com>
> Date: Fri, 6 Jul 2012 21:44:10 +0800
> Subject: [PATCH 1/1] USB: option: Add MEDIATEK product ids

> Signed-off-by: Gaosen Zhang <gaosen.zhang@mediatek.com>
> ---
>  drivers/usb/serial/option.c |   20 ++++++++++++++++++++
>  1 file changed, 20 insertions(+)

> diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c 
> index e668a24..f342a2c 100644
> --- a/drivers/usb/serial/option.c
> +++ b/drivers/usb/serial/option.c
[...]
>  	{ USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, 0x00a1, 0xff, 
> 0x02, 0x01) },
>  	{ USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, 0x00a2, 0xff, 
> 0x00, 0x00) },
>  	{ USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, 0x00a2, 0xff,
> 0x02, 0x01) },        /* MediaTek MT6276M modem & app port */
> +	{ USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, MTK_FP_1COM,
> 0x0a, 0x00, 0x00) },
> +	{ USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, MTK_FP_2COM,
> 0x0a, 0x00, 0x00) },
> +	{ USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, MTK_FPDC_1COM,
> 0x0a, 0x00, 0x00) },
> +	{ USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, MTK_FPDC_2COM,
> 0x0a, 0x00, 0x00) },
> +	{ USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, MTK_DC_1COM,
> 0x0a, 0x00, 0x00) },
> +	{ USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, MTK_DC_5COM,
> 0xff, 0x02, 0x01) },
> +	{ USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, MTK_DC_5COM,
> 0xff, 0x00, 0x00) },
> +	{ USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, MTK_DC_4COM,
> 0xff, 0x02, 0x01) },
> +	{ USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, MTK_DC_4COM,
> 0xff, 0x00, 0x00) },
> +	{ USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, MTK_7208_1COM,
> 0x02, 0x00, 0x00) },
> +	{ USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, MTK_7208_2COM,
> 0x02, 0x02, 0x01) },
>  	{ } /* Terminating entry */
>  };
>  MODULE_DEVICE_TABLE(usb, option_ids);

   Still line wrapped.

WBR, Sergei
ÿôèº{.nÇ+‰·Ÿ®‰­†+%ŠËÿ±éݶ\x17¥Šwÿº{.nÇ+‰·¥Š{±þG«éÿŠ{ayº\x1dʇڙë,j\a­¢f£¢·hšïêÿ‘êçz_è®\x03(­éšŽŠÝ¢j"ú\x1a¶^[m§ÿÿ¾\a«þG«éÿ¢¸?™¨è­Ú&£ø§~á¶iO•æ¬z·švØ^\x14\x04\x1a¶^[m§ÿÿÃ\fÿ¶ìÿ¢¸?–I¥

^ permalink raw reply	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-07-09  3:47 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-07-06 13:50 USB: option: Add MEDIATEK product ids gaosen
2012-07-06 17:28 ` Sergei Shtylyov
2012-07-09  3:39   ` Gaosen Zhang (张高森)
2012-07-06 17:33 ` Greg KH

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.