From: 黄涛 Date: Wed, 9 Nov 2011 05:06:28 +0000 (+0800) Subject: Merge remote-tracking branch 'remotes/aosp/android-3.0' into develop-3.0 X-Git-Tag: firefly_0821_release~9744 X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=8aac13f440e3f03893e8912880c47be62c2843dd;p=firefly-linux-kernel-4.4.55.git Merge remote-tracking branch 'remotes/aosp/android-3.0' into develop-3.0 Conflicts: drivers/mmc/card/block.c drivers/net/usb/asix.c drivers/net/wireless/airo.c drivers/net/wireless/ath/ath5k/base.c drivers/net/wireless/ath/ath9k/ar9002_calib.c drivers/net/wireless/ath/ath9k/ar9002_hw.c drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h drivers/net/wireless/ath/ath9k/ar9003_eeprom.c drivers/net/wireless/ath/ath9k/ar9003_hw.c drivers/net/wireless/ath/ath9k/ar9003_phy.h drivers/net/wireless/ath/ath9k/hw.c drivers/net/wireless/ath/ath9k/hw.h drivers/net/wireless/ath/ath9k/init.c drivers/net/wireless/ath/ath9k/main.c drivers/net/wireless/ath/ath9k/pci.c drivers/net/wireless/b43/main.c drivers/net/wireless/hostap/hostap_main.c drivers/net/wireless/iwlwifi/iwl-5000.c drivers/net/wireless/iwlwifi/iwl-agn.c drivers/net/wireless/iwlwifi/iwl-core.h drivers/net/wireless/iwlwifi/iwl-power.c drivers/net/wireless/iwlwifi/iwl-scan.c drivers/net/wireless/iwlwifi/iwl-tx.c drivers/net/wireless/rt2x00/rt2800lib.c drivers/net/wireless/rt2x00/rt2800usb.c drivers/net/wireless/rt2x00/rt2x00mac.c drivers/net/wireless/rt2x00/rt2x00queue.c drivers/net/wireless/rt2x00/rt2x00queue.h drivers/net/wireless/rt2x00/rt2x00usb.c drivers/usb/serial/option.c --- 8aac13f440e3f03893e8912880c47be62c2843dd diff --cc arch/arm/vfp/vfphw.S index f879b7ac2a4e,404538ae591d..6e26f5db0cb3 --- a/arch/arm/vfp/vfphw.S +++ b/arch/arm/vfp/vfphw.S @@@ -206,28 -204,9 +204,28 @@@ ENTRY(vfp_save_state mov pc, lr ENDPROC(vfp_save_state) +#ifdef CONFIG_ARCH_RK29 +ENTRY(vfp_load_state) + @ Save the current VFP state + @ r0 - save location + @ r1 - FPEXC + DBGSTR1 "save VFP state %p", r0 + VFPFLDMIA r0, r2 @ save the working registers + ldmia r0, {r1,r2,r3,r12} + tst r1, #FPEXC_EX @ is there additional state to save? + beq 1f + tst r1, #FPEXC_FP2V @ is there an FPINST2 to read? + beq 1f +1: + VFPFMXR FPSCR, r2 + VFPFMXR FPEXC, r1 + mov pc, lr +ENDPROC(vfp_load_state) +#endif + .align - last_VFP_context_address: - .word last_VFP_context + vfp_current_hw_state_address: + .word vfp_current_hw_state .macro tbl_branch, base, tmp, shift #ifdef CONFIG_THUMB2_KERNEL diff --cc drivers/mmc/core/core.c index b453ecc9710b,a39acb955679..4850f34577ff mode 100755,100644..100755 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c diff --cc drivers/usb/serial/option.c index 3f50b0fef1c3,fe22e90bc879..a9a8b6c7eac1 --- a/drivers/usb/serial/option.c +++ b/drivers/usb/serial/option.c @@@ -418,13 -418,56 +424,63 @@@ 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*/ + #define YUGA_VENDOR_ID 0x257A + #define YUGA_PRODUCT_CEM600 0x1601 + #define YUGA_PRODUCT_CEM610 0x1602 + #define YUGA_PRODUCT_CEM500 0x1603 + #define YUGA_PRODUCT_CEM510 0x1604 + #define YUGA_PRODUCT_CEM800 0x1605 + #define YUGA_PRODUCT_CEM900 0x1606 + + #define YUGA_PRODUCT_CEU818 0x1607 + #define YUGA_PRODUCT_CEU816 0x1608 + #define YUGA_PRODUCT_CEU828 0x1609 + #define YUGA_PRODUCT_CEU826 0x160A + #define YUGA_PRODUCT_CEU518 0x160B + #define YUGA_PRODUCT_CEU516 0x160C + #define YUGA_PRODUCT_CEU528 0x160D + #define YUGA_PRODUCT_CEU526 0x160F + + #define YUGA_PRODUCT_CWM600 0x2601 + #define YUGA_PRODUCT_CWM610 0x2602 + #define YUGA_PRODUCT_CWM500 0x2603 + #define YUGA_PRODUCT_CWM510 0x2604 + #define YUGA_PRODUCT_CWM800 0x2605 + #define YUGA_PRODUCT_CWM900 0x2606 + + #define YUGA_PRODUCT_CWU718 0x2607 + #define YUGA_PRODUCT_CWU716 0x2608 + #define YUGA_PRODUCT_CWU728 0x2609 + #define YUGA_PRODUCT_CWU726 0x260A + #define YUGA_PRODUCT_CWU518 0x260B + #define YUGA_PRODUCT_CWU516 0x260C + #define YUGA_PRODUCT_CWU528 0x260D + #define YUGA_PRODUCT_CWU526 0x260F + + #define YUGA_PRODUCT_CLM600 0x2601 + #define YUGA_PRODUCT_CLM610 0x2602 + #define YUGA_PRODUCT_CLM500 0x2603 + #define YUGA_PRODUCT_CLM510 0x2604 + #define YUGA_PRODUCT_CLM800 0x2605 + #define YUGA_PRODUCT_CLM900 0x2606 + + #define YUGA_PRODUCT_CLU718 0x2607 + #define YUGA_PRODUCT_CLU716 0x2608 + #define YUGA_PRODUCT_CLU728 0x2609 + #define YUGA_PRODUCT_CLU726 0x260A + #define YUGA_PRODUCT_CLU518 0x260B + #define YUGA_PRODUCT_CLU516 0x260C + #define YUGA_PRODUCT_CLU528 0x260D + #define YUGA_PRODUCT_CLU526 0x260F + /* some devices interfaces need special handling due to a number of reasons */ enum option_blacklist_reason { OPTION_BLACKLIST_NONE = 0, diff --cc fs/block_dev.c index 977a97b7f0b1,194cf66bc8f5..fd91640369db mode 100755,100644..100755 --- a/fs/block_dev.c +++ b/fs/block_dev.c diff --cc include/linux/mfd/wm8994/pdata.h index 3f8ab55bd6fc,97cf4f27d647..b47b3cb86c06 --- a/include/linux/mfd/wm8994/pdata.h +++ b/include/linux/mfd/wm8994/pdata.h @@@ -26,10 -26,9 +26,10 @@@ struct wm8994_ldo_pdata struct regulator_init_data *init_data; }; - #define WM8994_CONFIGURE_GPIO 0x8000 + #define WM8994_CONFIGURE_GPIO 0x10000 #define WM8994_DRC_REGS 5 +<<<<<<< HEAD #define WM8994_EQ_REGS 20 #define WM8958_MBC_CUTOFF_REGS 20 #define WM8958_MBC_COEFF_REGS 48 diff --cc include/linux/mmc/host.h index 5a3ea9025873,2cfa8d02e719..397c8338f2ab mode 100755,100644..100755 --- a/include/linux/mmc/host.h +++ b/include/linux/mmc/host.h