From: 黄涛 Date: Mon, 26 Sep 2011 06:53:47 +0000 (+0800) Subject: Merge remote-tracking branch 'kernel-2.6.32/develop' into develop-2.6.36 X-Git-Tag: firefly_0821_release~9767 X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=d120da9fa2da5fe16dbab925a1dcf87a280c92d8;p=firefly-linux-kernel-4.4.55.git Merge remote-tracking branch 'kernel-2.6.32/develop' into develop-2.6.36 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 --- d120da9fa2da5fe16dbab925a1dcf87a280c92d8 diff --cc arch/arm/mach-rk29/board-rk29phonepadsdk.c index 38fc8c397e10,d380cf9b3c02..94e26b5f173f mode 100644,100755..100755 --- a/arch/arm/mach-rk29/board-rk29phonepadsdk.c +++ b/arch/arm/mach-rk29/board-rk29phonepadsdk.c diff --cc arch/arm/mach-rk29/board-rk29sdk.c index 84b74c931851,d340f5527bf2..3fcc1392c4ae mode 100755,100644..100644 --- a/arch/arm/mach-rk29/board-rk29sdk.c +++ b/arch/arm/mach-rk29/board-rk29sdk.c diff --cc arch/arm/mm/mmu.c index 3185ee8a73c0,6cfc032ae80c..16314854323a --- a/arch/arm/mm/mmu.c +++ b/arch/arm/mm/mmu.c @@@ -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 /* diff --cc drivers/input/Makefile index 3915ff2c87ae,124cd3de8fdd..370bd0f94f73 --- a/drivers/input/Makefile +++ b/drivers/input/Makefile @@@ -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 diff --cc drivers/input/keyboard/Kconfig index e3fe4589abff,e453b1be9937..0592a9f6ba0a mode 100755,100644..100644 --- a/drivers/input/keyboard/Kconfig +++ b/drivers/input/keyboard/Kconfig @@@ -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 diff --cc drivers/input/keyboard/Makefile index 985553c87e86,c8f3a15d1a0e..bc9f81d107e5 mode 100755,100644..100644 --- a/drivers/input/keyboard/Makefile +++ b/drivers/input/keyboard/Makefile @@@ -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 diff --cc drivers/input/touchscreen/Kconfig index 6a00172a05ef,0c2c040f7094..d920a863f342 mode 100644,100755..100755 --- a/drivers/input/touchscreen/Kconfig +++ b/drivers/input/touchscreen/Kconfig diff --cc drivers/input/touchscreen/Makefile index 0bd60874608a,be8398c5d5d4..f62f2325af50 mode 100644,100755..100755 --- a/drivers/input/touchscreen/Makefile +++ b/drivers/input/touchscreen/Makefile diff --cc drivers/media/video/gc0309.c index 23a3ac0666f8,f830b2870986..6c458ae808a7 mode 100644,100755..100755 --- a/drivers/media/video/gc0309.c +++ b/drivers/media/video/gc0309.c diff --cc drivers/media/video/ov3640.c index bc0b5ee39347,fa99f204508e..366516658510 mode 100755,100644..100644 --- a/drivers/media/video/ov3640.c +++ b/drivers/media/video/ov3640.c diff --cc drivers/misc/Kconfig index a0f1a52c7364,b5fefd612ee0..e8ec569bad82 --- a/drivers/misc/Kconfig +++ b/drivers/misc/Kconfig @@@ -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" diff --cc drivers/mmc/host/Kconfig index c3016fe82e24,85df780a5e0a..cc41ad2f0e73 mode 100644,100755..100755 --- a/drivers/mmc/host/Kconfig +++ b/drivers/mmc/host/Kconfig diff --cc drivers/net/wireless/Makefile index 2e01e61c8b41,f463629aa9c2..2ccf4df000cb --- a/drivers/net/wireless/Makefile +++ b/drivers/net/wireless/Makefile @@@ -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/ diff --cc drivers/regulator/Kconfig index bcc31369b031,68f037653845..b463b679100c --- a/drivers/regulator/Kconfig +++ b/drivers/regulator/Kconfig @@@ -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 diff --cc drivers/regulator/Makefile index 3e61254569c4,cc77cab0d4f1..0b4200a25a53 --- a/drivers/regulator/Makefile +++ b/drivers/regulator/Makefile @@@ -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 diff --cc drivers/usb/serial/option.c index 3047e945023b,c7bc9be950d2..01ef86983a2b --- a/drivers/usb/serial/option.c +++ b/drivers/usb/serial/option.c @@@ -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 @@@ -404,29 -400,22 +405,32 @@@ #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) }, @@@ -981,10 -959,26 +985,14 @@@ { 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); diff --cc drivers/video/backlight/Makefile index c9635acc8e5f,892787099223..31937f1b77ea --- a/drivers/video/backlight/Makefile +++ b/drivers/video/backlight/Makefile @@@ -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 diff --cc include/linux/fb.h index 422c57fb8577,c3a17a72f8b6..b7a0055050c5 --- a/include/linux/fb.h +++ b/include/linux/fb.h @@@ -46,10 -45,12 +46,13 @@@ #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 */ diff --cc include/linux/mmc/host.h index ab8d6551dcfe,4125ef55faee..0d3a755c52c5 mode 100644,100755..100755 --- a/include/linux/mmc/host.h +++ b/include/linux/mmc/host.h @@@ -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)