Merge remote-tracking branch 'kernel-2.6.32/develop' into develop-2.6.36
author黄涛 <huangtao@rock-chips.com>
Mon, 26 Sep 2011 06:53:47 +0000 (14:53 +0800)
committer黄涛 <huangtao@rock-chips.com>
Mon, 26 Sep 2011 06:53:47 +0000 (14:53 +0800)
Conflicts:
arch/arm/mm/mmu.c
drivers/input/keyboard/Makefile
drivers/media/video/gc0309.c
drivers/misc/Kconfig
drivers/mmc/core/core.c
drivers/regulator/Kconfig
drivers/regulator/Makefile
drivers/usb/gadget/f_mass_storage.c
drivers/video/backlight/Makefile
include/linux/fb.h
include/linux/mmc/host.h

39 files changed:
1  2 
arch/arm/mach-rk29/board-rk29-ddr3sdk.c
arch/arm/mach-rk29/board-rk29-phonesdk.c
arch/arm/mach-rk29/board-rk29phonepadsdk.c
arch/arm/mach-rk29/board-rk29sdk.c
arch/arm/mach-rk29/vpu_service.c
arch/arm/mm/mmu.c
drivers/input/Kconfig
drivers/input/Makefile
drivers/input/keyboard/Kconfig
drivers/input/keyboard/Makefile
drivers/input/touchscreen/Kconfig
drivers/input/touchscreen/Makefile
drivers/input/touchscreen/eeti_egalax_i2c.c
drivers/media/video/gc0309.c
drivers/media/video/ov2659.c
drivers/media/video/ov3640.c
drivers/media/video/ov5640.c
drivers/media/video/uvc/uvc_video.c
drivers/misc/Kconfig
drivers/misc/Makefile
drivers/mmc/core/core.c
drivers/mmc/host/Kconfig
drivers/mmc/host/rk29_sdmmc.c
drivers/net/rk29_vmac.c
drivers/net/wireless/Kconfig
drivers/net/wireless/Makefile
drivers/power/wm831x_power.c
drivers/regulator/Kconfig
drivers/regulator/Makefile
drivers/usb/serial/option.c
drivers/video/backlight/Kconfig
drivers/video/backlight/Makefile
drivers/video/rk29_fb.c
include/linux/fb.h
include/linux/gfp.h
include/linux/mmc/host.h
mm/page_alloc.c
sound/soc/rk29/rk29_i2s.c
sound/soc/rk29/rk29_pcm.c

index 38fc8c397e1063614db26d19d297cfb67ae6fdab,d380cf9b3c0264c5255c0e3aa38c3b2e1a4d1008..94e26b5f173f5b34e36e84534d4ca762629bb372
mode 100644,100755..100755
index 84b74c9318510274bd7a7853be5372b0e22d77f6,d340f5527bf21e5cd76653ead58eed8d6c6bed9b..3fcc1392c4aef7b1922745f5dcf05ee8966c4ae4
mode 100755,100644..100644
Simple merge
index 3185ee8a73c01352970cebeb259e13c26835cddc,6cfc032ae80c8ac59efcc1c58ecfd2f74d2a05fd..16314854323aac97aa6913b495378b2bee55bc18
@@@ -725,9 -672,9 +725,9 @@@ void __init iotable_init(struct map_des
  }
  
  #if defined(CONFIG_RK29_MEM_SIZE_M) && CONFIG_RK29_MEM_SIZE_M >= 1024
- static void * __initdata vmalloc_min = (void *)(VMALLOC_END - SZ_256M);
 -static unsigned long __initdata vmalloc_reserve = SZ_512M;
++static void * __initdata vmalloc_min = (void *)(VMALLOC_END - SZ_512M);
  #else
 -static unsigned long __initdata vmalloc_reserve = SZ_128M;
 +static void * __initdata vmalloc_min = (void *)(VMALLOC_END - SZ_128M);
  #endif
  
  /*
Simple merge
index 3915ff2c87aee1509354bf48d8c244fb50a81ffe,124cd3de8fdd4e7abc37b9f988e1dc956457eb10..370bd0f94f7358bb55faf6b8fcec464277afc049
@@@ -23,8 -22,8 +23,9 @@@ obj-$(CONFIG_INPUT_TABLET)    += tablet
  obj-$(CONFIG_INPUT_TOUCHSCREEN)       += touchscreen/
  obj-$(CONFIG_INPUT_MISC)      += misc/
  obj-$(CONFIG_G_SENSOR_DEVICE) += gsensor/
+ obj-$(CONFIG_GYRO_SENSOR_DEVICE)      += gyroscope/
  obj-$(CONFIG_INPUT_JOGBALL)   += jogball/
 +obj-$(CONFIG_LIGHT_SENSOR_DEVICE) += lightsensor/
  
  obj-$(CONFIG_INPUT_APMPOWER)  += apm-power.o
  obj-$(CONFIG_INPUT_KEYRESET)  += keyreset.o
index e3fe4589abffed8f075a84a6b33c333632e112f0,e453b1be99379480baad4d793883a09176eeadb3..0592a9f6ba0a7f15afddd2c2963b3ead42992021
mode 100755,100644..100644
@@@ -17,8 -16,14 +17,14 @@@ config KEYS_RK2
        depends on ARCH_RK29
        default y
        help
 -              rk29 keyboard drivers(gpio and adc)
 +        rk29 keyboard drivers(gpio and adc)
  
+ config KEYS_RK29_NEWTON
+       tristate "rk29 newton keyboard"
+       depends on ARCH_RK29
+       help
+               rk29 newton keyboard drivers(gpio and adc)
  config SYNAPTICS_SO340010
        tristate "Synaptics So340010 TouchPad KEY"
        depends on I2C
index 985553c87e86e0ad3b7350da3d2282f1dab3845a,c8f3a15d1a0e12c700ffdf5775ac1744fb7cf97e..bc9f81d107e5c01cec98bdab7f6c94e204543293
mode 100755,100644..100644
@@@ -4,9 -4,9 +4,10 @@@
  
  # Each configuration option enables a list of files.
  
- obj-$(CONFIG_KEYS_RK29)                               += rk29_keys.o
+ obj-$(CONFIG_KEYS_RK29)                       += rk29_keys.o
+ obj-$(CONFIG_KEYS_RK29_NEWTON)                += rk29_newton_keys.o
  obj-$(CONFIG_KEYBOARD_AAED2000)               += aaed2000_kbd.o
 +obj-$(CONFIG_KEYBOARD_ADP5520)                += adp5520-keys.o
  obj-$(CONFIG_KEYBOARD_ADP5588)                += adp5588-keys.o
  obj-$(CONFIG_KEYBOARD_AMIGA)          += amikbd.o
  obj-$(CONFIG_KEYBOARD_ATARI)          += atakbd.o
index 6a00172a05ef04ad4a81b01d0b70ebe15e172079,0c2c040f70942a112a630a08a1dbb623f8e5e42c..d920a863f342ef779af80c6885285f2365d2d4f7
mode 100644,100755..100755
index 0bd60874608a899f0e6f7fca0e3ca4cf593e503c,be8398c5d5d430b8078810b0132bcda738d86901..f62f2325af50bc63e128b4f80b254e94798eda4c
mode 100644,100755..100755
index 23a3ac0666f858199a0c9062f1ab9bb2f1b76a69,f830b2870986d7244abad1591c03887ba353c1d3..6c458ae808a717a0fbb3d7d5a012537a2ed45cab
mode 100644,100755..100755
Simple merge
index bc0b5ee393477c392409bb5624c0ae835c270950,fa99f204508e28ed5b2d4e589d008944dcc5cb9b..3665166585103266784ca215f2be02fdd72c9511
mode 100755,100644..100644
Simple merge
Simple merge
index a0f1a52c736456efe6fb1bbd6b3338b8ddb2f696,b5fefd612ee06e09ba200c7c81d6b778b2584870..e8ec569bad82bc74d2f34a6a435219e8e459acdb
@@@ -401,41 -257,6 +401,26 @@@ config EP93XX_PW
          To compile this driver as a module, choose M here: the module will
          be called ep93xx_pwm.
  
- config STE
-       bool "STE modem control driver"
-       
- config MTK23D
-       bool "MTK6223D modem control driver"
- config FM580X
-       bool "FM rda580x driver"
-       
- config MU509
-       bool "MU509 modem control driver"
-       
- config RK29_NEWTON
-       bool "RK29_NEWTON misc driver"
 +config DS1682
 +      tristate "Dallas DS1682 Total Elapsed Time Recorder with Alarm"
 +      depends on I2C && EXPERIMENTAL
 +      help
 +        If you say yes here you get support for Dallas Semiconductor
 +        DS1682 Total Elapsed Time Recorder.
 +
 +        This driver can also be built as a module.  If so, the module
 +        will be called ds1682.
 +
 +config TI_DAC7512
 +      tristate "Texas Instruments DAC7512"
 +      depends on SPI && SYSFS
 +      help
 +        If you say yes here you get support for the Texas Instruments
 +        DAC7512 16-bit digital-to-analog converter.
 +
 +        This driver can also be built as a module. If so, the module
 +        will be calles ti_dac7512.
 +
  config UID_STAT
        bool "UID based statistics tracking exported to /proc/uid_stat"
        default n
@@@ -499,18 -284,28 +484,40 @@@ config APANIC_PLABE
         If your platform uses a different flash partition label for storing
         crashdumps, enter it here.
  
 +config GPS_GPIO_BRCM4750
 +      bool "Enable gpio controller for GPS brcm 4750"
 +      default y
 +      ---help---
 +      Adds GPIO controller driver for GPS Broadcom 4750 chipset
 +
 +config TEGRA_CRYPTO_DEV
 +      bool "Device node to access tegra aes hardware"
 +      ---help---
 +      Dev node /dev/tegra-crypto in order to get access to tegra aes
 +      hardware from user space
 +
+ config STE
+       bool "STE modem control driver"
+       default n
+       
+ config MTK23D
+       bool "MTK6223D modem control driver"
+       default n       
+ config FM580X
+       bool "FM rda580x driver"
+       default n       
+       
+ config MU509
+       bool "MU509 modem control driver"
+       default n
+ config MW100
+       bool "MW100 modem control driver"
+       default n
+ config RK29_NEWTON
+       bool "RK29_NEWTON misc driver"
+       default n
  source "drivers/misc/c2port/Kconfig"
  source "drivers/misc/eeprom/Kconfig"
  source "drivers/misc/cb710/Kconfig"
Simple merge
Simple merge
index c3016fe82e24f6ee77c905922018fe136260c2e6,85df780a5e0a5148bf18f644a3e69fd48e07471d..cc41ad2f0e73e47116334de4b8e8ca068cb57c90
mode 100644,100755..100755
Simple merge
Simple merge
Simple merge
index 2e01e61c8b4187fa1000b7c76578a4097889a1e4,f463629aa9c227bc7960969fa9495c81ebaf18e9..2ccf4df000cb1321292aadb5128256423ab2c8f7
@@@ -1,8 -1,9 +1,9 @@@
  #
  # Makefile for the Linux Wireless network device drivers.
  #
+ obj-y += wifi_sys/rkwifi_sys_iface.o
  obj-$(CONFIG_BCM4329)   += bcm4329/
 -obj-$(CONFIG_MV8686)   += mv8686/
 +obj-$(CONFIG_MV8686)    += mv8686/
  obj-$(CONFIG_BCM4319)   += bcm4319/
+ obj-$(CONFIG_RTL8192CU)   += rtl8192c/
  #obj-m        += wlan/
Simple merge
index bcc31369b03120233daae6dd762310ddcdd3878e,68f037653845c1462f3d2feb5a7ae715e0a17d7b..b463b679100c9e509ec8249532e8355884204886
@@@ -220,7 -173,11 +220,13 @@@ config RK2818_REGULATOR_LP872
        depends on I2C
        help
          Say Y to enable support for the voltage regulators pmic lp8725 on the RK2818.
 +
+ config REGULATOR_ACT8891
+       tristate "Active Semi ACT8891 PMIC regulators"
+       depends on I2C
+       help
+         Support the voltage and current regulators of the ACT8891 series of PMIC devices.
++
  config RK29_PWM_REGULATOR
        tristate "rk2918 pwm voltage regulator"
        help
index 3e61254569c4baae1733cd8fc26bfd6eea39b882,cc77cab0d4f1f0a0ee370232e6eae518cbd670df..0b4200a25a534c4db947ccd4ed0d8ed56caa1ca3
@@@ -35,12 -27,8 +35,13 @@@ obj-$(CONFIG_RK2818_REGULATOR_LP8725) +
  obj-$(CONFIG_RK2818_REGULATOR_CHARGE) += charge-regulator.o
  obj-$(CONFIG_RK29_PWM_REGULATOR) += rk29-pwm-regulator.o
  
 +obj-$(CONFIG_REGULATOR_CPCAP) += cpcap-regulator.o
 +
  obj-$(CONFIG_REGULATOR_TPS65023) += tps65023-regulator.o
  obj-$(CONFIG_REGULATOR_TPS6507X) += tps6507x-regulator.o
 +obj-$(CONFIG_REGULATOR_88PM8607) += 88pm8607.o
 +obj-$(CONFIG_REGULATOR_ISL6271A) += isl6271a-regulator.o
 +obj-$(CONFIG_REGULATOR_AB8500)        += ab8500.o
+ obj-$(CONFIG_REGULATOR_ACT8891) += act8891.o
  
  ccflags-$(CONFIG_REGULATOR_DEBUG) += -DDEBUG
index 3047e945023b1b655e00bcfbf0568553d381120c,c7bc9be950d2b4425ba50b562ea6a447ac8da5d1..01ef86983a2bf5d5868e9cb6cf35373ec9418156
@@@ -386,8 -373,18 +386,9 @@@ static void option_instat_callback(stru
  /* Thinkwill products */
  #define THINKWILL_VENDOR_ID   0x19f5
  #define THINKWILL_PRODUCT_ID  0x9909
+ #define       THINKWILL_MI900_PRODUCT_ID      0x9013
  
 -/* Cinterion (formerly Siemens) products */
 -#define SIEMENS_VENDOR_ID                             0x0681
 -#define CINTERION_VENDOR_ID                           0x1e2d
 -#define CINTERION_PRODUCT_HC25_MDM            0x0047
 -#define CINTERION_PRODUCT_HC25_MDMNET 0x0040
 -#define CINTERION_PRODUCT_HC28_MDM            0x004C
 -#define CINTERION_PRODUCT_HC28_MDMNET 0x004A /* same for HC28J */
 -#define CINTERION_PRODUCT_EU3_E                       0x0051
 -#define CINTERION_PRODUCT_EU3_P                       0x0052
 -#define CINTERION_PRODUCT_PH8                 0x0053
 +#define CINTERION_VENDOR_ID                   0x0681
  
  /* Olivetti products */
  #define OLIVETTI_VENDOR_ID                    0x0b3c
  #define SC8800G_VENDOR_ID     0x067b
  #define SC8800G_PRODUCT_ID    0x2303
  
 -/* ONDA Communication vendor id */
 -#define ONDA_VENDOR_ID       0x1ee8
 +/* some devices interfaces need special handling due to a number of reasons */
 +enum option_blacklist_reason {
 +              OPTION_BLACKLIST_NONE = 0,
 +              OPTION_BLACKLIST_SENDSETUP = 1,
 +              OPTION_BLACKLIST_RESERVED_IF = 2
 +};
  
 -/* ONDA MT825UP HSDPA 14.2 modem */
 -#define ONDA_MT825UP         0x000b
 +struct option_blacklist_info {
 +      const u32 infolen;      /* number of interface numbers on blacklist */
 +      const u8  *ifaceinfo;   /* pointer to the array holding the numbers */
 +      enum option_blacklist_reason reason;
 +};
  
 -/* Samsung products */
 -#define SAMSUNG_VENDOR_ID                       0x04e8
 -#define SAMSUNG_PRODUCT_GT_B3730                0x6889
 +static const u8 four_g_w14_no_sendsetup[] = { 0, 1 };
 +static const struct option_blacklist_info four_g_w14_blacklist = {
 +      .infolen = ARRAY_SIZE(four_g_w14_no_sendsetup),
 +      .ifaceinfo = four_g_w14_no_sendsetup,
 +      .reason = OPTION_BLACKLIST_SENDSETUP
 +};
  
 -static struct usb_device_id option_ids[] = {
 +static const struct usb_device_id option_ids[] = {
        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COLT) },
        { USB_DEVICE(THINKWILL_VENDOR_ID,THINKWILL_PRODUCT_ID)},
+       { USB_DEVICE(THINKWILL_VENDOR_ID,THINKWILL_MI900_PRODUCT_ID)},
        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA) },
        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA_LIGHT) },
        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA_QUAD) },
        { USB_DEVICE(0x04CC, 0x226E) },
        { USB_DEVICE(0x04CC, 0x225A) },
        { USB_DEVICE(QUALCOMM_VENDOR_ID, 0x0015) },
+       { USB_DEVICE(ALCATEL_VENDOR_ID, 0x00b7) },
+       { USB_DEVICE(ZTE_VENDOR_ID, 0xFFFF) },
+       { USB_DEVICE(LEADCORE_VENDOR_ID, 0x5700) },
+       { USB_DEVICE(LEADCORE_VENDOR_ID, 0x6341) },
  
 -      /* Cinterion */
 -      { USB_DEVICE(CINTERION_VENDOR_ID, CINTERION_PRODUCT_EU3_E) },
 -      { USB_DEVICE(CINTERION_VENDOR_ID, CINTERION_PRODUCT_EU3_P) },
 -      { USB_DEVICE(CINTERION_VENDOR_ID, CINTERION_PRODUCT_PH8) },
 -      { USB_DEVICE(CINTERION_VENDOR_ID, CINTERION_PRODUCT_HC28_MDM) },
 -      { USB_DEVICE(CINTERION_VENDOR_ID, CINTERION_PRODUCT_HC28_MDMNET) },
 -      { USB_DEVICE(SIEMENS_VENDOR_ID, CINTERION_PRODUCT_HC25_MDM) },
 -      { USB_DEVICE(SIEMENS_VENDOR_ID, CINTERION_PRODUCT_HC25_MDMNET) },
 -      { USB_DEVICE(SIEMENS_VENDOR_ID, CINTERION_PRODUCT_HC28_MDM) }, /* HC28 enumerates with Siemens or Cinterion VID depending on FW revision */
 -      { USB_DEVICE(SIEMENS_VENDOR_ID, CINTERION_PRODUCT_HC28_MDMNET) },
 -
 +      { USB_DEVICE(CINTERION_VENDOR_ID, 0x0047) },
        { USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD100) },
        { 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/GT-B3710 LTE USB modem.*/
        { } /* Terminating entry */
  };
  MODULE_DEVICE_TABLE(usb, option_ids);
Simple merge
index c9635acc8e5f375664f86e291e7b79a3a1ba7660,892787099223111dbb61d91a6fc1d58270212227..31937f1b77eaa968a575f388f9476d5a2337773e
@@@ -32,11 -28,10 +32,12 @@@ obj-$(CONFIG_BACKLIGHT_SAHARA)     += kb388
  obj-$(CONFIG_BACKLIGHT_WM831X)        += wm831x_bl.o
  obj-$(CONFIG_BACKLIGHT_ADX)    += adx_bl.o
  obj-$(CONFIG_BACKLIGHT_ADP5520)       += adp5520_bl.o
 -obj-$(CONFIG_BACKLIGHT_RK2818_BL) += rk2818_backlight.o
 -obj-$(CONFIG_BACKLIGHT_RK29_BL) += rk29_backlight.o
 +obj-$(CONFIG_BACKLIGHT_RK29_BL)       += rk29_backlight.o
+ obj-$(CONFIG_BACKLIGHT_RK29_NEWTON_BL) += rk29_newton_backlight.o
 -obj-$(CONFIG_BACKLIGHT_AW9364) += aw9364_bl.o
 -obj-$(CONFIG_FIH_TOUCHKEY_LED) += fih_touchkey_led.o
 -obj-$(CONFIG_BUTTON_LIGHT) += rk29_buttonlight.o
 +obj-$(CONFIG_BACKLIGHT_AW9364)        += aw9364_bl.o
 +obj-$(CONFIG_FIH_TOUCHKEY_LED)        += fih_touchkey_led.o
 +obj-$(CONFIG_BUTTON_LIGHT)    += rk29_buttonlight.o
 +obj-$(CONFIG_BACKLIGHT_ADP8860)       += adp8860_bl.o
 +obj-$(CONFIG_BACKLIGHT_88PM860X) += 88pm860x_bl.o
 +obj-$(CONFIG_BACKLIGHT_PCF50633)      += pcf50633-backlight.o
  
Simple merge
index 422c57fb85772f1bd886975028953d96a094bbaf,c3a17a72f8b600b4e1aea6ebf3aba8e37be35fa1..b7a0055050c50975d8626a4868c72ec2b133408f
  #define FBIOGET_HWCINFO         0x4616
  #define FBIOPUT_MODEINFO        0x4617
  #define FBIOGET_DISPINFO        0x4618
++#define FBIO_WAITFORVSYNC     _IOW('F', 0x20, __u32)
  #define FBIOGET_OVERLAY_STATE   0X4619
  #define FBIOGET_SCREEN_STATE    0X4620
- #define FBIO_WAITFORVSYNC     _IOW('F', 0x20, __u32)
+ #define FBIOGET_16OR32    0X4621
+ #define FBIOGET_IDLEFBUff_16OR32    0X4622
+ #define FBIOSET_COMPOSE_LAYER_COUNTS    0X4623
+ #define FBIOGET_COMPOSE_LAYER_COUNTS    0X4624
  
  #define FB_TYPE_PACKED_PIXELS         0       /* Packed Pixels        */
  #define FB_TYPE_PLANES                        1       /* Non interleaved planes */
Simple merge
index ab8d6551dcfefcfaf6f336e419ae1792f4b0ace4,4125ef55faee8393f631a827fa3eca37eb778aba..0d3a755c52c5a4e3681e3df167d0e7c69f33691a
mode 100644,100755..100755
@@@ -203,8 -199,6 +203,9 @@@ struct mmc_host 
        const struct mmc_bus_ops *bus_ops;      /* current bus driver */
        unsigned int            bus_refs;       /* reference counter */
  
 +      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
 +
        unsigned int            bus_resume_flags;
  #define MMC_BUSRESUME_MANUAL_RESUME   (1 << 0)
  #define MMC_BUSRESUME_NEEDS_RESUME    (1 << 1)
diff --cc mm/page_alloc.c
Simple merge
Simple merge
Simple merge