黄涛 [Mon, 7 Nov 2011 11:06:20 +0000 (19:06 +0800)]
rm rk2818 dma change
黄涛 [Mon, 7 Nov 2011 10:33:22 +0000 (18:33 +0800)]
rk29: rm old vpu driver
黄涛 [Mon, 7 Nov 2011 10:29:25 +0000 (18:29 +0800)]
rk29: memory.h: use ARM_DMA_ZONE_SIZE to adjust the zone sizes
黄涛 [Mon, 7 Nov 2011 10:27:04 +0000 (18:27 +0800)]
rk29: clock: fix warning: 'actual' may be used uninitialized in this function
黄涛 [Mon, 7 Nov 2011 07:27:19 +0000 (15:27 +0800)]
regulator: rk29-pwm-regulator: fix warning: initialization from incompatible pointer type
黄涛 [Mon, 7 Nov 2011 07:06:59 +0000 (15:06 +0800)]
power: bq27510_battery: fix warning: initialization from incompatible pointer type
黄涛 [Mon, 7 Nov 2011 07:02:58 +0000 (15:02 +0800)]
net: wireless: wifi_sys: fix warning: initialization from incompatible pointer type
黄涛 [Mon, 7 Nov 2011 07:00:14 +0000 (15:00 +0800)]
rk29_modem: fix warning: initialization from incompatible pointer type
黄涛 [Mon, 7 Nov 2011 06:49:37 +0000 (14:49 +0800)]
input: gsensor: mma8452: fix warning: initialization from incompatible pointer type
黄涛 [Mon, 7 Nov 2011 06:36:09 +0000 (14:36 +0800)]
bluetooth: vflash: fix warning: initialization from incompatible pointer type
黄涛 [Mon, 7 Nov 2011 03:45:09 +0000 (11:45 +0800)]
usb: serial: option: fix warning: "CINTERION_VENDOR_ID" redefined
黄涛 [Mon, 7 Nov 2011 03:43:50 +0000 (11:43 +0800)]
input: touchscreen: eeti_egalax_i2c: fix warning: initialization from incompatible pointer type
黄涛 [Fri, 4 Nov 2011 09:51:23 +0000 (17:51 +0800)]
Revert "temp rename asix for merge 3.0"
This reverts commit
3c3de0df8bb4f8a278bd78ac6852805949dbb8e4.
黄涛 [Fri, 4 Nov 2011 09:43:18 +0000 (17:43 +0800)]
Revert "temp revert rk change"
This reverts commit
15f7fabcb88e67792e49279de0b28d70fcfca0cd.
Conflicts:
.gitignore
arch/arm/boot/compressed/head.S
arch/arm/common/gic.c
arch/arm/kernel/Makefile
arch/arm/mm/proc-v7.S
arch/arm/tools/mach-types
arch/arm/vfp/vfphw.S
drivers/Kconfig
drivers/Makefile
drivers/char/Makefile
drivers/cpufreq/cpufreq_ondemand.c
drivers/gpio/gpiolib.c
drivers/gpio/tps65910-gpio.c
drivers/input/Makefile
drivers/input/keyboard/Kconfig
drivers/input/keyboard/Makefile
drivers/input/touchscreen/Kconfig
drivers/media/video/Makefile
drivers/media/video/ov2640.c
drivers/media/video/soc_camera.c
drivers/media/video/uvc/uvc_v4l2.c
drivers/media/video/v4l2-ioctl.c
drivers/mfd/Kconfig
drivers/mfd/Makefile
drivers/mfd/wm831x-core.c
drivers/mfd/wm831x-i2c.c
drivers/mfd/wm831x-irq.c
drivers/mfd/wm831x-spi.c
drivers/mfd/wm8994-core.c
drivers/misc/Kconfig
drivers/misc/Makefile
drivers/misc/pmem.c
drivers/mmc/card/block.c
drivers/mmc/core/core.c
drivers/mmc/core/mmc.c
drivers/mmc/core/sd.c
drivers/mmc/core/sdio.c
drivers/mmc/host/Makefile
drivers/net/wireless/Kconfig
drivers/net/wireless/Makefile
drivers/net/wireless/bcm4329/bcmsdh_linux.c
drivers/net/wireless/bcm4329/dhd.h
drivers/net/wireless/bcm4329/dhd_linux.c
drivers/net/wireless/bcm4329/wl_iw.c
drivers/net/wireless/bcm4329/wl_iw.h
drivers/power/wm831x_power.c
drivers/regulator/Makefile
drivers/regulator/core.c
drivers/regulator/tps65910-regulator.c
drivers/regulator/wm831x-dcdc.c
drivers/regulator/wm831x-isink.c
drivers/regulator/wm831x-ldo.c
drivers/rtc/Kconfig
drivers/rtc/Makefile
drivers/serial/Kconfig
drivers/serial/Makefile
drivers/staging/Kconfig
drivers/staging/Makefile
drivers/usb/Makefile
drivers/usb/gadget/Kconfig
drivers/usb/gadget/android.c
drivers/usb/gadget/f_mass_storage.c
drivers/usb/serial/option.c
drivers/video/backlight/wm831x_bl.c
fs/fat/dir.c
fs/fat/fatent.c
fs/fat/inode.c
fs/yaffs2/yaffs_fs.c
fs/yaffs2/yaffs_mtdif2.c
include/linux/i2c.h
include/linux/mfd/wm831x/core.h
include/linux/mfd/wm831x/pdata.h
include/linux/mfd/wm8994/core.h
include/linux/mfd/wm8994/pdata.h
include/linux/regulator/consumer.h
include/media/v4l2-chip-ident.h
kernel/power/earlysuspend.c
kernel/power/wakelock.c
kernel/sys.c
mm/page_alloc.c
sound/soc/codecs/Kconfig
sound/soc/codecs/Makefile
sound/soc/codecs/wm8900.c
sound/soc/codecs/wm8988.c
sound/soc/codecs/wm8994.c
sound/soc/codecs/wm8994.h
sound/soc/codecs/wm_hubs.c
sound/soc/soc-cache.c
黄涛 [Fri, 28 Oct 2011 08:07:07 +0000 (16:07 +0800)]
Merge remote-tracking branch 'remotes/aosp/android-3.0' into develop-3.0
Conflicts:
drivers/net/wireless/adm8211.c
drivers/net/wireless/airo.c
drivers/net/wireless/airo_cs.c
drivers/net/wireless/at76c50x-usb.c
drivers/net/wireless/at76c50x-usb.h
drivers/net/wireless/ath/Kconfig
drivers/net/wireless/ath/Makefile
drivers/net/wireless/ath/ath.h
drivers/net/wireless/ath/ath5k/Kconfig
drivers/net/wireless/ath/ath5k/Makefile
drivers/net/wireless/ath/ath5k/ani.c
drivers/net/wireless/ath/ath5k/ani.h
drivers/net/wireless/ath/ath5k/ath5k.h
drivers/net/wireless/ath/ath5k/attach.c
drivers/net/wireless/ath/ath5k/base.c
drivers/net/wireless/ath/ath5k/base.h
drivers/net/wireless/ath/ath5k/caps.c
drivers/net/wireless/ath/ath5k/debug.c
drivers/net/wireless/ath/ath5k/debug.h
drivers/net/wireless/ath/ath5k/desc.c
drivers/net/wireless/ath/ath5k/desc.h
drivers/net/wireless/ath/ath5k/dma.c
drivers/net/wireless/ath/ath5k/eeprom.c
drivers/net/wireless/ath/ath5k/eeprom.h
drivers/net/wireless/ath/ath5k/initvals.c
drivers/net/wireless/ath/ath5k/led.c
drivers/net/wireless/ath/ath5k/pcu.c
drivers/net/wireless/ath/ath5k/phy.c
drivers/net/wireless/ath/ath5k/qcu.c
drivers/net/wireless/ath/ath5k/reg.h
drivers/net/wireless/ath/ath5k/reset.c
drivers/net/wireless/ath/ath5k/rfbuffer.h
drivers/net/wireless/ath/ath5k/sysfs.c
drivers/net/wireless/ath/ath9k/Kconfig
drivers/net/wireless/ath/ath9k/Makefile
drivers/net/wireless/ath/ath9k/ahb.c
drivers/net/wireless/ath/ath9k/ani.c
drivers/net/wireless/ath/ath9k/ani.h
drivers/net/wireless/ath/ath9k/ar5008_initvals.h
drivers/net/wireless/ath/ath9k/ar5008_phy.c
drivers/net/wireless/ath/ath9k/ar9001_initvals.h
drivers/net/wireless/ath/ath9k/ar9002_calib.c
drivers/net/wireless/ath/ath9k/ar9002_hw.c
drivers/net/wireless/ath/ath9k/ar9002_initvals.h
drivers/net/wireless/ath/ath9k/ar9002_mac.c
drivers/net/wireless/ath/ath9k/ar9002_phy.c
drivers/net/wireless/ath/ath9k/ar9002_phy.h
drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h
drivers/net/wireless/ath/ath9k/ar9003_calib.c
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
drivers/net/wireless/ath/ath9k/ar9003_eeprom.h
drivers/net/wireless/ath/ath9k/ar9003_hw.c
drivers/net/wireless/ath/ath9k/ar9003_mac.c
drivers/net/wireless/ath/ath9k/ar9003_mac.h
drivers/net/wireless/ath/ath9k/ar9003_paprd.c
drivers/net/wireless/ath/ath9k/ar9003_phy.c
drivers/net/wireless/ath/ath9k/ar9003_phy.h
drivers/net/wireless/ath/ath9k/ath9k.h
drivers/net/wireless/ath/ath9k/beacon.c
drivers/net/wireless/ath/ath9k/btcoex.c
drivers/net/wireless/ath/ath9k/btcoex.h
drivers/net/wireless/ath/ath9k/calib.c
drivers/net/wireless/ath/ath9k/calib.h
drivers/net/wireless/ath/ath9k/common.c
drivers/net/wireless/ath/ath9k/common.h
drivers/net/wireless/ath/ath9k/debug.c
drivers/net/wireless/ath/ath9k/debug.h
drivers/net/wireless/ath/ath9k/eeprom.c
drivers/net/wireless/ath/ath9k/eeprom.h
drivers/net/wireless/ath/ath9k/eeprom_4k.c
drivers/net/wireless/ath/ath9k/eeprom_9287.c
drivers/net/wireless/ath/ath9k/eeprom_def.c
drivers/net/wireless/ath/ath9k/gpio.c
drivers/net/wireless/ath/ath9k/hif_usb.c
drivers/net/wireless/ath/ath9k/hif_usb.h
drivers/net/wireless/ath/ath9k/htc.h
drivers/net/wireless/ath/ath9k/htc_drv_beacon.c
drivers/net/wireless/ath/ath9k/htc_drv_init.c
drivers/net/wireless/ath/ath9k/htc_drv_main.c
drivers/net/wireless/ath/ath9k/htc_drv_txrx.c
drivers/net/wireless/ath/ath9k/htc_hst.c
drivers/net/wireless/ath/ath9k/htc_hst.h
drivers/net/wireless/ath/ath9k/hw-ops.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/mac.c
drivers/net/wireless/ath/ath9k/mac.h
drivers/net/wireless/ath/ath9k/main.c
drivers/net/wireless/ath/ath9k/pci.c
drivers/net/wireless/ath/ath9k/phy.h
drivers/net/wireless/ath/ath9k/rc.c
drivers/net/wireless/ath/ath9k/rc.h
drivers/net/wireless/ath/ath9k/recv.c
drivers/net/wireless/ath/ath9k/reg.h
drivers/net/wireless/ath/ath9k/wmi.c
drivers/net/wireless/ath/ath9k/wmi.h
drivers/net/wireless/ath/ath9k/xmit.c
drivers/net/wireless/ath/debug.c
drivers/net/wireless/ath/hw.c
drivers/net/wireless/ath/main.c
drivers/net/wireless/ath/reg.h
drivers/net/wireless/ath/regd.c
drivers/net/wireless/ath/regd.h
drivers/net/wireless/ath/regd_common.h
drivers/net/wireless/atmel.c
drivers/net/wireless/atmel_cs.c
drivers/net/wireless/b43/Kconfig
drivers/net/wireless/b43/Makefile
drivers/net/wireless/b43/b43.h
drivers/net/wireless/b43/debugfs.c
drivers/net/wireless/b43/dma.c
drivers/net/wireless/b43/dma.h
drivers/net/wireless/b43/leds.c
drivers/net/wireless/b43/lo.c
drivers/net/wireless/b43/main.c
drivers/net/wireless/b43/main.h
drivers/net/wireless/b43/pcmcia.c
drivers/net/wireless/b43/phy_a.c
drivers/net/wireless/b43/phy_common.c
drivers/net/wireless/b43/phy_common.h
drivers/net/wireless/b43/phy_g.c
drivers/net/wireless/b43/phy_g.h
drivers/net/wireless/b43/phy_lp.c
drivers/net/wireless/b43/phy_n.c
drivers/net/wireless/b43/phy_n.h
drivers/net/wireless/b43/pio.c
drivers/net/wireless/b43/rfkill.c
drivers/net/wireless/b43/sdio.c
drivers/net/wireless/b43/sysfs.c
drivers/net/wireless/b43/tables_lpphy.c
drivers/net/wireless/b43/tables_nphy.c
drivers/net/wireless/b43/tables_nphy.h
drivers/net/wireless/b43/wa.c
drivers/net/wireless/b43/xmit.c
drivers/net/wireless/b43/xmit.h
drivers/net/wireless/b43legacy/b43legacy.h
drivers/net/wireless/b43legacy/debugfs.c
drivers/net/wireless/b43legacy/main.c
drivers/net/wireless/b43legacy/phy.c
drivers/net/wireless/b43legacy/rfkill.c
drivers/net/wireless/b43legacy/xmit.c
drivers/net/wireless/hostap/hostap_ap.c
drivers/net/wireless/hostap/hostap_ap.h
drivers/net/wireless/hostap/hostap_config.h
drivers/net/wireless/hostap/hostap_cs.c
drivers/net/wireless/hostap/hostap_hw.c
drivers/net/wireless/hostap/hostap_ioctl.c
drivers/net/wireless/hostap/hostap_main.c
drivers/net/wireless/hostap/hostap_wlan.h
drivers/net/wireless/ipw2x00/ipw2100.c
drivers/net/wireless/ipw2x00/ipw2100.h
drivers/net/wireless/ipw2x00/ipw2200.c
drivers/net/wireless/ipw2x00/ipw2200.h
drivers/net/wireless/ipw2x00/libipw_module.c
drivers/net/wireless/ipw2x00/libipw_rx.c
drivers/net/wireless/iwlwifi/Kconfig
drivers/net/wireless/iwlwifi/Makefile
drivers/net/wireless/iwlwifi/iwl-1000.c
drivers/net/wireless/iwlwifi/iwl-5000-hw.h
drivers/net/wireless/iwlwifi/iwl-5000.c
drivers/net/wireless/iwlwifi/iwl-6000-hw.h
drivers/net/wireless/iwlwifi/iwl-6000.c
drivers/net/wireless/iwlwifi/iwl-agn-calib.c
drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c
drivers/net/wireless/iwlwifi/iwl-agn-hw.h
drivers/net/wireless/iwlwifi/iwl-agn-ict.c
drivers/net/wireless/iwlwifi/iwl-agn-lib.c
drivers/net/wireless/iwlwifi/iwl-agn-rs.c
drivers/net/wireless/iwlwifi/iwl-agn-rs.h
drivers/net/wireless/iwlwifi/iwl-agn-tx.c
drivers/net/wireless/iwlwifi/iwl-agn-ucode.c
drivers/net/wireless/iwlwifi/iwl-agn.c
drivers/net/wireless/iwlwifi/iwl-agn.h
drivers/net/wireless/iwlwifi/iwl-commands.h
drivers/net/wireless/iwlwifi/iwl-core.c
drivers/net/wireless/iwlwifi/iwl-core.h
drivers/net/wireless/iwlwifi/iwl-csr.h
drivers/net/wireless/iwlwifi/iwl-debug.h
drivers/net/wireless/iwlwifi/iwl-debugfs.c
drivers/net/wireless/iwlwifi/iwl-dev.h
drivers/net/wireless/iwlwifi/iwl-devtrace.c
drivers/net/wireless/iwlwifi/iwl-devtrace.h
drivers/net/wireless/iwlwifi/iwl-eeprom.c
drivers/net/wireless/iwlwifi/iwl-eeprom.h
drivers/net/wireless/iwlwifi/iwl-fh.h
drivers/net/wireless/iwlwifi/iwl-hcmd.c
drivers/net/wireless/iwlwifi/iwl-helpers.h
drivers/net/wireless/iwlwifi/iwl-io.h
drivers/net/wireless/iwlwifi/iwl-led.c
drivers/net/wireless/iwlwifi/iwl-led.h
drivers/net/wireless/iwlwifi/iwl-power.c
drivers/net/wireless/iwlwifi/iwl-power.h
drivers/net/wireless/iwlwifi/iwl-prph.h
drivers/net/wireless/iwlwifi/iwl-rx.c
drivers/net/wireless/iwlwifi/iwl-scan.c
drivers/net/wireless/iwlwifi/iwl-sta.c
drivers/net/wireless/iwlwifi/iwl-sta.h
drivers/net/wireless/iwlwifi/iwl-tx.c
drivers/net/wireless/iwmc3200wifi/cfg80211.c
drivers/net/wireless/iwmc3200wifi/commands.c
drivers/net/wireless/iwmc3200wifi/debugfs.c
drivers/net/wireless/iwmc3200wifi/hal.c
drivers/net/wireless/iwmc3200wifi/netdev.c
drivers/net/wireless/iwmc3200wifi/rx.c
drivers/net/wireless/iwmc3200wifi/sdio.c
drivers/net/wireless/iwmc3200wifi/tx.c
drivers/net/wireless/libertas/README
drivers/net/wireless/libertas/cfg.c
drivers/net/wireless/libertas/cmd.c
drivers/net/wireless/libertas/cmdresp.c
drivers/net/wireless/libertas/debugfs.c
drivers/net/wireless/libertas/decl.h
drivers/net/wireless/libertas/defs.h
drivers/net/wireless/libertas/dev.h
drivers/net/wireless/libertas/ethtool.c
drivers/net/wireless/libertas/host.h
drivers/net/wireless/libertas/if_cs.c
drivers/net/wireless/libertas/if_sdio.c
drivers/net/wireless/libertas/if_sdio.h
drivers/net/wireless/libertas/if_spi.c
drivers/net/wireless/libertas/if_spi.h
drivers/net/wireless/libertas/if_usb.c
drivers/net/wireless/libertas/if_usb.h
drivers/net/wireless/libertas/main.c
drivers/net/wireless/libertas/mesh.c
drivers/net/wireless/libertas/mesh.h
drivers/net/wireless/libertas/rx.c
drivers/net/wireless/libertas/tx.c
drivers/net/wireless/libertas/types.h
drivers/net/wireless/libertas_tf/if_usb.c
drivers/net/wireless/libertas_tf/main.c
drivers/net/wireless/mac80211_hwsim.c
drivers/net/wireless/mwl8k.c
drivers/net/wireless/orinoco/cfg.c
drivers/net/wireless/orinoco/hw.c
drivers/net/wireless/orinoco/main.c
drivers/net/wireless/orinoco/orinoco_cs.c
drivers/net/wireless/orinoco/orinoco_usb.c
drivers/net/wireless/orinoco/scan.c
drivers/net/wireless/orinoco/scan.h
drivers/net/wireless/orinoco/spectrum_cs.c
drivers/net/wireless/orinoco/wext.c
drivers/net/wireless/p54/Kconfig
drivers/net/wireless/p54/eeprom.c
drivers/net/wireless/p54/eeprom.h
drivers/net/wireless/p54/fwio.c
drivers/net/wireless/p54/lmac.h
drivers/net/wireless/p54/main.c
drivers/net/wireless/p54/p54.h
drivers/net/wireless/p54/p54pci.c
drivers/net/wireless/p54/p54spi.c
drivers/net/wireless/p54/p54spi_eeprom.h
drivers/net/wireless/p54/p54usb.c
drivers/net/wireless/p54/txrx.c
drivers/net/wireless/prism54/isl_ioctl.c
drivers/net/wireless/prism54/islpci_dev.c
drivers/net/wireless/prism54/islpci_eth.c
drivers/net/wireless/prism54/islpci_hotplug.c
drivers/net/wireless/ray_cs.c
drivers/net/wireless/ray_cs.h
drivers/net/wireless/rayctl.h
drivers/net/wireless/rndis_wlan.c
drivers/net/wireless/rt2x00/Kconfig
drivers/net/wireless/rt2x00/Makefile
drivers/net/wireless/rt2x00/rt2400pci.c
drivers/net/wireless/rt2x00/rt2400pci.h
drivers/net/wireless/rt2x00/rt2500pci.c
drivers/net/wireless/rt2x00/rt2500pci.h
drivers/net/wireless/rt2x00/rt2500usb.c
drivers/net/wireless/rt2x00/rt2800.h
drivers/net/wireless/rt2x00/rt2800lib.c
drivers/net/wireless/rt2x00/rt2800lib.h
drivers/net/wireless/rt2x00/rt2800pci.c
drivers/net/wireless/rt2x00/rt2800pci.h
drivers/net/wireless/rt2x00/rt2800usb.c
drivers/net/wireless/rt2x00/rt2800usb.h
drivers/net/wireless/rt2x00/rt2x00.h
drivers/net/wireless/rt2x00/rt2x00config.c
drivers/net/wireless/rt2x00/rt2x00crypto.c
drivers/net/wireless/rt2x00/rt2x00debug.c
drivers/net/wireless/rt2x00/rt2x00dev.c
drivers/net/wireless/rt2x00/rt2x00dump.h
drivers/net/wireless/rt2x00/rt2x00firmware.c
drivers/net/wireless/rt2x00/rt2x00lib.h
drivers/net/wireless/rt2x00/rt2x00link.c
drivers/net/wireless/rt2x00/rt2x00mac.c
drivers/net/wireless/rt2x00/rt2x00pci.c
drivers/net/wireless/rt2x00/rt2x00pci.h
drivers/net/wireless/rt2x00/rt2x00queue.c
drivers/net/wireless/rt2x00/rt2x00queue.h
drivers/net/wireless/rt2x00/rt2x00reg.h
drivers/net/wireless/rt2x00/rt2x00soc.c
drivers/net/wireless/rt2x00/rt2x00usb.c
drivers/net/wireless/rt2x00/rt2x00usb.h
drivers/net/wireless/rt2x00/rt61pci.c
drivers/net/wireless/rt2x00/rt61pci.h
drivers/net/wireless/rt2x00/rt73usb.c
drivers/net/wireless/rt2x00/rt73usb.h
drivers/net/wireless/rtl818x/Makefile
drivers/net/wireless/rtl818x/rtl8180/grf5101.h
drivers/net/wireless/rtl818x/rtl8180/max2820.h
drivers/net/wireless/rtl818x/rtl8180/rtl8180.h
drivers/net/wireless/rtl818x/rtl8180/rtl8225.h
drivers/net/wireless/rtl818x/rtl8180/sa2400.h
drivers/net/wireless/rtl818x/rtl8187/leds.h
drivers/net/wireless/rtl818x/rtl8187/rfkill.h
drivers/net/wireless/rtl818x/rtl8187/rtl8225.h
drivers/net/wireless/wl1251/io.h
drivers/net/wireless/wl12xx/Kconfig
drivers/net/wireless/wl12xx/Makefile
drivers/net/wireless/wl12xx/wl12xx_80211.h
drivers/net/wireless/wl3501_cs.c
drivers/net/wireless/zd1201.c
drivers/net/wireless/zd1211rw/Makefile
drivers/net/wireless/zd1211rw/zd_chip.c
drivers/net/wireless/zd1211rw/zd_chip.h
drivers/net/wireless/zd1211rw/zd_def.h
drivers/net/wireless/zd1211rw/zd_mac.c
drivers/net/wireless/zd1211rw/zd_mac.h
drivers/net/wireless/zd1211rw/zd_rf.h
drivers/net/wireless/zd1211rw/zd_rf_al2230.c
drivers/net/wireless/zd1211rw/zd_rf_al7230b.c
drivers/net/wireless/zd1211rw/zd_rf_rf2959.c
drivers/net/wireless/zd1211rw/zd_rf_uw2453.c
drivers/net/wireless/zd1211rw/zd_usb.c
drivers/net/wireless/zd1211rw/zd_usb.h
黄涛 [Fri, 28 Oct 2011 08:02:47 +0000 (16:02 +0800)]
revert android-tegra-2.6.36-honeycomb-mr1-
9001adc to v2.6.36
黄涛 [Fri, 28 Oct 2011 07:41:18 +0000 (15:41 +0800)]
temp revert rk change
黄涛 [Fri, 28 Oct 2011 07:02:44 +0000 (15:02 +0800)]
temp rename asix for merge 3.0
黄涛 [Fri, 28 Oct 2011 03:04:13 +0000 (11:04 +0800)]
rm some moto drivers for merge 3.0
黄涛 [Fri, 28 Oct 2011 02:38:45 +0000 (10:38 +0800)]
rm some drivers on drivers/net/wireless for merge 3.0
黄涛 [Thu, 27 Oct 2011 10:40:06 +0000 (18:40 +0800)]
Merge remote-tracking branch 'kernel-2.6.32/develop' into develop-2.6.36
Conflicts:
drivers/media/video/rk29_camera_oneframe.c
drivers/mmc/core/core.c
drivers/usb/gadget/f_mass_storage.c
include/linux/mmc/host.h
jmj [Tue, 25 Oct 2011 07:01:10 +0000 (00:01 -0700)]
Close some printk sentences.
jmj [Tue, 25 Oct 2011 06:54:31 +0000 (23:54 -0700)]
Add some ioctl operation for wimo in rk29_fb.c. some ipp operation are contained in those ioctl operation(most in fb0_ioctl). you can close them by FB_WIMO_FLAG which is in rk29_fb.h.
张晴 [Tue, 25 Oct 2011 02:54:00 +0000 (19:54 -0700)]
add i2c_sram.c in sram for i2c communication when system is sleep
kfx [Mon, 24 Oct 2011 08:58:26 +0000 (16:58 +0800)]
mod old sdmmc drivers
胡卫国 [Sat, 22 Oct 2011 07:35:39 +0000 (15:35 +0800)]
i2s0针对音频随机性出噪声修改：
1) i2s0的rx, tx两者都为master，通过修改i2s0的clk来保证lrck_tx与lrck_rx同步
2) 硬件上针对只有一路LRCK的codec，例如alc5631/5621，可以单独将I2S0_LRCK连接到codec的LRCK, 也可以将I2S0_LRCK与I2S0_LRCK_RX一起连接到codec的LRCK
邱建斌 [Sat, 22 Oct 2011 06:31:01 +0000 (14:31 +0800)]
I2S: add i2s use DMA event mode choose,default use static mode
邱建斌 [Sat, 22 Oct 2011 03:24:31 +0000 (11:24 +0800)]
wm8994: add the spk earpiece Differential signal BB config
邱建斌 [Sat, 22 Oct 2011 03:20:15 +0000 (11:20 +0800)]
rk_headset: Add if headset have not hook key judge
xbw [Sat, 22 Oct 2011 03:19:06 +0000 (11:19 +0800)]
Optimize the powe up and down of wifi and SDcard module
黄涛 [Sat, 22 Oct 2011 02:33:38 +0000 (10:33 +0800)]
rk29: add timer_cpu.c for debug
黄涛 [Sat, 22 Oct 2011 02:00:54 +0000 (10:00 +0800)]
rk29: timer: peripheral timer use pclk_periph
We never change pclk_periph when use timer, so it is safe use pclk_periph
as parent clock.
We see some bug when use xin24m. For example rk29_timer_set_next_event will
loop 1s+ on ramos w15 machines.
yzq [Thu, 20 Oct 2011 10:33:49 +0000 (18:33 +0800)]
fix err about 'rk29fb:fix problem :UI jitter when carema DV DC switch'
yzq [Thu, 20 Oct 2011 09:40:44 +0000 (17:40 +0800)]
rk29fb:fix problem :UI jitter when carema DV DC switch
cwz [Thu, 20 Oct 2011 07:05:34 +0000 (00:05 -0700)]
tps65910 regulator aux2 error.
黄涛 [Thu, 20 Oct 2011 03:29:39 +0000 (11:29 +0800)]
rk29: ddr3sdk: do not define empty rk29_setgpio_suspend_board/rk29_setgpio_resume_board, which is weak function
黄涛 [Thu, 20 Oct 2011 03:29:23 +0000 (11:29 +0800)]
rk29: phonesdk: do not define empty rk29_setgpio_suspend_board/rk29_setgpio_resume_board, which is weak function
黄涛 [Thu, 20 Oct 2011 03:28:33 +0000 (11:28 +0800)]
rk29: a22: do not define empty rk29_setgpio_suspend_board/rk29_setgpio_resume_board, which is weak function
黄涛 [Thu, 20 Oct 2011 03:19:12 +0000 (11:19 +0800)]
rk29: gpio: give default weak empty implementation for board suspend/resume
黄涛 [Thu, 20 Oct 2011 03:15:25 +0000 (11:15 +0800)]
rk29: add clk_vpu for notify vpu power on
黄涛 [Thu, 20 Oct 2011 03:11:10 +0000 (11:11 +0800)]
rk29: pm: disable vt switch while suspend, one bug show suspend may hung on vt_event_wait
cwz [Wed, 19 Oct 2011 12:05:53 +0000 (05:05 -0700)]
tps65910 vdd2 regulator default voltage 1.5V.
黄涛 [Tue, 18 Oct 2011 09:15:46 +0000 (17:15 +0800)]
Revert "regulator: rk29-pwm: fix sleep in atomic"
This reverts commit
045e8a7d9e66e7390e8a4be143f3f447cbf5cb7b.
The patch isn't the right way to fix this problem.
黄涛 [Tue, 18 Oct 2011 03:29:36 +0000 (11:29 +0800)]
regulator: rk29-pwm: fix sleep in atomic
fix this bug, only happens when cpu run in 1.2G.
BUG: scheduling while atomic: VideoTrackEncod/414/0x00000202
[<
c0431198>] (unwind_backtrace+0x0/0xd8) from [<
c079df38>] (schedule+0x74/0x540)
[<
c079df38>] (schedule+0x74/0x540) from [<
c079f5d0>] (schedule_hrtimeout_range+0x138/0x178)
[<
c079f5d0>] (schedule_hrtimeout_range+0x138/0x178) from [<
c045bae8>] (usleep_range+0x44/0x48)
[<
c045bae8>] (usleep_range+0x44/0x48) from [<
c059e010>] (pwm_regulator_set_voltage+0x140/0x168)
[<
c059e010>] (pwm_regulator_set_voltage+0x140/0x168) from [<
c059d66c>] (regulator_set_voltage+0xe8/0x100)
[<
c059d66c>] (regulator_set_voltage+0xe8/0x100) from [<
c043f7c8>] (rk29_cpufreq_target+0x5f4/0x6cc)
[<
c043f7c8>] (rk29_cpufreq_target+0x5f4/0x6cc) from [<
c0671d44>] (__cpufreq_driver_target+0x28/0x38)
[<
c0671d44>] (__cpufreq_driver_target+0x28/0x38) from [<
c06736c0>] (cpufreq_driver_target+0x44/0x60)
[<
c06736c0>] (cpufreq_driver_target+0x44/0x60) from [<
c043ec84>] (rk29_cpufreq_aclk_vepu_notifier_event+0x78/0x94)
[<
c043ec84>] (rk29_cpufreq_aclk_vepu_notifier_event+0x78/0x94) from [<
c046bfd4>] (notifier_call_chain+0x2c/0x70)
[<
c046bfd4>] (notifier_call_chain+0x2c/0x70) from [<
c046c0a4>] (raw_notifier_call_chain+0x14/0x18)
[<
c046c0a4>] (raw_notifier_call_chain+0x14/0x18) from [<
c04384b4>] (clk_notify+0x68/0xec)
[<
c04384b4>] (clk_notify+0x68/0xec) from [<
c04386fc>] (clk_enable_nolock+0x4c/0xc4)
[<
c04386fc>] (clk_enable_nolock+0x4c/0xc4) from [<
c04391ac>] (clk_enable+0x70/0xb4)
[<
c04391ac>] (clk_enable+0x70/0xb4) from [<
c0442708>] (vpu_service_power_on+0x48/0xec)
[<
c0442708>] (vpu_service_power_on+0x48/0xec) from [<
c0442e34>] (vpu_service_ioctl+0x688/0x6e4)
[<
c0442e34>] (vpu_service_ioctl+0x688/0x6e4) from [<
c04bfa60>] (vfs_ioctl+0x2c/0x8c)
[<
c04bfa60>] (vfs_ioctl+0x2c/0x8c) from [<
c04c0110>] (do_vfs_ioctl+0x558/0x5c4)
[<
c04c0110>] (do_vfs_ioctl+0x558/0x5c4) from [<
c04c01b0>] (sys_ioctl+0x34/0x54)
[<
c04c01b0>] (sys_ioctl+0x34/0x54) from [<
c042bf40>] (ret_fast_syscall+0x0/0x2c)
root [Tue, 11 Oct 2011 10:16:41 +0000 (18:16 +0800)]
A22:add 100ms delay for backlight while resume
yzq [Fri, 14 Oct 2011 04:41:07 +0000 (12:41 +0800)]
rk29fb:close win0 win1 when suspend to fix display old frame when resume
ddl [Wed, 12 Oct 2011 07:23:06 +0000 (15:23 +0800)]
camera: add some message when camera io initiation failed
yangkai [Wed, 12 Oct 2011 03:54:07 +0000 (11:54 +0800)]
fix some bug for hub support
黄涛 [Tue, 11 Oct 2011 09:26:29 +0000 (17:26 +0800)]
rk29: reset: reset GRF_MEM_CON while reboot to bootloader
Else bootloader usb function may not work properly.
This fix commit
37e7888570648a7880ebb226b587254e9d5302c6, which set
GRF_MEM_CON to 0x28a when memory type is mobile ddr.
root [Fri, 30 Sep 2011 03:10:11 +0000 (11:10 +0800)]
add name for mtk23d gpio irq
yangkai [Tue, 11 Oct 2011 07:55:00 +0000 (15:55 +0800)]
ddr port priority change for mobile ddr
陈金泉 [Tue, 11 Oct 2011 06:52:25 +0000 (14:52 +0800)]
减短wm8900在resume函数中消耗的时间
yzq [Mon, 10 Oct 2011 09:37:03 +0000 (17:37 +0800)]
rk29fb: modify the X Y mirror interface
xbw [Mon, 10 Oct 2011 01:24:33 +0000 (09:24 +0800)]
fix the bug about the interrupt during SDcard copy by USB，continue with the commit
02b08b06e7d7d896e7e5ed005f961f98d963d2fc
yzq [Sun, 9 Oct 2011 10:02:36 +0000 (18:02 +0800)]
add modify of board-rk29-ddr3sdk.c about
the 1080p video UI scale to other boards
lyx [Sun, 9 Oct 2011 09:49:29 +0000 (17:49 +0800)]
newton: update irda bu92747 drivers
1.同步newton服务器上的irda代码
zhaoyifeng [Sun, 9 Oct 2011 07:39:02 +0000 (15:39 +0800)]
Fix usb copy data error(all the files have same errors: 32KB data is correct and 32KB data is error)
黄涛 [Sun, 9 Oct 2011 06:12:14 +0000 (14:12 +0800)]
regulator: act8891.h: fix 'struct act8891' forward declaration
杜坤明 [Sat, 8 Oct 2011 06:50:15 +0000 (14:50 +0800)]
gpu : remove 'ioremap' at gckOS_AllocateNonPagedMemory for 2.6.36.
yzq [Tue, 27 Sep 2011 09:47:42 +0000 (17:47 +0800)]
rk29fb: add a config FB_MIRROR_X_Y to support x y mirrior video
xbw [Sat, 8 Oct 2011 03:09:37 +0000 (11:09 +0800)]
Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
xbw [Sat, 8 Oct 2011 03:06:37 +0000 (11:06 +0800)]
fix the wirte-data timeout during SDcard copy by USB
高伟龙 [Sat, 8 Oct 2011 02:28:13 +0000 (10:28 +0800)]
Add channal get and android wifi dormancy mechanism to bcm4329.(V2.00)
高伟龙 [Sat, 8 Oct 2011 01:54:31 +0000 (09:54 +0800)]
fix a defect about reduse scan result NUM. after connect to AP.(V3.23)
yzq [Sat, 24 Sep 2011 01:57:37 +0000 (09:57 +0800)]
rk29fb:add config FB_SCALING_OSD_1080P for scale UI in 1080p video,
if enable it,syn android and enable the SCALE_UI_1080P_VIDEO in
hardware/libhardware/include/hardware/hardware.h
yzq [Fri, 7 Oct 2011 08:28:00 +0000 (16:28 +0800)]
rk29fb:fix bug : camera display Huaping when switch video
张晴 [Fri, 7 Oct 2011 05:17:03 +0000 (22:17 -0700)]
when in sleep remove the processing of gpio to board
张晴 [Fri, 7 Oct 2011 03:25:39 +0000 (20:25 -0700)]
RK29:set neon powerdomain off when in suspend,set it by config menuconfig
邱建斌 [Fri, 30 Sep 2011 02:23:49 +0000 (10:23 +0800)]
headset : headset interrupt to take the name
chenli [Thu, 29 Sep 2011 09:27:45 +0000 (17:27 +0800)]
rk29-ipp:give a solution of the problem that down scaling is unsupported in some cases
When fmt is YUV,ensure pre_scale_output_w and pre_scale_output_h are even and src image's width and height may be clipped.
lyx [Thu, 29 Sep 2011 02:58:15 +0000 (10:58 +0800)]
newton IrDA : improve IrDA bu92747 sending process
1.优化IrDA发送流程
2.解决在通常送信模式下，当irda传输的文件大小大于485520Byte的时候，传输失败的问题。
ddl [Wed, 28 Sep 2011 03:51:05 +0000 (11:51 +0800)]
camera: camera driver support enum frame interval
yzq [Wed, 28 Sep 2011 08:35:11 +0000 (16:35 +0800)]
rk29fb:fix the cast bug in WIN1 DYNAMIC CLOSE
陈恒明 [Tue, 27 Sep 2011 08:29:39 +0000 (16:29 +0800)]
rk29: vpu_service: fix bug on power on and power maintain timer
operation conflict
kfx [Tue, 27 Sep 2011 07:08:57 +0000 (15:08 +0800)]
i2c drivers: add some warning if scl_rate < 10K || scl_rate > 400K
kfx [Tue, 27 Sep 2011 07:02:19 +0000 (15:02 +0800)]
set minimum clock frequency for 10Khz
lyx [Tue, 27 Sep 2011 06:41:55 +0000 (23:41 -0700)]
newton: modify irda bu92747 driver
1.修正"通常送信"时newton板无法正常接收问题
chenli [Tue, 27 Sep 2011 04:21:27 +0000 (12:21 +0800)]
rk29-ipp:1.fix deadlock bug of scaling UI when playing the video via HDMI
2.when format is YUV420,check the width and height of input and output images
yzq [Tue, 27 Sep 2011 02:00:40 +0000 (10:00 +0800)]
rk29fb:fix bug : UI probabilistic display err when switch video
yzq [Tue, 27 Sep 2011 01:47:49 +0000 (09:47 +0800)]
rk29fb:memset rk29_ipp_req when create ipp_req
张文平 [Mon, 26 Sep 2011 10:26:18 +0000 (18:26 +0800)]
mpu3050:modify i2c err in mpu3050.
高伟龙 [Mon, 26 Sep 2011 08:17:45 +0000 (16:17 +0800)]
modify a bug from 8188 ap scan
黄涛 [Mon, 26 Sep 2011 06:53:47 +0000 (14:53 +0800)]
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
黄涛 [Mon, 26 Sep 2011 04:04:04 +0000 (12:04 +0800)]
rename kxtf9 to moto_kxtf9
黄涛 [Mon, 26 Sep 2011 03:49:50 +0000 (11:49 +0800)]
Revert "rename KXTF9/AK8975 config"
This reverts commit
44dda76a66e48afab0450bb6534b1c852baa0b06.
高伟龙 [Sat, 24 Sep 2011 13:55:41 +0000 (21:55 +0800)]
add rtl8188cu signal smoothing
高伟龙 [Sat, 24 Sep 2011 13:18:49 +0000 (21:18 +0800)]
Promote the capacity of WiFi connect AP.(V3.20)
高伟龙 [Sat, 24 Sep 2011 13:15:10 +0000 (21:15 +0800)]
delete the old rtl8188cu driver
高伟龙 [Sat, 24 Sep 2011 09:19:55 +0000 (17:19 +0800)]
modify the processing of 8188 driver wake up
黄涛 [Sat, 24 Sep 2011 07:02:54 +0000 (15:02 +0800)]
rk29: sdk: gpu: Reduce the reserved memory to 16M
邱建斌 [Sat, 24 Sep 2011 02:10:50 +0000 (10:10 +0800)]
wm8994: fix on callint the soundrecord a bug
root [Wed, 21 Sep 2011 11:14:25 +0000 (19:14 +0800)]
rk29_phone:change voltage unit to uV while reporting event
xbw [Thu, 22 Sep 2011 09:04:20 +0000 (17:04 +0800)]
Strengthen the signal lock in sdcard driver
杜坤明 [Thu, 22 Sep 2011 08:00:38 +0000 (16:00 +0800)]
gpu : force gcvSURF_TILE_STATUS use contiguous memory
yangkai [Thu, 22 Sep 2011 07:51:08 +0000 (15:51 +0800)]
fix msc MACRO MAX_UNFLUSHED_PACKETS use
高伟龙 [Thu, 22 Sep 2011 07:23:21 +0000 (15:23 +0800)]
delete the none used files of rtl8188cu driver
高伟龙 [Thu, 22 Sep 2011 06:21:10 +0000 (14:21 +0800)]
add rtl8188cu driver source(v3.11).
xbw [Thu, 22 Sep 2011 05:47:17 +0000 (13:47 +0800)]
Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
张文平 [Thu, 22 Sep 2011 04:47:28 +0000 (12:47 +0800)]
phone-pad: ui pmem should be no_allocator
上次的提交误操作修改了no_allocator的值，这里将其还原
张文平 [Tue, 20 Sep 2011 08:52:10 +0000 (16:52 +0800)]
phone-pad:add mw100 modem support.
projects / firefly-linux-kernel-4.4.55.git / log