Merge remote-tracking branch 'remotes/aosp/android-3.0' into develop-3.0
author黄涛 <huangtao@rock-chips.com>
Fri, 28 Oct 2011 08:07:07 +0000 (16:07 +0800)
committer黄涛 <huangtao@rock-chips.com>
Fri, 28 Oct 2011 08:07:07 +0000 (16:07 +0800)
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

148 files changed:
1  2 
Makefile
arch/arm/Kconfig
arch/arm/Makefile
arch/arm/boot/Makefile
arch/arm/common/gic.c
arch/arm/common/pl330.c
arch/arm/include/asm/dma.h
arch/arm/kernel/entry-common.S
arch/arm/kernel/vmlinux.lds.S
arch/arm/mm/mmu.c
drivers/Kconfig
drivers/Makefile
drivers/base/bus.c
drivers/bluetooth/Kconfig
drivers/bluetooth/Makefile
drivers/bluetooth/hci_h4.c
drivers/bluetooth/hci_ldisc.c
drivers/char/misc.c
drivers/gpio/Kconfig
drivers/gpio/Makefile
drivers/gpio/wm831x-gpio.c
drivers/hid/usbhid/hid-core.c
drivers/i2c/algos/Makefile
drivers/i2c/algos/i2c-algo-bit.c
drivers/i2c/busses/Kconfig
drivers/i2c/busses/Makefile
drivers/i2c/busses/i2c-gpio.c
drivers/i2c/i2c-boardinfo.c
drivers/i2c/i2c-core.c
drivers/input/Kconfig
drivers/input/Makefile
drivers/input/misc/Kconfig
drivers/input/misc/Makefile
drivers/input/touchscreen/Kconfig
drivers/input/touchscreen/Makefile
drivers/leds/Kconfig
drivers/leds/Makefile
drivers/media/video/Kconfig
drivers/media/video/Makefile
drivers/media/video/uvc/uvc_queue.c
drivers/media/video/uvc/uvc_video.c
drivers/media/video/uvc/uvcvideo.h
drivers/media/video/videobuf-core.c
drivers/media/video/videobuf-dma-contig.c
drivers/mfd/Kconfig
drivers/mfd/Makefile
drivers/mfd/wm831x-irq.c
drivers/mfd/wm8994-core.c
drivers/misc/Kconfig
drivers/misc/Makefile
drivers/mmc/card/block.c
drivers/mmc/core/bus.c
drivers/mmc/core/core.c
drivers/mmc/core/sd.c
drivers/mmc/core/sdio.c
drivers/mmc/host/Kconfig
drivers/mtd/Kconfig
drivers/mtd/Makefile
drivers/mtd/mtd_blkdevs.c
drivers/mtd/mtdblock.c
drivers/mtd/nand/Kconfig
drivers/mtd/nand/Makefile
drivers/mtd/nand/nand_base.c
drivers/mtd/nand/nand_bbt.c
drivers/net/Kconfig
drivers/net/Makefile
drivers/net/dm9000.c
drivers/net/enc28j60.c
drivers/net/usb/Kconfig
drivers/net/usb/Makefile
drivers/net/usb/usbnet.c
drivers/power/Kconfig
drivers/power/Makefile
drivers/power/wm831x_power.c
drivers/regulator/Kconfig
drivers/regulator/Makefile
drivers/regulator/core.c
drivers/regulator/wm831x-dcdc.c
drivers/regulator/wm831x-isink.c
drivers/regulator/wm831x-ldo.c
drivers/regulator/wm8994-regulator.c
drivers/rtc/Kconfig
drivers/rtc/Makefile
drivers/rtc/rtc-test.c
drivers/rtc/rtc-wm831x.c
drivers/spi/Kconfig
drivers/spi/Makefile
drivers/spi/spi.c
drivers/staging/Kconfig
drivers/staging/Makefile
drivers/staging/iio/Kconfig
drivers/staging/iio/Makefile
drivers/usb/Kconfig
drivers/usb/core/hcd.c
drivers/usb/core/hub.c
drivers/usb/core/usb.c
drivers/usb/gadget/composite.c
drivers/usb/gadget/gadget_chips.h
drivers/usb/storage/usb.c
drivers/video/Kconfig
drivers/video/Makefile
drivers/video/backlight/Kconfig
drivers/video/backlight/Makefile
drivers/video/backlight/wm831x_bl.c
drivers/video/console/fbcon.c
drivers/video/fbmem.c
drivers/watchdog/Kconfig
drivers/watchdog/Makefile
drivers/watchdog/wm831x_wdt.c
fs/block_dev.c
fs/buffer.c
fs/cramfs/inode.c
fs/partitions/check.c
include/asm-generic/gpio.h
include/linux/fb.h
include/linux/gfp.h
include/linux/i2c.h
include/linux/mfd/wm831x/pdata.h
include/linux/mmc/card.h
include/linux/mmc/host.h
include/linux/mmc/mmc.h
include/linux/mtd/blktrans.h
include/linux/mtd/nand.h
include/linux/regulator/consumer.h
include/linux/serial_core.h
include/linux/spi/spi.h
include/linux/videodev2.h
include/media/soc_camera.h
include/media/v4l2-chip-ident.h
include/media/videobuf-core.h
include/sound/asound.h
include/sound/pcm.h
include/sound/soc-dai.h
include/sound/soc.h
init/Kconfig
init/initramfs.c
kernel/module.c
kernel/printk.c
net/bluetooth/rfcomm/core.c
scripts/Makefile.build
sound/core/pcm_native.c
sound/soc/Kconfig
sound/soc/Makefile
sound/soc/codecs/wm8900.c
sound/soc/codecs/wm8994.c
sound/soc/codecs/wm8994.h
sound/soc/codecs/wm_hubs.c
sound/soc/codecs/wm_hubs.h

diff --cc Makefile
Simple merge
index b449fc4ccbf410a5227b45664857b87dc7e12644,81f0b93a0cbbc4c635a198861bbc51700e65f2dd..38d4c961e5aff8ea510fe9711196cc4552214203
@@@ -813,28 -853,11 +853,29 @@@ config ARCH_OMA
        select ARCH_REQUIRE_GPIOLIB
        select ARCH_HAS_CPUFREQ
        select GENERIC_CLOCKEVENTS
+       select HAVE_SCHED_CLOCK
        select ARCH_HAS_HOLES_MEMORYMODEL
        help
-         Support for TI's OMAP platform (OMAP1 and OMAP2).
+         Support for TI's OMAP platform (OMAP1/2/3/4).
  
 +config ARCH_RK29
 +      bool "Rockchip Soc Rk29"
 +      select CPU_V7
 +      select HAVE_CLK
 +      select COMMON_CLKDEV
 +      select HAVE_SCHED_CLOCK
 +      select ARCH_HAS_CPUFREQ
 +      select GENERIC_TIME
 +      select GENERIC_CLOCKEVENTS
 +      select ARCH_REQUIRE_GPIOLIB
 +      select ARM_GIC
 +      select PL330
 +      select HIGHMEM
 +      select ZONE_DMA
 +      select ARM_L1_CACHE_SHIFT_6
 +      help
 +        Support for Rockchip RK29 soc.
 +
  config PLAT_SPEAR
        bool "ST SPEAr"
        select ARM_AMBA
Simple merge
index 38eb586bf00a4f2f77febdad3a14e87e1e9d15d8,9128fddf110965eb76cd73fefbeb07d5570bf0a4..d05693bd812abcadcedbdbb2343be7b0b27381ab
@@@ -71,20 -70,11 +71,15 @@@ els
  $(obj)/uImage: LOADADDR=$(ZRELADDR)
  endif
  
- ifeq ($(CONFIG_THUMB2_KERNEL),y)
- # Set bit 0 to 1 so that "mov pc, rx" switches to Thumb-2 mode
- $(obj)/uImage: STARTADDR=$(shell echo $(LOADADDR) | sed -e "s/.$$/1/")
- else
  $(obj)/uImage: STARTADDR=$(LOADADDR)
- endif
  
 -$(obj)/uImage:        $(obj)/zImage FORCE
 +$(obj)/Image.gz: $(obj)/Image FORCE
 +      $(call if_changed,gzip)
 +      @echo '  Image:  $@ is ready'
 +
 +$(obj)/uImage: $(obj)/Image FORCE
        $(call if_changed,uimage)
 -      @echo '  Image $@ is ready'
 +      @echo '  Image $@ is ready'
  
  $(obj)/bootp/bootp: $(obj)/zImage initrd FORCE
        $(Q)$(MAKE) $(build)=$(obj)/bootp $@
index 7dfa9a85bc0c875b11567025f68e92bd768d7419,4ddd0a6ac7ff3d9db4f55b165c172ec144e90a51..4ddd0a6ac7ff3d9db4f55b165c172ec144e90a51
mode 100755,100644..100755
index 234ed88e6829ccf09a5738c828748a6db3297002,97912fa48782563527a3b56cc9b60c1acee008f3..c322fe55cc70a9833f02d23f7c6f2ffce489f17e
  
  #define       PART            0x330
  #define DESIGNER      0x41
 -#define REVISION      0x0
 +#define REVISION      0x1
  #define INTEG_CFG     0x0
- #define PERIPH_ID_VAL ((PART << 0) | (DESIGNER << 12) \
-                         | (REVISION << 20) | (INTEG_CFG << 24))
+ #define PERIPH_ID_VAL ((PART << 0) | (DESIGNER << 12))
  
  #define PCELL_ID_VAL  0xb105f00d
  
index 81921e8d2bc3f7b4617d5511c9c014d69d02627f,42005542932b3d38fa727ff3de6c25ff750c0271..6873de2dcaa086fb300f7ceea7a69feccb51b07c
@@@ -6,9 -6,13 +6,11 @@@
  /*
   * This is the maximum virtual address which can be DMA'd from.
   */
- #ifndef MAX_DMA_ADDRESS
+ #ifndef ARM_DMA_ZONE_SIZE
  #define MAX_DMA_ADDRESS       0xffffffff
+ #else
+ #define MAX_DMA_ADDRESS       (PAGE_OFFSET + ARM_DMA_ZONE_SIZE)
  #endif
 -
 -#ifdef CONFIG_ISA_DMA_API
  /*
   * This is used to support drivers written for the x86 ISA DMA API.
   * It should not be re-used except for that purpose.
Simple merge
index 6ab5093711c6dab6dae1c44bc220302bfb72dd2f,e5287f21badc7e87c3c2e7a2d8953d5fb270ec86..caed3d42a6db924b51cd079427e8b06ef607606b
@@@ -228,63 -259,9 +259,65 @@@ SECTION
                __tcm_end = .;
        }
  #endif
 +#ifdef CONFIG_ARCH_RK29
 +        /*
 +       * We align everything to a page boundary so we can
 +       * free it after init has commenced and SRAM contents have
 +       * been copied to its destination.
 +       */
 +      .sram_start : {
 +              . = ALIGN(PAGE_SIZE);
 +              __sram_start = .;
 +              __sram_code_start = .;
 +      }
 +
 +      /*
 +       * Link these to the ITCM RAM
 +       * Put VMA to the TCM address and LMA to the common RAM
 +       * and we'll upload the contents from RAM to TCM and free
 +       * the used RAM after that.
 +       */
 +      .text_sram_code SRAM_CODE_OFFSET : AT(__sram_code_start)
 +      {
 +              __ssram_code_text = .;
 +              *(.sram.text)
 +              *(.sram.rodata)
 +              . = ALIGN(4);
 +              __esram_code_text = .;
 +      }
 +
 +      /*
 +       * Reset the dot pointer, this is needed to create the
 +       * relative __dtcm_start below (to be used as extern in code).
 +       */
 +      . = ADDR(.sram_start) + SIZEOF(.sram_start) + SIZEOF(.text_sram_code);
 +
 +      .sram_data_start : {
 +              __sram_data_start = .;
 +      }
 +
 +      /* TODO: add remainder of ITCM as well, that can be used for data! */
 +      .data_sram SRAM_DATA_OFFSET : AT(__sram_data_start)
 +      {
 +              . = ALIGN(4);
 +              __ssram_data = .;
 +              *(.sram.data)
 +              . = ALIGN(4);
 +              __esram_data = .;
 +      }
 +
 +      /* Reset the dot pointer or the linker gets confused */
 +      . = ADDR(.sram_data_start) + SIZEOF(.data_sram);
 +
 +      /* End marker for freeing TCM copy in linked object */
 +      .sram_end : AT(ADDR(.sram_data_start) + SIZEOF(.data_sram)){
 +              . = ALIGN(PAGE_SIZE);
 +              __sram_end = .;
 +      }
 +#endif
  
+       NOTES
        BSS_SECTION(0, 0, 0)
        _end = .;
  
Simple merge
diff --cc drivers/Kconfig
index a2b902f4d43706334e87b30656b1addc399b1c77,d0258eb26d8b81c5b0aa54a4d946d01094aec5c1..d0258eb26d8b81c5b0aa54a4d946d01094aec5c1
mode 100755,100644..100755
index a2aea53a75ed9fdf99058f9676429c84104c2f27,4ea4ac9e57af34b6cc7e78ec3c2af75ceb4d3546..4ea4ac9e57af34b6cc7e78ec3c2af75ceb4d3546
mode 100755,100644..100755
index 96709f26d70fc4ab499ffb39fbe52cd2e4a25362,000e7b2006f8f5dc96c269ac3615b8b4668bbd0d..dd4223b022cdec6bac02675729d88955862c2852
  #include <linux/string.h>
  #include "base.h"
  #include "power/power.h"
 +#include "linux/usb.h"
 +#include "devices_filter.h"
  
  #define to_bus_attr(_attr) container_of(_attr, struct bus_attribute, attr)
- #define to_bus(obj) container_of(obj, struct bus_type_private, subsys.kobj)
  
  /*
   * sysfs bindings for drivers
index 301c10ad6529817284ef2144152fac981246caff,11b41fd40c275b0f61aa77120dfab5b14219564a..a71eac1486f77bdaf33eaa9f69d5604421af5b1b
mode 100755,100644..100755
index a4e134ea5d68b90f73c3c9c1aa7f72e0a287aaf4,f4460f4f4b788c1144f962227b5fd711490eecdd..900db5f396e7fbdb08b56c7a93035cc64994a7fc
mode 100755,100644..100755
index e12d2a3994dac3c84b81c57c3234bc70add61d96,2fcd8b387d694b74130956fe836b5c211dbee20a..38f6fe6c5ca23283da46b9b8ccc6de133e09444d
mode 100755,100644..100755
index 3182186449eee87b0f239fc7e4f190e58f06b669,48ad2a7ab080ba9a58c425da7cc959dba0e1e3de..93e278fe9c8e7ea73431f082455406d259736fed
mode 100755,100644..100755
Simple merge
index ffe29c25ebbd7cb5caaa9ddde9b8bfb674e864e4,2967002a9f820b2894dd1f8f1110a47a9694e250..9fed5e895514a30bbd5dfbe05893fe314698d2d5
mode 100755,100644..100755
index 1cf28b3de4032e5a00699935f81a5d996f1610e9,b605f8ec6fbe0afc01e6c4604de67e6a85f98add..862b7b266897953c1dd5e6fbb69d1ba771e2eff6
mode 100755,100644..100755
@@@ -17,14 -19,16 +19,17 @@@ obj-$(CONFIG_GPIO_MAX7301) += max7301.
  obj-$(CONFIG_GPIO_MAX732X)    += max732x.o
  obj-$(CONFIG_GPIO_MC33880)    += mc33880.o
  obj-$(CONFIG_GPIO_MCP23S08)   += mcp23s08.o
+ obj-$(CONFIG_GPIO_74X164)     += 74x164.o
+ obj-$(CONFIG_ARCH_OMAP)         += gpio-omap.o
  obj-$(CONFIG_GPIO_PCA953X)    += pca953x.o
  obj-$(CONFIG_GPIO_PCF857X)    += pcf857x.o
+ obj-$(CONFIG_GPIO_PCH)                += pch_gpio.o
  obj-$(CONFIG_GPIO_PL061)      += pl061.o
  obj-$(CONFIG_GPIO_STMPE)      += stmpe-gpio.o
- obj-$(CONFIG_GPIO_TC35892)    += tc35892-gpio.o
+ obj-$(CONFIG_GPIO_TC3589X)    += tc3589x-gpio.o
  obj-$(CONFIG_GPIO_TIMBERDALE) += timbgpio.o
  obj-$(CONFIG_GPIO_TWL4030)    += twl4030-gpio.o
 +obj-$(CONFIG_GPIO_TPS65910)   += tps65910-gpio.o
  obj-$(CONFIG_GPIO_UCB1400)    += ucb1400_gpio.o
  obj-$(CONFIG_GPIO_XILINX)     += xilinx_gpio.o
  obj-$(CONFIG_GPIO_CS5535)     += cs5535-gpio.o
index 382ae877f3700c17453655fc2d5753c15bb9f9e9,2bcfb0be09ff38e1db182c77a78c506fba8f6149..c92751694eb04b85ab767197e76e0ea7ef523370
mode 100755,100644..100755
index 63c0154e9e3b3c58efa219074357472b09075575,38c261a40c744b49703ce1c940371daa5ba2e8d2..852d74d935a2f16bfbc3c6105b70a399fd70aa0a
mode 100755,100644..100755
Simple merge
index 1c83580af6169b933a399082788f492725ef0500,d6d58684712bc8b68cafb662316fe123e53b270d..a0e039db581c0215fd184fbfdd4b14ee3d7a7629
mode 100755,100644..100755
Simple merge
Simple merge
index b09ca976b15145e371dab710f5e6000e3d011f02,a651779d9ff7a2faf7a41f8d437f7d97b1f66b30..49363163d52c35cca146c6e1607ccba91fa25cd4
mode 100755,100644..100755
index 6a42cad3635e00344ffb4ff40adaa6c1ec30fc1f,3ca2e012e78932ed8cf33339a3a0a0d404026c03..a35251e2c8ec2983800b5fbaecf11a6fa19d793d
mode 100755,100644..100755
index 483bb2e8cf5a4881d3e0ea2abc2432d4e1ec4065,9a58994ff7ea54bd46cf6b576e9e43b10e736b79..be7a00c60e551500ec4f1309db82894c5ee51287
mode 100755,100644..100755
@@@ -575,24 -537,10 +553,22 @@@ i2c_new_device(struct i2c_adapter *adap
        client->dev.parent = &client->adapter->dev;
        client->dev.bus = &i2c_bus_type;
        client->dev.type = &i2c_client_type;
- #ifdef CONFIG_OF
        client->dev.of_node = info->of_node;
- #endif
  
 -      dev_set_name(&client->dev, "%d-%04x", i2c_adapter_id(adap),
 -                   client->addr);
 +    /* ddl@rock-chips.com : Devices which have some i2c addr can work in same i2c bus, 
 +      if devices havn't work at the same time.*/
 +    #if 0
 +    dev_set_name(&client->dev, "%d-%04x", i2c_adapter_id(adap),
 +                   client->addr);
 +    #else
 +    if (status == 0)
 +      dev_set_name(&client->dev, "%d-%04x", i2c_adapter_id(adap),
 +                   client->addr);
 +    else 
 +        dev_set_name(&client->dev, "%d-%04x-%01x", i2c_adapter_id(adap),
 +                   client->addr,status);
 +    #endif
 +    
        status = device_register(&client->dev);
        if (status)
                goto out_err;
index 1c7495c0786d00922c94c3e1aa5f28fb01c60fba,c0e639c1b17968e466ee21a0e16c9cfd840c2c09..d52a16a23a4a76bdd273b872b5d9180dd7d08c36
mode 100755,100644..100755
index 7ad212d31f99b678f8bd3dfadf5fb9f815512825,5d4593d3101d099fd0e5957e7f0561c37cfbccd7..5d4593d3101d099fd0e5957e7f0561c37cfbccd7
mode 100755,100644..100755
index 9ab32b891205602e6ea0afd5600c21d9391f6f19,6f4ad1a7c3eecc85dabd6986e646f5155ad451f6..7ce1e96726331216d55b95eb9d37ee260b7291c0
mode 100755,100644..100755
index a60f517d2e087ff76afeb57c8ae8dcc5cf2ab701,eb73834150b7d6df0156ec66b85308bc2da4b225..41136b497844145215d72c05056e363384a15ffd
mode 100755,100644..100755
@@@ -4,9 -4,8 +4,10 @@@
  
  # Each configuration option enables a list of files.
  
 +obj-$(CONFIG_INPUT_LPSENSOR_CM3602)   += capella_cm3602.o
 +obj-$(CONFIG_INPUT_LPSENSOR_ISL29028) += isl29028.o
  obj-$(CONFIG_INPUT_88PM860X_ONKEY)    += 88pm860x_onkey.o
+ obj-$(CONFIG_INPUT_AB8500_PONKEY)     += ab8500-ponkey.o
  obj-$(CONFIG_INPUT_AD714X)            += ad714x.o
  obj-$(CONFIG_INPUT_AD714X_I2C)                += ad714x-i2c.o
  obj-$(CONFIG_INPUT_AD714X_SPI)                += ad714x-spi.o
@@@ -40,7 -43,8 +46,7 @@@ obj-$(CONFIG_INPUT_TPS65910_PWRBUTTON)        
  obj-$(CONFIG_INPUT_TWL4030_PWRBUTTON) += twl4030-pwrbutton.o
  obj-$(CONFIG_INPUT_TWL4030_VIBRA)     += twl4030-vibra.o
  obj-$(CONFIG_INPUT_UINPUT)            += uinput.o
- obj-$(CONFIG_INPUT_WINBOND_CIR)               += winbond-cir.o
  obj-$(CONFIG_INPUT_WISTRON_BTNS)      += wistron_btns.o
  obj-$(CONFIG_INPUT_WM831X_ON)         += wm831x-on.o
+ obj-$(CONFIG_INPUT_XEN_KBDDEV_FRONTEND)       += xen-kbdfront.o
  obj-$(CONFIG_INPUT_YEALINK)           += yealink.o
 -
index 0069d9703fda82c94409bae95e64e6be2faac4ac,410410396700a15b8ae3114f8c890b28e270d941..410410396700a15b8ae3114f8c890b28e270d941
mode 100755,100644..100755
index c4928eebba7b630b2856e2785632bcd426cdf069,0738f19633b1390c07d91c419144cf7a34466ae0..6bd028a9ffcbb22f0607da900317d155410ab386
mode 100755,100644..100755
index 01052c2f806098dec130da76f8aaaf28b33b6dcb,b84e46bdedce88104049f02cda84f3ed8651d3ed..99809849fc10e8f55697f52ee700303c96d6f266
mode 100755,100644..100755
@@@ -165,16 -199,9 +199,17 @@@ config LEDS_GPIO_O
          of_platform devices.  For instance, LEDs which are listed in a "dts"
          file.
  
 +config LEDS_NEWTON_PWM
 +      bool "LED Support for newton pwm"
 +      depends on LEDS_CLASS&&ARCH_RK29
 +      default n
 +      help
 +        Let the leds-gpio driver drive LEDs which have been defined as
 +        platform devices.  If you don't know what this means, say yes.
 +        
  config LEDS_LP3944
        tristate "LED Support for N.S. LP3944 (Fun Light) I2C chip"
+       depends on LEDS_CLASS
        depends on I2C
        help
          This option enables support for LEDs connected to the National
@@@ -269,15 -323,9 +331,16 @@@ config LEDS_BD280
          This option enables support for BD2802GU RGB LED driver chips
          accessed via the I2C bus.
  
 +config LEDS_ATT1272
 +      tristate "LED driver for ATT1272 LED"
 +      depends on LEDS_CLASS && I2C
 +      help
 +        This option enables support for ATT1272 LED driver chips
 +        accessed via the I2C bus.
 +
  config LEDS_INTEL_SS4200
        tristate "LED driver for Intel NAS SS4200 series"
+       depends on LEDS_CLASS
        depends on PCI && DMI
        help
          This option enables support for the Intel SS4200 series of
index 5ba3fb7a402dc58b1bce534b304988af10f72819,cb77b9bb2f982bc4cdc26adc9377656f60fd84f5..cac0fc0708dbf496ac34966e83ef17ae3942e1a7
mode 100755,100644..100755
index 31f658eecb46e3d163a1f9919e4c16fd102df9b2,bb53de7fe4087b227f98b63cdc15b035d28f008c..aab1f5807590b40b4c0b836c48f9902fd40cdbe5
mode 100755,100644..100755
@@@ -1076,45 -928,8 +1107,45 @@@ config VIDEO_OMAP
        ---help---
          This is a v4l2 driver for the TI OMAP2 camera capture interface
  
 +config VIDEO_RK29
 +      tristate "RK29XX Camera Sensor Interface driver"
 +      depends on VIDEO_DEV && ARCH_RK29 && SOC_CAMERA && HAS_DMA
 +      select VIDEOBUF_DMA_CONTIG
 +      ---help---
 +        This is a v4l2 driver for the RK29XX Camera Sensor Interface
 +
 +choice
 +      prompt "RK29XX Camera Sensor Interface Work Mode"
 +      depends on VIDEO_RK29
 +      default VIDEO_RK29_WORK_ONEFRAME
 +      ---help---
 +              RK29 Camera Sensor Interface(VIP) can work in 2 modes, ie:OneFrame,PingPong.
 +
 +config VIDEO_RK29_WORK_ONEFRAME
 +      bool "VIP OneFrame Mode"
 +
 +config VIDEO_RK29_WORK_PINGPONG
 +      bool "VIP PingPong Mode"
 +
 +endchoice
 +
 +choice
 +      prompt "RK29XX camera sensor interface work with IPP "
 +      depends on VIDEO_RK29 && RK29_IPP
 +      default VIDEO_RK29_WORK_IPP
 +      ---help---
 +              RK29 Camera Sensor Interface(VIP) can work with IPP or not IPP
 +
 +config VIDEO_RK29_WORK_IPP
 +      bool "VIP work with IPP"
 +
 +config VIDEO_RK29_WORK_NOT_IPP
 +      bool "VIP don't work with IPP"
 +
 +endchoice
 +
  config VIDEO_MX2_HOSTSUPPORT
-         bool
+       bool
  
  config VIDEO_MX2
        tristate "i.MX27/i.MX25 Camera Sensor Interface driver"
index 40f98fba5f88f5c503ad66447c114df75af00901,f0fecd6f6a33e818c4f4713d2b62e1ecd762e4a9..f0fecd6f6a33e818c4f4713d2b62e1ecd762e4a9
mode 100755,100644..100755
Simple merge
index 08a9170055967945a4b09c6a3fb15841d8f98611,49994793cc777ab36c38a8dc43685b5886aaaa4d..97e1c66a5039d2df105c4c82569614a2cf795e9f
mode 100755,100644..100755
index bab1fa6e75b5b7733af4279f546e239f6565d841,20107fd3574da44508f69835e5fc098b3eec86a6..06e24361b266a330f3b8073f74f6dc89c8f1adc9
mode 100755,100644..100755
@@@ -461,9 -493,8 +496,10 @@@ struct uvc_streaming 
        dma_addr_t urb_dma[UVC_URBS];
        unsigned int urb_size;
  
+       __u32 sequence;
        __u8 last_fid;
 +
 +    struct tasklet_struct *tasklet[UVC_URBS];     /* ddl@rock-chips.com */
  };
  
  enum uvc_device_state {
Simple merge
index db51ea1c608250be267a6430c6d808a77530e48d,6ca938a6bf94d336ddbfd830c02bc4739436ffc9..6ca938a6bf94d336ddbfd830c02bc4739436ffc9
mode 100755,100644..100755
index feaeeaeeddb7eb924989cf40ebb63f665e7d9418,d7d47d2a4c7615c17d4aec23080692f2b603dda7..d7d47d2a4c7615c17d4aec23080692f2b603dda7
mode 100755,100644..100755
index 294183b6260b1facff3d26764eb3cea8c6d4b011,42b928ec891e6b4b2a60a6323ed5d6265659e978..42b928ec891e6b4b2a60a6323ed5d6265659e978
mode 100755,100644..100755
index b3b2aaf89dbee70e8855c9b3124e7f04fd0aee9a,e198d40292e7f5cb9c1ed5e78c4d3f41e30f1bc5..e198d40292e7f5cb9c1ed5e78c4d3f41e30f1bc5
mode 100755,100644..100755
index b74331260744db8829a2a8712a0d08bf5d42f949,68f367184ab5e1aa5738577d9444344f8b4f3423..68f367184ab5e1aa5738577d9444344f8b4f3423
mode 100755,100644..100755
index 42eab95cde2af49e8ae737036695a1093caa01d9,2d430484519c2610cb1042df80f68db93746b232..2d430484519c2610cb1042df80f68db93746b232
mode 100755,100644..100755
index d545f79f6000ebe8b5219c56a19c7bd0acbfc343,c779503e75784c6815a1fe3fe1981b5e19fbd432..c779503e75784c6815a1fe3fe1981b5e19fbd432
mode 100755,100644..100755
index 68ace37a1c0584716e5ada4e5e56d54c35995249,393d817ed04076dca934511f4522b698776073ae..25667a59c91e82a24531b8fee75d4423ab7613ee
mode 100755,100644..100755
index 09eee6df0653c84fc5c08023f8913a6afbb884a7,7c3444a37070de9fffd24839990a06c2433ceacc..7c3444a37070de9fffd24839990a06c2433ceacc
mode 100755,100644..100755
index 0f5241085557488dbfb674a60474fe7709719d44,5decf4972bcb7aacc41c23bcbeaa4df8d763e18d..5decf4972bcb7aacc41c23bcbeaa4df8d763e18d
mode 100755,100644..100755
index f332c52968b75d7528ee8c5f21eaf561a76d373d,7da522e958a094d31299713c72dcfeded8af7184..7da522e958a094d31299713c72dcfeded8af7184
mode 100755,100644..100755
index 886dbc95f135758cb77a95e8b02797c127e6e67e,56dbf3f6ad08a495075b2e254dccc1cb61d2c707..919144060c9cd1b923e1ec7ce1c153f04dfaaf7c
mode 100755,100644..100755
Simple merge
Simple merge
index 121075fd84a04dbe57faa340bdbe352602f204aa,ca385697446ece7ebfe387a4cd99b41cbca9ebbc..783db0e48819dce8a0a1afaf31d7acb3b019fa0e
mode 100755,100644..100755
index cebcc436f17016063d5040d86dec0a2a03e76155,3326615ad66b957c57234bf3eb83699a393ff62e..a82d868ea7de47d81303e1302bf7d84d12a01af5
mode 100755,100644..100755
Simple merge
Simple merge
Simple merge
Simple merge
index e473def09a967ba096ddf854486b156da2c41997,906ef8fa00603ede3fee9134358626fd2988beb5..9c9eec33143b6108eb08758531bc4238558d8560
mode 100755,100644..100755
Simple merge
index c053e742562d7478ee056c4dbe5e550d1ccc72f1,ee597e676ee500235f7dace13c570ad92e20724f..7d82334e4941ec89f7d21dbc44965f1a578b5c47
mode 100755,100644..100755
@@@ -1199,10 -1155,11 +1165,11 @@@ dm9000_open(struct net_device *dev
        if (irqflags == IRQF_TRIGGER_NONE)
                dev_warn(db->dev, "WARNING: no IRQ resource flags set.\n");
  
 -      irqflags |= IRQF_SHARED;
 +      //irqflags |= IRQF_SHARED;
  
-       if (request_irq(dev->irq, dm9000_interrupt, irqflags, dev->name, dev))
-               return -EAGAIN;
+       /* GPIO0 on pre-activate PHY, Reg 1F is not set by reset */
+       iow(db, DM9000_GPR, 0); /* REG_1F bit0 activate phyxcer */
+       mdelay(1); /* delay needs by DM9000B */
  
        /* Initialize DM9000 board */
        dm9000_reset(db);
Simple merge
Simple merge
Simple merge
Simple merge
index dd3bc824ef4c55aad00b1ace12f136df60e0976b,e57b50b385655d24eb5aeb94866a68cef42813e2..935b5c17c481dad37667e5784867af070af30e76
mode 100755,100644..100755
index 4ed46e2e40c99b2457bf9e505edc03915681c8ae,009a90fa8ac9538e320ec1f0f9196b44e87054f1..ecd0e194da8f9ddeca24ff23120bab4172f297b5
@@@ -36,9 -30,9 +31,13 @@@ obj-$(CONFIG_BATTERY_MAX17042)       += max17
  obj-$(CONFIG_BATTERY_Z2)      += z2_battery.o
  obj-$(CONFIG_BATTERY_S3C_ADC) += s3c_adc_battery.o
  obj-$(CONFIG_CHARGER_PCF50633)        += pcf50633-charger.o
 +obj-$(CONFIG_BATTERY_STC3100) += stc3100_battery.o
 +obj-$(CONFIG_BATTERY_BQ27510) += bq27510_battery.o
 +obj-$(CONFIG_BATTERY_BQ27541) += bq27541_battery.o
 +obj-$(CONFIG_BATTERY_BQ3060)  += bq3060_battery.o
  obj-$(CONFIG_BATTERY_JZ4740)  += jz4740-battery.o
  obj-$(CONFIG_BATTERY_INTEL_MID)       += intel_mid_battery.o
+ obj-$(CONFIG_CHARGER_ISP1704) += isp1704_charger.o
+ obj-$(CONFIG_CHARGER_MAX8903) += max8903_charger.o
+ obj-$(CONFIG_CHARGER_TWL4030) += twl4030_charger.o
+ obj-$(CONFIG_CHARGER_GPIO)    += gpio-charger.o
index fbcc36dae470472fd685228ea261a349e664d145,ddf8cf5f3204032f835892487ba085e058f49c82..ddf8cf5f3204032f835892487ba085e058f49c82
mode 100755,100644..100755
index 0d19d0d866cce23d91fb4c761cbced512c59d88e,d7ed20f293d7f4af578d8d8098fae6bc609fb8b7..b59159bf83805049573b32e69b43bcdc25926b41
mode 100755,100644..100755
index 8285fd832e16fbe9492cbd64cfd9604a015221f4,3932d2ec38f36f08ea209dfd50f0a32ba1b75121..3932d2ec38f36f08ea209dfd50f0a32ba1b75121
mode 100755,100644..100755
index cc8b337b9119de5e955aabe1935ad931a895c71a,d3e38790906ed889de2b78454516ec1410eb6466..d3e38790906ed889de2b78454516ec1410eb6466
mode 100755,100644..100755
index dbfaf5945e48a683c20cd87ff185dfc816b789e7,a0982e80985198004ae990218c38718d8616eec6..a0982e80985198004ae990218c38718d8616eec6
mode 100755,100644..100755
index 6c446cd6ad546839aa455d2302fff558921ea3c3,01f27c7f4236bca00615e2f4521126f3ce87b702..01f27c7f4236bca00615e2f4521126f3ce87b702
mode 100755,100644..100755
index 9edf8f692341d89ed3645459da80be221c94eeec,2220cf8defb1625a1c161f026cf5722fd7356ea2..2220cf8defb1625a1c161f026cf5722fd7356ea2
mode 100755,100644..100755
index e1628d6374126dbeda675f296fe0d7e19194466a,35b2958d51064a84950deef280a14603b1e4e0da..383080bf97627df01e26841fe8af130cfd48624c
@@@ -121,10 -120,10 +120,10 @@@ static struct regulator_ops wm8994_ldo1
        .enable = wm8994_ldo_enable,
        .disable = wm8994_ldo_disable,
        .is_enabled = wm8994_ldo_is_enabled,
 -      .enable_time = wm8994_ldo_enable_time,
 +//    .enable_time = wm8994_ldo_enable_time,
  
        .list_voltage = wm8994_ldo1_list_voltage,
-       .get_voltage = wm8994_ldo1_get_voltage,
+       .get_voltage_sel = wm8994_ldo1_get_voltage_sel,
        .set_voltage = wm8994_ldo1_set_voltage,
  };
  
@@@ -172,10 -189,10 +189,10 @@@ static struct regulator_ops wm8994_ldo2
        .enable = wm8994_ldo_enable,
        .disable = wm8994_ldo_disable,
        .is_enabled = wm8994_ldo_is_enabled,
 -      .enable_time = wm8994_ldo_enable_time,
 +//    .enable_time = wm8994_ldo_enable_time,
  
        .list_voltage = wm8994_ldo2_list_voltage,
-       .get_voltage = wm8994_ldo2_get_voltage,
+       .get_voltage_sel = wm8994_ldo2_get_voltage_sel,
        .set_voltage = wm8994_ldo2_set_voltage,
  };
  
index 48ca7132cc05da18a16c9136f3974219bce4a3d3,27c37743e2c9c33b3a046648a553b83ce56aad08..27c37743e2c9c33b3a046648a553b83ce56aad08
mode 100755,100644..100755
index 0f207b3b58339cbd4232db464de93443f2c5ba9e,7d2795810431c2f1b2f00df6233b93ac0549e342..7d2795810431c2f1b2f00df6233b93ac0549e342
mode 100755,100644..100755
Simple merge
index 9f87cbc0fb27eb6c51c72ba56790b9ceb4c15724,bdc909bd56da0f4c7c615349df6f43023bd52517..9e6a3a40d45b217f7fa2f2209395bc914bc54bb8
mode 100755,100644..100755
index 0942452ef16beae564e4a70efd1de999121d0a65,de35c3ad8a69a00e2e3f677d43864a16bfdba14b..a4d446fe8d02a85ff3673672bbf9bbc7a94f19fa
mode 100755,100644..100755
index 39aa49d0e48bcbdee0ed801f89efd1f444e8fce4,0f8c69b6b19e87bfd34538118354e792cbcb5b13..58a98b01e0c8fd4e03eea36d7418c369ee1c2738
mode 100755,100644..100755
index 90b6a3fbd36d4c8e51ba28a7ba6d16ec0e361a9e,2e13a14bba3fdd62a3ded1711de7dc75fe785dfc..2b39a90fc15d5d33603cfd922cb9f4591a375ce3
mode 100755,100644..100755
index 335311a98fdcb0d4451c8fa2bfd604f937bae637,11a4b5b3596374530c164a952899d3cebaa991b3..11a4b5b3596374530c164a952899d3cebaa991b3
mode 100755,100644..100755
index e3f1e1b6095e5e790db3b9af1de06e7e29d4f9b7,ae62e923e1b82203962f1453aec0311092d51a14..ae62e923e1b82203962f1453aec0311092d51a14
mode 100755,100644..100755
index ed48815a916b37b1d5c5ffd2aca810b863276baf,d329635fb5c4f970cace5bb91468db327a4b4326..d329635fb5c4f970cace5bb91468db327a4b4326
mode 100755,100644..100755
index e909674920fc4924cfdd98a2c2b69ff2514b3645,bb5c95c7d694584e9d10eef86006e4f782d2e3b4..bb5c95c7d694584e9d10eef86006e4f782d2e3b4
mode 100755,100644..100755
Simple merge
index e81faa5cc7d6cbce339ad8d9e4e46501304a90c6,ace9f8442e5d6505b4bdca1d828bf5337700fcb3..3fc77372b66c332ba3c18ebc2ab80c0f2d37b07d
@@@ -1920,10 -1950,15 +1950,16 @@@ int hcd_bus_suspend(struct usb_device *
  
        dev_dbg(&rhdev->dev, "bus %s%s\n",
                        (msg.event & PM_EVENT_AUTO ? "auto-" : ""), "suspend");
+       if (HCD_DEAD(hcd)) {
+               dev_dbg(&rhdev->dev, "skipped %s of dead bus\n", "suspend");
+               return 0;
+       }
        if (!hcd->driver->bus_suspend) {
 +              printk("%s,error,everest\n",__func__);
                status = -ENOENT;
        } else {
+               clear_bit(HCD_FLAG_RH_RUNNING, &hcd->flags);
                hcd->state = HC_STATE_QUIESCING;
                status = hcd->driver->bus_suspend(hcd);
        }
index ed7ec9887a0eb31937765ed3a17e5920f7368d0b,a428aa080a365e219857cd0b465aab5e67a4887b..9b07470c5f9f608c89308319dcf2c1c954bc2f3e
mode 100755,100644..100755
index 693305636c884c3a8c1721168175c66dc51aaa88,8706fc97e60f504783025b44ea1363a9623176b4..4516712c693613e754a065e830b8d9449282e581
mode 100755,100644..100755
index 86a58e4d8b85067154dd9f694ca4acd7fc6222e6,dc06da669739548c109c8002666f163c624c6aed..6182f6d0451925763728a63570b95a61843553df
mode 100755,100644..100755
index 41001603461935b88d810b83c9f7d15e9771b63f,bcdac7c73e89003e926de6c21e310d10f332cce7..dc537f1cb06b59d1675fa6f2c1ace85b238553ed
@@@ -204,10 -213,17 +219,19 @@@ static inline int usb_gadget_controller
                return 0x24;
        else if (gadget_is_r8a66597(gadget))
                return 0x25;
 +      else if (gadget_is_dwc_otg(gadget))
 +              return 0x22;
        else if (gadget_is_s3c_hsotg(gadget))
                return 0x26;
+       else if (gadget_is_pch(gadget))
+               return 0x27;
+       else if (gadget_is_ci13xxx_msm(gadget))
+               return 0x28;
+       else if (gadget_is_renesas_usbhs(gadget))
+               return 0x29;
+       else if (gadget_is_s3c_hsudc(gadget))
+               return 0x30;
        return -ENOENT;
  }
  
index 90bb0175a1526c86ff62b50d07923ae61af77c68,0ca095820f3e7ca10c98e27a4eaeea728e5c533e..0ca095820f3e7ca10c98e27a4eaeea728e5c533e
mode 100755,100644..100755
index cafde376dc1003c62ab767f2149a0efeb9c9506f,4c85a4b15f973a32eeec33bb4de8854c713011c0..975175ecb1605e320a2d672d1ef85cc5d5e5665b
mode 100755,100644..100755
index ffe6a6c7d442d167a3af72cd7909a8a3dd04a485,8b83129e209ca0f943a3d624e29930a679aec110..2ad17115b39952090ac2d9cf084172668d06e52e
mode 100755,100644..100755
@@@ -121,8 -125,8 +125,9 @@@ obj-$(CONFIG_FB_PNX4008_DUM)         += pnx40
  obj-$(CONFIG_FB_PNX4008_DUM_RGB)  += pnx4008/
  obj-$(CONFIG_FB_IBM_GXT4500)    += gxt4500.o
  obj-$(CONFIG_FB_PS3)            += ps3fb.o
 +obj-$(CONFIG_FB_RK29)             += rk29_fb.o
  obj-$(CONFIG_FB_SM501)            += sm501fb.o
+ obj-$(CONFIG_FB_UDL)            += udlfb.o
  obj-$(CONFIG_FB_XILINX)           += xilinxfb.o
  obj-$(CONFIG_SH_MIPI_DSI)       += sh_mipi_dsi.o
  obj-$(CONFIG_FB_SH_MOBILE_HDMI)         += sh_mobile_hdmi.o
Simple merge
index 31937f1b77eaa968a575f388f9476d5a2337773e,ee72adb8786ed2f9f71de431987f0f5e11da7fc5..d1a7f6e8ed389c8959a01d8d61bfde2793b65c45
@@@ -32,12 -33,8 +33,13 @@@ 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_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_ADP8860)       += adp8860_bl.o
+ obj-$(CONFIG_BACKLIGHT_ADP8870)       += adp8870_bl.o
  obj-$(CONFIG_BACKLIGHT_88PM860X) += 88pm860x_bl.o
  obj-$(CONFIG_BACKLIGHT_PCF50633)      += pcf50633-backlight.o
  
index 08fd87f3aecce368219ed7cb08dfdaa0aebafef6,d4c6eb248ff997893499a13dd2d824fe4abebabc..d4c6eb248ff997893499a13dd2d824fe4abebabc
mode 100755,100644..100755
Simple merge
index bd6b69e48f1491909be86e24acf64a51156065ca,5aac00eb1830c1724ed521f2bcc91693d9dbe646..d9369a700ddae00098e6ebc8460843f0e5e2f551
mode 100755,100644..100755
Simple merge
Simple merge
index 8c4b2d5bb7da542a364d77ac7deb9e8c5a07f1c0,871caea4e1c62d7a868cfb24593d1de7c1f244c2..871caea4e1c62d7a868cfb24593d1de7c1f244c2
mode 100755,100644..100755
diff --cc fs/block_dev.c
index 0297699eb4367596c0e7c5b77c3bb403c3868e0c,610e8e0b04b88946721eb58b78791bab0e72440b..977a97b7f0b17dadafdefd33c2eb217f322d537f
mode 100755,100644..100755
diff --cc fs/buffer.c
Simple merge
index 3a0d63c75ea4d94259ac1c6f60de5abbdc4a153f,739fb59bcdc25123f3bdc620246045ddabdac34d..6c929580f327bcc5f0391bc5a5a798d9e3dcc98e
mode 100755,100644..100755
Simple merge
Simple merge
index 783c4db807064d1a30d1c211d1b3d8adea1ea107,6a8274877171aa7959cb95e5370ccc49a626d665..0dcb6b4dc8d6f3fc7c058c3be3574df9609087de
mode 100755,100644..100755
index da3a479228af0a1efdfa7ea56754f2595a6de01b,cb4089254f01feb22fa7db68841f81e7e6b2569c..c2ccc3e4311bcbe240f481062deb82dfd13dd8c3
@@@ -38,30 -66,26 +66,28 @@@ struct vm_area_struct
   * __GFP_MOVABLE: Flag that this page will be movable by the page migration
   * mechanism or reclaimed
   */
- #define __GFP_WAIT    ((__force gfp_t)0x10u)  /* Can wait and reschedule? */
- #define __GFP_HIGH    ((__force gfp_t)0x20u)  /* Should access emergency pools? */
- #define __GFP_IO      ((__force gfp_t)0x40u)  /* Can start physical IO? */
- #define __GFP_FS      ((__force gfp_t)0x80u)  /* Can call down to low-level FS? */
- #define __GFP_COLD    ((__force gfp_t)0x100u) /* Cache-cold page required */
- #define __GFP_NOWARN  ((__force gfp_t)0x200u) /* Suppress page allocation failure warning */
- #define __GFP_REPEAT  ((__force gfp_t)0x400u) /* See above */
- #define __GFP_NOFAIL  ((__force gfp_t)0x800u) /* See above */
- #define __GFP_NORETRY ((__force gfp_t)0x1000u)/* See above */
- #define __GFP_COMP    ((__force gfp_t)0x4000u)/* Add compound page metadata */
- #define __GFP_ZERO    ((__force gfp_t)0x8000u)/* Return zeroed page on success */
- #define __GFP_NOMEMALLOC ((__force gfp_t)0x10000u) /* Don't use emergency reserves */
- #define __GFP_HARDWALL   ((__force gfp_t)0x20000u) /* Enforce hardwall cpuset memory allocs */
- #define __GFP_THISNODE        ((__force gfp_t)0x40000u)/* No fallback, no policies */
- #define __GFP_RECLAIMABLE ((__force gfp_t)0x80000u) /* Page is reclaimable */
- #ifdef CONFIG_KMEMCHECK
- #define __GFP_NOTRACK ((__force gfp_t)0x200000u)  /* Don't track with kmemcheck */
- #else
- #define __GFP_NOTRACK ((__force gfp_t)0)
- #endif
+ #define __GFP_WAIT    ((__force gfp_t)___GFP_WAIT)    /* Can wait and reschedule? */
+ #define __GFP_HIGH    ((__force gfp_t)___GFP_HIGH)    /* Should access emergency pools? */
+ #define __GFP_IO      ((__force gfp_t)___GFP_IO)      /* Can start physical IO? */
+ #define __GFP_FS      ((__force gfp_t)___GFP_FS)      /* Can call down to low-level FS? */
+ #define __GFP_COLD    ((__force gfp_t)___GFP_COLD)    /* Cache-cold page required */
+ #define __GFP_NOWARN  ((__force gfp_t)___GFP_NOWARN)  /* Suppress page allocation failure warning */
+ #define __GFP_REPEAT  ((__force gfp_t)___GFP_REPEAT)  /* See above */
+ #define __GFP_NOFAIL  ((__force gfp_t)___GFP_NOFAIL)  /* See above */
+ #define __GFP_NORETRY ((__force gfp_t)___GFP_NORETRY) /* See above */
+ #define __GFP_COMP    ((__force gfp_t)___GFP_COMP)    /* Add compound page metadata */
+ #define __GFP_ZERO    ((__force gfp_t)___GFP_ZERO)    /* Return zeroed page on success */
+ #define __GFP_NOMEMALLOC ((__force gfp_t)___GFP_NOMEMALLOC) /* Don't use emergency reserves */
+ #define __GFP_HARDWALL   ((__force gfp_t)___GFP_HARDWALL) /* Enforce hardwall cpuset memory allocs */
+ #define __GFP_THISNODE        ((__force gfp_t)___GFP_THISNODE)/* No fallback, no policies */
+ #define __GFP_RECLAIMABLE ((__force gfp_t)___GFP_RECLAIMABLE) /* Page is reclaimable */
+ #define __GFP_NOTRACK ((__force gfp_t)___GFP_NOTRACK)  /* Don't track with kmemcheck */
+ #define __GFP_NO_KSWAPD       ((__force gfp_t)___GFP_NO_KSWAPD)
+ #define __GFP_OTHER_NODE ((__force gfp_t)___GFP_OTHER_NODE) /* On behalf of other node */
  
 +#define __GFP_NO_KSWAPD       ((__force gfp_t)0x400000u)
 +
  /*
   * This may seem redundant, but it's a way of annotating false positives vs.
   * allocations that simply cannot be supported (e.g. page tables).
index 4bae0b72ed3cdba567f306bddb2a2e26326f7fc4,a6c652ef516d559dc405cefe5607d08772436e63..a6c652ef516d559dc405cefe5607d08772436e63
mode 100755,100644..100755
index fd322aca33ba89a9cec62eb7f3909f813b2267a5,ff42d700293fc71485d80f092c978fd633919b27..ff42d700293fc71485d80f092c978fd633919b27
mode 100755,100644..100755
index 6bdc9a038d6d44d87fa508235212bc8e689da3b8,6ad43554ac0521293772db9025261a854ca82593..8a63d6175a398a3c659b36c5bdb5a04c3b3f2c6b
mode 100755,100644..100755
@@@ -154,10 -311,11 +311,13 @@@ static inline void __maybe_unused remov
  #define mmc_card_readonly(c)  ((c)->state & MMC_STATE_READONLY)
  #define mmc_card_highspeed(c) ((c)->state & MMC_STATE_HIGHSPEED)
  #define mmc_card_blockaddr(c) ((c)->state & MMC_STATE_BLOCKADDR)
+ #define mmc_card_ddr_mode(c)  ((c)->state & MMC_STATE_HIGHSPEED_DDR)
+ #define mmc_sd_card_uhs(c) ((c)->state & MMC_STATE_ULTRAHIGHSPEED)
+ #define mmc_card_ext_capacity(c) ((c)->state & MMC_CARD_SDXC)
  
  #define mmc_card_set_present(c)       ((c)->state |= MMC_STATE_PRESENT)
 +#define mmc_card_clr_present(c)       ((c)->state &= ~MMC_STATE_PRESENT)
 +
  #define mmc_card_set_readonly(c) ((c)->state |= MMC_STATE_READONLY)
  #define mmc_card_set_highspeed(c) ((c)->state |= MMC_STATE_HIGHSPEED)
  #define mmc_card_set_blockaddr(c) ((c)->state |= MMC_STATE_BLOCKADDR)
index 1575b52c3bfafa663d0fcfbea24c91269dfa83cb,1584b5236bbc228bcaa3538f07b69d03c88e9511..1584b5236bbc228bcaa3538f07b69d03c88e9511
mode 100755,100644..100755
Simple merge
index c2d0e5676207ee6fa47a7f23f658143fc26831d5,1bbd9f28924564d188f2a01bc2c14a3ee49f691b..b311f20f19a9067dd534bcbcf043dafcf849ff82
mode 100755,100644..100755
@@@ -57,11 -58,12 +58,12 @@@ struct mtd_blktrans_ops 
  
        /* Access functions */
        int (*readsect)(struct mtd_blktrans_dev *dev,
 -                  unsigned long block, char *buffer);
 +                  unsigned long block,unsigned long nsect, char *buffer);
        int (*writesect)(struct mtd_blktrans_dev *dev,
 -                   unsigned long block, char *buffer);
 +                   unsigned long block,unsigned long nsect, char *buffer);
        int (*discard)(struct mtd_blktrans_dev *dev,
                       unsigned long block, unsigned nr_blocks);
+       void (*background)(struct mtd_blktrans_dev *dev);
  
        /* Block layer ioctls */
        int (*getgeo)(struct mtd_blktrans_dev *dev, struct hd_geometry *geo);
Simple merge
index ebd7472652942c116b66b5e17a8d00a6dd46b894,9e87c1cb7270ff458833471b55ead7e3a440c1a0..9e87c1cb7270ff458833471b55ead7e3a440c1a0
mode 100755,100644..100755
Simple merge
Simple merge
Simple merge
Simple merge
index 21b4428c12ab39d1846e527d40af12b9734682c2,b3edb67a83114e10af4409a46388187c84a5c53e..b3edb67a83114e10af4409a46388187c84a5c53e
mode 100755,100644..100755
index 3d8acce0017c9da74a6b1b5fcccf86ccda7c8ec1,90ed895e217d3b04eea44269ee9fc9d35da05f69..455ba9384e420856c857ff59901cf88d9c736125
mode 100755,100644..100755
Simple merge
index 83a471ba9de0273a38700444850bd2a096718bb4,e1bad1130616f1441d1aa061f048a4ea74c606e7..40f4dd276189e6232ebfc814e38f93b0c844033c
mode 100755,100644..100755
index c9276c0ac0086f27e7a9ec9e6c1deeddf337d19a,1bafe95dcf411dbd813ecff5b13aa2f2c3a074f6..ed73df1d4b17df7525313b4fab64150b1948b665
mode 100755,100644..100755
index 84695defedd353ff1de717f8528503c00a1dce01,3a4bd3a3c68d25cb2ccd6896a2750a761668937a..0cf11ec0ff3bcd47728070a9ff5826a6037f1d66
mode 100755,100644..100755
@@@ -417,30 -496,52 +496,54 @@@ struct snd_soc_ops 
        int (*hw_free)(struct snd_pcm_substream *);
        int (*prepare)(struct snd_pcm_substream *);
        int (*trigger)(struct snd_pcm_substream *, int);
 +    /* set volume,add by qiuen*/
 +      void (*set_volume)(unsigned char mode,unsigned char volume);
  };
  
- /* SoC Audio Codec */
+ /* SoC cache ops */
+ struct snd_soc_cache_ops {
+       const char *name;
+       enum snd_soc_compress_type id;
+       int (*init)(struct snd_soc_codec *codec);
+       int (*exit)(struct snd_soc_codec *codec);
+       int (*read)(struct snd_soc_codec *codec, unsigned int reg,
+               unsigned int *value);
+       int (*write)(struct snd_soc_codec *codec, unsigned int reg,
+               unsigned int value);
+       int (*sync)(struct snd_soc_codec *codec);
+ };
+ /* SoC Audio Codec device */
  struct snd_soc_codec {
-       char *name;
-       struct module *owner;
-       struct mutex mutex;
+       const char *name;
+       const char *name_prefix;
+       int id;
        struct device *dev;
-       struct snd_soc_device *socdev;
+       const struct snd_soc_codec_driver *driver;
  
+       struct mutex mutex;
+       struct snd_soc_card *card;
        struct list_head list;
-       /* callbacks */
-       int (*set_bias_level)(struct snd_soc_codec *,
-                             enum snd_soc_bias_level level);
+       struct list_head card_list;
+       int num_dai;
+       enum snd_soc_compress_type compress_type;
+       size_t reg_size;        /* reg_cache_size * reg_word_size */
+       int (*volatile_register)(struct snd_soc_codec *, unsigned int);
+       int (*readable_register)(struct snd_soc_codec *, unsigned int);
+       int (*writable_register)(struct snd_soc_codec *, unsigned int);
  
        /* runtime */
-       struct snd_card *card;
        struct snd_ac97 *ac97;  /* for ad-hoc ac97 devices */
        unsigned int active;
-       unsigned int pcm_devs;
-       void *drvdata;
+       unsigned int cache_bypass:1; /* Suppress access to the cache */
+       unsigned int suspended:1; /* Codec is in suspend PM state */
+       unsigned int probed:1; /* Codec has been probed */
+       unsigned int ac97_registered:1; /* Codec has been AC97 registered */
+       unsigned int ac97_created:1; /* Codec has been created by SoC */
+       unsigned int sysfs_registered:1; /* codec has been sysfs registered */
+       unsigned int cache_init:1; /* codec cache has been initialized */
+       u32 cache_only;  /* Suppress writes to hardware */
+       u32 cache_sync; /* Cache needs to be synced to hardware */
  
        /* codec IO */
        void *control_data; /* codec control (i2c/3wire) data */
diff --cc init/Kconfig
index 9921944cbdefa40ba36daf4e3d9d33ccfc9603d7,4fe9168149fce13e7c171ee5f61a9636bbdc1b73..df8ea4f32c45b8a4aae71980dfabcf44eed67fa3
@@@ -128,9 -132,8 +132,9 @@@ config HAVE_KERNEL_LZ
  
  choice
        prompt "Kernel compression mode"
 +      default KERNEL_LZO if ARCH_RK29
        default KERNEL_GZIP
-       depends on HAVE_KERNEL_GZIP || HAVE_KERNEL_BZIP2 || HAVE_KERNEL_LZMA || HAVE_KERNEL_LZO
+       depends on HAVE_KERNEL_GZIP || HAVE_KERNEL_BZIP2 || HAVE_KERNEL_LZMA || HAVE_KERNEL_XZ || HAVE_KERNEL_LZO
        help
          The linux kernel is a kind of self-extracting executable.
          Several compression algorithms are available, which differ
Simple merge
diff --cc kernel/module.c
Simple merge
diff --cc kernel/printk.c
Simple merge
index 7dca91bb8c576397e571994655efbe9d1832d7b6,c2486a53714e17d73174ebbfcf1130e136ec3622..c2486a53714e17d73174ebbfcf1130e136ec3622
mode 100755,100644..100755
Simple merge
index 081568771b0aeffbd6bd883b3e838599d8fcd807,1c6be91dfb9887ea1b3634735858e27757c42e21..b726f6723460cfe99e0cc169d10c9dc39b662df0
mode 100755,100644..100755
index 9d4647a083b3196e78135d578a04981c7d667136,8224db5f0434ffa7c16b93899f06401ae7c9ed3b..aab26f2a16756637f877ffd548e82cf7674d7532
@@@ -35,12 -50,14 +50,14 @@@ source "sound/soc/jz4740/Kconfig
  source "sound/soc/nuc900/Kconfig"
  source "sound/soc/omap/Kconfig"
  source "sound/soc/kirkwood/Kconfig"
+ source "sound/soc/mid-x86/Kconfig"
  source "sound/soc/pxa/Kconfig"
- source "sound/soc/s3c24xx/Kconfig"
+ source "sound/soc/samsung/Kconfig"
  source "sound/soc/s6000/Kconfig"
  source "sound/soc/sh/Kconfig"
+ source "sound/soc/tegra/Kconfig"
  source "sound/soc/txx9/Kconfig"
 -
 +source "sound/soc/rk29/Kconfig"
  # Supported codecs
  source "sound/soc/codecs/Kconfig"
  
index 43b638f2ee4b7517309b4d7d12cd739ff722acc2,1ed61c5df2c583f655d5dedb1c4041f840c8cae1..7cd623ead431613bf1950d991496b53cbcde0a2a
@@@ -14,8 -15,8 +15,9 @@@ obj-$(CONFIG_SND_SOC) += nuc900
  obj-$(CONFIG_SND_SOC) += omap/
  obj-$(CONFIG_SND_SOC) += kirkwood/
  obj-$(CONFIG_SND_SOC) += pxa/
- obj-$(CONFIG_SND_SOC) += s3c24xx/
+ obj-$(CONFIG_SND_SOC) += samsung/
  obj-$(CONFIG_SND_SOC) += s6000/
  obj-$(CONFIG_SND_SOC) += sh/
+ obj-$(CONFIG_SND_SOC) += tegra/
  obj-$(CONFIG_SND_SOC) += txx9/
 +obj-$(CONFIG_SND_SOC) += rk29/
index 5da17a704e5a9ba2d40d27a14b24a0fff701594e,449ea09a193d6800596c481eb564bee1e35d2997..449ea09a193d6800596c481eb564bee1e35d2997
mode 100755,100644..100755
index 522249d5c2b463d9917e751bc0cac0fa9711c1da,83014a7c2e142ccf0a63cafa3c38519b4f2fd5c8..83014a7c2e142ccf0a63cafa3c38519b4f2fd5c8
mode 100755,100644..100755
index 2e0ca67a8df7ad8f83c83c822190ae09d9395acf,0a1db04b73bd7e97e20f61349528c108fa831a3c..0a1db04b73bd7e97e20f61349528c108fa831a3c
mode 100755,100644..100755
index 2cb81538cd9194c9cc278515171d67a45ac39ca6,9e370d14ad88f2bce72ccd0ce1204eb01bd854fa..9e370d14ad88f2bce72ccd0ce1204eb01bd854fa
mode 100755,100644..100755
index e51c16683589ffb612f3ec58761f01ea24c7223e,f8a5e976b5e6e3fcd755a224e54c36e3f2415841..f8a5e976b5e6e3fcd755a224e54c36e3f2415841
mode 100755,100644..100755