From: 黄涛 <huangtao@rock-chips.com>
Date: Thu, 12 Jul 2012 10:46:41 +0000 (+0800)
Subject: Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0-jb
X-Git-Tag: firefly_0821_release~8882^2~19
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=a2ad9f9801deab2189d36ec0bbcf5192c9a2f635;p=firefly-linux-kernel-4.4.55.git

Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0-jb

Conflicts:
	drivers/net/usb/asix.c
	drivers/net/wireless/iwlwifi/iwl-agn-rs.c
	drivers/usb/serial/option.c
---

a2ad9f9801deab2189d36ec0bbcf5192c9a2f635
diff --cc drivers/gpio/Kconfig
index 3b8f6043bf0c,80ccce9f6721..1eb284d433bd
mode 100755,100644..100755
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
diff --cc drivers/mmc/core/sdio.c
index ee715e73b3f7,9b18b5416599..e1bf6274cf0c
mode 100755,100644..100755
--- a/drivers/mmc/core/sdio.c
+++ b/drivers/mmc/core/sdio.c
diff --cc drivers/net/Kconfig
index 9c9eec33143b,0c3f234afc06..0a47cad72580
mode 100755,100644..100755
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
diff --cc drivers/usb/serial/option.c
index a01fedbca7e6,ce024577400e..e9c5474b8e4a
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@@ -431,14 -427,7 +433,14 @@@ static void option_instat_callback(stru
  #define SAMSUNG_VENDOR_ID                       0x04e8
  #define SAMSUNG_PRODUCT_GT_B3730                0x6889
  
 +/* leadcore LC1808*/
 +#define LEADCORE_VENDOR_ID	0x1ab7
 +#define LEADCORE_PRODUCT_LC1808	0x2200
 +/*展讯模组*/
 +#define SC8800G_VENDOR_ID	0x067b
 +#define SC8800G_PRODUCT_ID	0x2303
 +
- /* YUGA products  www.yuga-info.com*/
+ /* YUGA products  www.yuga-info.com gavin.kx@qq.com */
  #define YUGA_VENDOR_ID				0x257A
  #define YUGA_PRODUCT_CEM600			0x1601
  #define YUGA_PRODUCT_CEM610			0x1602
@@@ -1456,8 -1395,8 +1453,9 @@@ static void option_instat_callback(stru
  	int err;
  	int status = urb->status;
  	struct usb_serial_port *port =  urb->context;
- 	struct option_port_private *portdata = usb_get_serial_port_data(port);
+ 	struct usb_wwan_port_private *portdata =
+ 					usb_get_serial_port_data(port);
 +	static int err_times = 0;
  
  	dbg("%s", __func__);
  	dbg("%s: urb %p port %p has data %p", __func__, urb, port, portdata);
diff --cc drivers/usb/serial/usb-serial.c
index c4fd197e2bd3,6f81aa593182..6b715c6fb3f1
mode 100755,100644..100755
--- a/drivers/usb/serial/usb-serial.c
+++ b/drivers/usb/serial/usb-serial.c
diff --cc fs/block_dev.c
index 5f58e5ac6a40,a580028e2fb8..d6093f91c48c
mode 100755,100644..100755
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
diff --cc include/linux/mmc/host.h
index 397c8338f2ab,f8d1e741d80c..3b7d4c5001e9
mode 100755,100644..100755
--- a/include/linux/mmc/host.h
+++ b/include/linux/mmc/host.h
@@@ -267,18 -265,9 +267,19 @@@ struct mmc_host 
  	const struct mmc_bus_ops *bus_ops;	/* current bus driver */
  	unsigned int		bus_refs;	/* reference counter */
  
 +#if defined(CONFIG_SDMMC_RK29) && !defined(CONFIG_SDMMC_RK29_OLD)
 +	unsigned int		re_initialized_flags; //in order to begin the rescan ;  added by xbw@2011-04-07
 +	unsigned int		doneflag; //added by xbw at 2011-08-27
 +	int			(*sdmmc_host_hw_init)(void *data);
 +#endif
 +
 +	unsigned int		bus_resume_flags;
 +#define MMC_BUSRESUME_MANUAL_RESUME	(1 << 0)
 +#define MMC_BUSRESUME_NEEDS_RESUME	(1 << 1)
 +
  	unsigned int		sdio_irqs;
  	struct task_struct	*sdio_irq_thread;
+ 	bool			sdio_irq_pending;
  	atomic_t		sdio_irq_thread_abort;
  
  	mmc_pm_flag_t		pm_flags;	/* requested pm features */