shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-09 12:17:12 +09:00
Code Issues Packages Projects Releases Wiki Activity
264,246 Commits 55 Branches 2,486 Tags
a62767015abc53bfddcd23ebfeff2d9d8616661a
Commit Graph

264246 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
黄涛
a62767015a regulator: rk29-pwm-regulator: fix warning: initialization from incompatible pointer type 2011-11-07 15:27:19 +08:00
黄涛
e2bedb3590 power: bq27510_battery: fix warning: initialization from incompatible pointer type 2011-11-07 15:06:59 +08:00
黄涛
440ce860ad net: wireless: wifi_sys: fix warning: initialization from incompatible pointer type 2011-11-07 15:02:58 +08:00
黄涛
9ae50b74e6 rk29_modem: fix warning: initialization from incompatible pointer type 2011-11-07 15:00:14 +08:00
黄涛
7f73a1a8cb input: gsensor: mma8452: fix warning: initialization from incompatible pointer type 2011-11-07 14:49:37 +08:00
黄涛
5400acb485 bluetooth: vflash: fix warning: initialization from incompatible pointer type 2011-11-07 14:36:09 +08:00
黄涛
6dd0c49a3e usb: serial: option: fix warning: "CINTERION_VENDOR_ID" redefined 2011-11-07 11:45:09 +08:00
黄涛
2671ace5ab input: touchscreen: eeti_egalax_i2c: fix warning: initialization from incompatible pointer type 2011-11-07 11:43:50 +08:00
黄涛
3eb3998dc0 Revert "temp rename asix for merge 3.0" 
This reverts commit 3c3de0df8b.
 2011-11-04 17:51:23 +08:00
黄涛
1bcabbad76 Revert "temp revert rk change" 
This reverts commit 15f7fabcb8.

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
 2011-11-04 17:43:18 +08:00
黄涛
677ea8d595 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
 2011-10-28 16:07:07 +08:00
黄涛
3b75e5c0b9 revert android-tegra-2.6.36-honeycomb-mr1-9001adc to v2.6.36 2011-10-28 16:02:47 +08:00
黄涛
15f7fabcb8 temp revert rk change 2011-10-28 15:41:18 +08:00
黄涛
3c3de0df8b temp rename asix for merge 3.0 2011-10-28 15:02:44 +08:00
黄涛
1d8dd0242c rm some moto drivers for merge 3.0 2011-10-28 11:04:13 +08:00
黄涛
997319b49f rm some drivers on drivers/net/wireless for merge 3.0 2011-10-28 10:38:45 +08:00
黄涛
fdfc405c78 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
 2011-10-27 18:40:06 +08:00
jmj
b6e4c3647a Close some printk sentences. 2011-10-25 00:01:10 -07:00
jmj
53d9020216 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. 2011-10-24 23:54:31 -07:00
张晴
9ce1e8b047 add i2c_sram.c in sram for i2c communication when system is sleep 2011-10-24 19:54:00 -07:00
kfx
8b208bce97 mod old sdmmc drivers 2011-10-24 16:58:26 +08:00
胡卫国
3dd097b336 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
 2011-10-22 15:35:39 +08:00
邱建斌
8bdc216971 I2S: add i2s use DMA event mode choose,default use static mode 2011-10-22 14:36:16 +08:00
邱建斌
ebe8a3ddef wm8994: add the spk earpiece Differential signal BB config 2011-10-22 14:36:00 +08:00
邱建斌
9e44a11a8c rk_headset: Add if headset have not hook key judge 2011-10-22 14:35:31 +08:00
xbw
a86175882a Optimize the powe up and down of wifi and SDcard module 2011-10-22 11:19:06 +08:00
黄涛
83b2a2aefa rk29: add timer_cpu.c for debug 2011-10-22 10:33:38 +08:00
黄涛
92c638dd57 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.
 2011-10-22 10:10:32 +08:00
yzq
74ad5701c4 fix err about 'rk29fb:fix problem :UI jitter when carema DV DC switch' 2011-10-20 18:33:49 +08:00
yzq
826dcd4342 rk29fb:fix problem :UI jitter when carema DV DC switch 2011-10-20 17:40:44 +08:00
cwz
a0dcd0e7b8 tps65910 regulator aux2 error. 2011-10-20 00:05:34 -07:00
黄涛
22a821947f rk29: ddr3sdk: do not define empty rk29_setgpio_suspend_board/rk29_setgpio_resume_board, which is weak function 2011-10-20 11:30:34 +08:00
黄涛
65ae0d6b6e rk29: phonesdk: do not define empty rk29_setgpio_suspend_board/rk29_setgpio_resume_board, which is weak function 2011-10-20 11:30:34 +08:00
黄涛
d2008fc290 rk29: a22: do not define empty rk29_setgpio_suspend_board/rk29_setgpio_resume_board, which is weak function 2011-10-20 11:30:34 +08:00
黄涛
bcf68f6ae6 rk29: gpio: give default weak empty implementation for board suspend/resume 2011-10-20 11:30:34 +08:00
黄涛
153f796075 rk29: add clk_vpu for notify vpu power on 2011-10-20 11:30:34 +08:00
黄涛
bd76a05e28 rk29: pm: disable vt switch while suspend, one bug show suspend may hung on vt_event_wait 2011-10-20 11:30:33 +08:00
cwz
3c14265c5d tps65910 vdd2 regulator default voltage 1.5V. 2011-10-19 05:05:53 -07:00
黄涛
afc8be72ac Revert "regulator: rk29-pwm: fix sleep in atomic" 
This reverts commit 045e8a7d9e.
The patch isn't the right way to fix this problem.
 2011-10-18 17:15:46 +08:00
黄涛
045e8a7d9e 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)
 2011-10-18 11:29:36 +08:00
root
a123ff3d4e A22:add 100ms delay for backlight while resume 2011-10-14 14:27:56 +08:00
yzq
a6b813e804 rk29fb:close win0 win1 when suspend to fix display old frame when resume 2011-10-14 12:41:07 +08:00
ddl
4566d75436 camera: add some message when camera io initiation failed 2011-10-12 15:24:21 +08:00
yangkai
61d35e5969 fix some bug for hub support 2011-10-12 11:54:07 +08:00
黄涛
010f6ce7a6 rk29: reset: reset GRF_MEM_CON while reboot to bootloader 
Else bootloader usb function may not work properly.
This fix commit 37e7888570, which set
GRF_MEM_CON to 0x28a when memory type is mobile ddr.
 2011-10-11 17:26:29 +08:00
root
12e240b2e5 add name for mtk23d gpio irq 2011-10-11 16:31:49 +08:00
yangkai
37e7888570 ddr port priority change for mobile ddr 2011-10-11 15:55:00 +08:00
陈金泉
7f813ed4ef 减短wm8900在resume函数中消耗的时间 2011-10-11 14:52:25 +08:00
yzq
d2ed7c29a5 rk29fb: modify the X Y mirror interface 2011-10-10 17:37:49 +08:00
xbw
43e7a824f2 fix the bug about the interrupt during SDcard copy by USB，continue with the commit 02b08b06e7 2011-10-10 09:24:33 +08:00