[PATCH] USB: option: Add MediaTek MT6276M modem&app interfaces

[PATCH] USB: option: Add MediaTek MT6276M modem&app interfaces

[Meng Zhang (张萌)]

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

1. To declare the product IDs in option.c
2. Please pull from
	git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
   to get these changes

Signed-off-by: Meng Zhang <meng.zhang@mediatek.com>
---------------------------------------------------------------------------------------

drivers/usb/serial/option.c |    7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
index b54afce..7069f9d 100644
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -484,6 +484,9 @@ static void option_instat_callback(struct urb *urb);
 #define LG_VENDOR_ID                           0x1004
 #define LG_PRODUCT_L02C                                0x618f
 
+/* MediaTek products */
+#define MEDIATEK_VENDOR_ID                     0x0e8d
+
 /* some devices interfaces need special handling due to a number of reasons */
 enum option_blacklist_reason {
                OPTION_BLACKLIST_NONE = 0,
@@ -1198,6 +1201,10 @@ static const struct usb_device_id option_ids[] = {
        { USB_DEVICE_AND_INTERFACE_INFO(VIETTEL_VENDOR_ID, VIETTEL_PRODUCT_VT1000, 0xff, 0xff, 0xff) },
        { USB_DEVICE_AND_INTERFACE_INFO(ZD_VENDOR_ID, ZD_PRODUCT_7000, 0xff, 0xff, 0xff) },
        { USB_DEVICE(LG_VENDOR_ID, LG_PRODUCT_L02C) }, /* docomo L-02C modem */
+       { USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, 0x00a1, 0xff, 0x00, 0x00) },
+       { 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 */
        { } /* Terminating entry */
 };
 MODULE_DEVICE_TABLE(usb, option_ids);
ÿôèº{.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¥

Re: [PATCH] USB: option: Add MediaTek MT6276M modem&app interfaces

[Sergei Shtylyov]

Hello.

On 27-02-2012 8:11, Meng Zhang (张萌) wrote:

> 1. To declare the product IDs in option.c
> 2. Please pull from
> 	git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
>     to get these changes

    This patch is not yet there. :-)

> Signed-off-by: Meng Zhang<meng.zhang@mediatek.com>
> ---------------------------------------------------------------------------------------

    This line is not needed. If you want a sperator, use --- instead.

> diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
> index b54afce..7069f9d 100644
> --- a/drivers/usb/serial/option.c
> +++ b/drivers/usb/serial/option.c
> @@ -484,6 +484,9 @@ static void option_instat_callback(struct urb *urb);
>   #define LG_VENDOR_ID                           0x1004
>   #define LG_PRODUCT_L02C                                0x618f
>
> +/* MediaTek products */
> +#define MEDIATEK_VENDOR_ID                     0x0e8d
> +
>   /* some devices interfaces need special handling due to a number of reasons */
>   enum option_blacklist_reason {
>                  OPTION_BLACKLIST_NONE = 0,
> @@ -1198,6 +1201,10 @@ static const struct usb_device_id option_ids[] = {
>          { USB_DEVICE_AND_INTERFACE_INFO(VIETTEL_VENDOR_ID, VIETTEL_PRODUCT_VT1000, 0xff, 0xff, 0xff) },
>          { USB_DEVICE_AND_INTERFACE_INFO(ZD_VENDOR_ID, ZD_PRODUCT_7000, 0xff, 0xff, 0xff) },
>          { USB_DEVICE(LG_VENDOR_ID, LG_PRODUCT_L02C) }, /* docomo L-02C modem */
> +       { USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, 0x00a1, 0xff, 0x00, 0x00) },
> +       { 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 */

    All tabs in the patch were converted to spaces.

WBR, Sergei

RE: [PATCH] USB: option: Add MediaTek MT6276M modem&app interfaces

[Meng Zhang (张萌)]

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

Dear both,

Sorry I'm still a rookie in kernel patching, and should I commit this change by myself or let owner (hi, Matthias) do it?

Thanks~

BR.
Meng Zhang

-----Original Message-----
From: Sergei Shtylyov [mailto:sshtylyov@mvista.com] 
Sent: Monday, February 27, 2012 7:07 PM
To: Meng Zhang (张萌)
Cc: smurf@smurf.noris.de; linux-usb@vger.kernel.org; linux-kernel@vger.kernel.org
Subject: Re: [PATCH] USB: option: Add MediaTek MT6276M modem&app interfaces

Hello.

On 27-02-2012 8:11, Meng Zhang (张萌) wrote:

> 1. To declare the product IDs in option.c 2. Please pull from
> 	git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
>     to get these changes

    This patch is not yet there. :-)

> Signed-off-by: Meng Zhang<meng.zhang@mediatek.com>
> ----------------------------------------------------------------------
> -----------------

    This line is not needed. If you want a sperator, use --- instead.

> diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c 
> index b54afce..7069f9d 100644
> --- a/drivers/usb/serial/option.c
> +++ b/drivers/usb/serial/option.c
> @@ -484,6 +484,9 @@ static void option_instat_callback(struct urb *urb);
>   #define LG_VENDOR_ID                           0x1004
>   #define LG_PRODUCT_L02C                                0x618f
>
> +/* MediaTek products */
> +#define MEDIATEK_VENDOR_ID                     0x0e8d
> +
>   /* some devices interfaces need special handling due to a number of reasons */
>   enum option_blacklist_reason {
>                  OPTION_BLACKLIST_NONE = 0, @@ -1198,6 +1201,10 @@ 
> static const struct usb_device_id option_ids[] = {
>          { USB_DEVICE_AND_INTERFACE_INFO(VIETTEL_VENDOR_ID, VIETTEL_PRODUCT_VT1000, 0xff, 0xff, 0xff) },
>          { USB_DEVICE_AND_INTERFACE_INFO(ZD_VENDOR_ID, ZD_PRODUCT_7000, 0xff, 0xff, 0xff) },
>          { USB_DEVICE(LG_VENDOR_ID, LG_PRODUCT_L02C) }, /* docomo 
> L-02C modem */
> +       { USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, 0x00a1, 0xff, 0x00, 0x00) },
> +       { 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 */

    All tabs in the patch were converted to spaces.

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¥

[PATCH] USB: option: Add MediaTek MT6276M modem&app interfaces

[Meng Zhang]

from: Meng Zhang <meng.zhang@mediatek.com>

1. To declare the product IDs in option.c
2. Please pull from
     git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
    to get these changes

Signed-off-by: Meng Zhang <meng.zhang@mediatek.com>
---------------------------------------------------------------------------------------

drivers/usb/serial/option.c |    7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
index b54afce..7069f9d 100644
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -484,6 +484,9 @@ static void option_instat_callback(struct urb *urb);
  #define LG_VENDOR_ID                           0x1004
  #define LG_PRODUCT_L02C                                0x618f

+/* MediaTek products */
+#define MEDIATEK_VENDOR_ID                     0x0e8d
+
  /* some devices interfaces need special handling due to a number of 
reasons */
  enum option_blacklist_reason {
                 OPTION_BLACKLIST_NONE = 0,
@@ -1198,6 +1201,10 @@ static const struct usb_device_id option_ids[] = {
         { USB_DEVICE_AND_INTERFACE_INFO(VIETTEL_VENDOR_ID, 
VIETTEL_PRODUCT_VT1000, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZD_VENDOR_ID, ZD_PRODUCT_7000, 
0xff, 0xff, 0xff) },
         { USB_DEVICE(LG_VENDOR_ID, LG_PRODUCT_L02C) }, /* docomo L-02C 
modem */
+       { USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, 0x00a1, 
0xff, 0x00, 0x00) },
+       { 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 */
         { } /* Terminating entry */
  };
  MODULE_DEVICE_TABLE(usb, option_ids);

[PATCH] USB: option: Add MediaTek MT6276M modem&app interfaces

[meng zhang]

from: Meng Zhang <meng.zhang@mediatek.com>

1. This patch is based on kernel 3.0.0
2. To declare the product IDs in option.c

Signed-off-by: Meng Zhang <meng.zhang@mediatek.com>
---------------------------------------------------------------------------------------

--- option.c.orig	2011-10-07 22:50:04.000000000 +0800
+++ option.c	2012-02-23 10:42:40.635138657 +0800
@@ -416,6 +416,9 @@ static void option_instat_callback(struc
 #define SAMSUNG_VENDOR_ID                       0x04e8
 #define SAMSUNG_PRODUCT_GT_B3730                0x6889

+/* MediaTek products */
+#define MEDIATEK_VENDOR_ID				0x0e8d
+
 /* some devices interfaces need special handling due to a number of reasons */
 enum option_blacklist_reason {
 		OPTION_BLACKLIST_NONE = 0,
@@ -1005,6 +1008,10 @@ static const struct usb_device_id option
 	{ USB_DEVICE(CELOT_VENDOR_ID, CELOT_PRODUCT_CT680M) }, /* CT-650
CDMA 450 1xEVDO modem */
 	{ USB_DEVICE(ONDA_VENDOR_ID, ONDA_MT825UP) }, /* ONDA MT825UP modem */
 	{ USB_DEVICE_AND_INTERFACE_INFO(SAMSUNG_VENDOR_ID,
SAMSUNG_PRODUCT_GT_B3730, USB_CLASS_CDC_DATA, 0x00, 0x00) }, /*
Samsung GT-B3730 LTE USB modem.*/
+	{ USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, 0x00a1, 0xff,
0x00, 0x00) },
+	{ 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 */
 	{ } /* Terminating entry */
 };
 MODULE_DEVICE_TABLE(usb, option_ids);

[PATCH] USB: option: Add MediaTek MT6276M modem&app interfaces

[meng zhang]

from: Meng Zhang <meng.zhang@mediatek.com>

1. This patch is based on kernel 3.0.0
2. To declare the product IDs in option.c

Signed-off-by: Meng Zhang <meng.zhang@mediatek.com>
---------------------------------------------------------------------------------------

--- option.c	2012-02-23 10:42:40.635138657 +0800
+++ option.c.orig	2011-10-07 22:50:04.000000000 +0800
@@ -416,9 +416,6 @@ static void option_instat_callback(struc
 #define SAMSUNG_VENDOR_ID                       0x04e8
 #define SAMSUNG_PRODUCT_GT_B3730                0x6889

-/* MediaTek products */
-#define MEDIATEK_VENDOR_ID				0x0e8d
-
 /* some devices interfaces need special handling due to a number of reasons */
 enum option_blacklist_reason {
 		OPTION_BLACKLIST_NONE = 0,
@@ -1008,10 +1005,6 @@ static const struct usb_device_id option
 	{ USB_DEVICE(CELOT_VENDOR_ID, CELOT_PRODUCT_CT680M) }, /* CT-650
CDMA 450 1xEVDO modem */
 	{ USB_DEVICE(ONDA_VENDOR_ID, ONDA_MT825UP) }, /* ONDA MT825UP modem */
 	{ USB_DEVICE_AND_INTERFACE_INFO(SAMSUNG_VENDOR_ID,
SAMSUNG_PRODUCT_GT_B3730, USB_CLASS_CDC_DATA, 0x00, 0x00) }, /*
Samsung GT-B3730 LTE USB modem.*/
-	{ USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, 0x00a1, 0xff,
0x00, 0x00) },
-	{ 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 */
 	{ } /* Terminating entry */
 };
 MODULE_DEVICE_TABLE(usb, option_ids);

Re: [PATCH] USB: option: Add MediaTek MT6276M modem&app interfaces

[Sergei Shtylyov]

Hello.

On 24-02-2012 10:41, meng zhang wrote:

> from: Meng Zhang<meng.zhang@mediatek.com>

> 1. This patch is based on kernel 3.0.0

    You should base on the recent kernel instead.

> 2. To declare the product IDs in option.c

> Signed-off-by: Meng Zhang<meng.zhang@mediatek.com>
> ---------------------------------------------------------------------------------------

    This line is not needed here.

> --- option.c	2012-02-23 10:42:40.635138657 +0800
> +++ option.c.orig	2011-10-07 22:50:04.000000000 +0800

    The patch should be applicablke with -p1 switch, i.e. based on the linux 
source root.

[...]
> @@ -1008,10 +1005,6 @@ static const struct usb_device_id option
>   	{ USB_DEVICE(CELOT_VENDOR_ID, CELOT_PRODUCT_CT680M) }, /* CT-650
> CDMA 450 1xEVDO modem */
>   	{ USB_DEVICE(ONDA_VENDOR_ID, ONDA_MT825UP) }, /* ONDA MT825UP modem */
>   	{ USB_DEVICE_AND_INTERFACE_INFO(SAMSUNG_VENDOR_ID,
> SAMSUNG_PRODUCT_GT_B3730, USB_CLASS_CDC_DATA, 0x00, 0x00) }, /*
> Samsung GT-B3730 LTE USB modem.*/
> -	{ USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, 0x00a1, 0xff,
> 0x00, 0x00) },

    You're not adding the device IDs, you're removing them.

> -	{ 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 */

    The patch is line wrapped.

WBR, Sergei

Re: [PATCH] USB: option: Add MediaTek MT6276M modem&app interfaces

[Greg KH]

On Fri, Feb 24, 2012 at 02:41:04PM +0800, meng zhang wrote:
> from: Meng Zhang <meng.zhang@mediatek.com>
> 
> 1. This patch is based on kernel 3.0.0

That is quite old, please make it against Linus's latest git tree if
possible, and if not, against 3.3-rc4.  And if not that, how about 3.3?

> 2. To declare the product IDs in option.c
> 
> Signed-off-by: Meng Zhang <meng.zhang@mediatek.com>
> ---------------------------------------------------------------------------------------
> 
> --- option.c	2012-02-23 10:42:40.635138657 +0800
> +++ option.c.orig	2011-10-07 22:50:04.000000000 +0800

Hm, I think you didn't read Documentation/SubmittingPatches for the
correct patch level to send things.  Please fix this as our automated
tools can not handle this patch

> @@ -416,9 +416,6 @@ static void option_instat_callback(struc
>  #define SAMSUNG_VENDOR_ID                       0x04e8
>  #define SAMSUNG_PRODUCT_GT_B3730                0x6889
> 
> -/* MediaTek products */
> -#define MEDIATEK_VENDOR_ID				0x0e8d
> -
>  /* some devices interfaces need special handling due to a number of reasons */
>  enum option_blacklist_reason {
>  		OPTION_BLACKLIST_NONE = 0,
> @@ -1008,10 +1005,6 @@ static const struct usb_device_id option
>  	{ USB_DEVICE(CELOT_VENDOR_ID, CELOT_PRODUCT_CT680M) }, /* CT-650
> CDMA 450 1xEVDO modem */

Your patch is also linewrapped, making it impossible to apply :(

Care to try this again after fixing it?

greg k-h