Conflicts: Makefile arch/arm/Kconfig arch/arm/Makefile arch/arm/common/Kconfig arch/arm/common/Makefile arch/arm/common/pl330.c arch/arm/include/asm/dma.h arch/arm/include/asm/memory.h arch/arm/kernel/Makefile arch/arm/kernel/dma.c arch/arm/kernel/process.c arch/arm/mm/Kconfig arch/arm/mm/mmu.c arch/arm/mm/proc-v7.S arch/arm/oprofile/op_model_v7.c arch/arm/tools/mach-types block/blk-core.c drivers/base/firmware_class.c drivers/base/platform.c drivers/bluetooth/Kconfig drivers/bluetooth/hci_h4.c drivers/char/Makefile drivers/gpio/Kconfig drivers/gpio/Makefile drivers/gpio/gpiolib.c drivers/gpio/wm831x-gpio.c drivers/gpio/wm8994-gpio.c drivers/i2c/busses/Kconfig drivers/i2c/busses/Makefile drivers/i2c/i2c-core.c drivers/input/keyboard/Kconfig drivers/input/keyboard/Makefile drivers/input/keyboard/matrix_keypad.c drivers/input/misc/Kconfig drivers/input/misc/Makefile drivers/input/misc/wm831x-on.c 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/soc_camera.c drivers/media/video/uvc/uvc_queue.c drivers/mfd/Kconfig drivers/mfd/Makefile drivers/mfd/wm831x-core.c drivers/mfd/wm831x-irq.c drivers/mfd/wm8994-core.c drivers/misc/Kconfig drivers/misc/Makefile drivers/mmc/core/sdio_io.c drivers/mtd/mtd_blkdevs.c drivers/mtd/mtdblock.c drivers/mtd/nand/Makefile drivers/net/dm9000.c drivers/net/irda/Kconfig drivers/net/usb/Kconfig drivers/net/usb/Makefile drivers/net/wireless/Kconfig drivers/net/wireless/Makefile drivers/net/wireless/adm8211.c drivers/net/wireless/adm8211.h 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/ar9170/Kconfig drivers/net/wireless/ath/ar9170/ar9170.h drivers/net/wireless/ath/ar9170/cmd.c drivers/net/wireless/ath/ar9170/cmd.h drivers/net/wireless/ath/ar9170/eeprom.h drivers/net/wireless/ath/ar9170/hw.h drivers/net/wireless/ath/ar9170/led.c drivers/net/wireless/ath/ar9170/mac.c drivers/net/wireless/ath/ar9170/main.c drivers/net/wireless/ath/ar9170/phy.c drivers/net/wireless/ath/ar9170/usb.c drivers/net/wireless/ath/ar9170/usb.h drivers/net/wireless/ath/ath.h drivers/net/wireless/ath/ath5k/Kconfig drivers/net/wireless/ath/ath5k/Makefile 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/gpio.c 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/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/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/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/hw.c drivers/net/wireless/ath/ath9k/hw.h 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/virtual.c drivers/net/wireless/ath/ath9k/xmit.c 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/atmel_pci.c drivers/net/wireless/b43/Kconfig drivers/net/wireless/b43/Makefile drivers/net/wireless/b43/b43.h 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/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_lp.c drivers/net/wireless/b43/phy_lp.h drivers/net/wireless/b43/phy_n.c drivers/net/wireless/b43/phy_n.h drivers/net/wireless/b43/pio.c drivers/net/wireless/b43/pio.h drivers/net/wireless/b43/rfkill.c drivers/net/wireless/b43/sdio.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/Kconfig drivers/net/wireless/b43legacy/b43legacy.h drivers/net/wireless/b43legacy/dma.c drivers/net/wireless/b43legacy/dma.h drivers/net/wireless/b43legacy/leds.h drivers/net/wireless/b43legacy/main.c drivers/net/wireless/b43legacy/phy.c drivers/net/wireless/b43legacy/pio.c drivers/net/wireless/b43legacy/pio.h drivers/net/wireless/b43legacy/rfkill.c drivers/net/wireless/b43legacy/xmit.c drivers/net/wireless/b43legacy/xmit.h drivers/net/wireless/bcm4329/Kconfig drivers/net/wireless/bcm4329/Makefile drivers/net/wireless/bcm4329/bcmsdh_linux.c drivers/net/wireless/bcm4329/bcmsdh_sdmmc_linux.c drivers/net/wireless/bcm4329/dhd.h drivers/net/wireless/bcm4329/dhd_cdc.c drivers/net/wireless/bcm4329/dhd_common.c drivers/net/wireless/bcm4329/dhd_custom_gpio.c drivers/net/wireless/bcm4329/dhd_linux.c drivers/net/wireless/bcm4329/dhd_sdio.c drivers/net/wireless/bcm4329/include/epivers.h drivers/net/wireless/bcm4329/include/wlioctl.h drivers/net/wireless/bcm4329/linux_osl.c drivers/net/wireless/bcm4329/wl_iw.c drivers/net/wireless/bcm4329/wl_iw.h drivers/net/wireless/hostap/Kconfig drivers/net/wireless/hostap/hostap_80211.h drivers/net/wireless/hostap/hostap_80211_rx.c drivers/net/wireless/hostap/hostap_80211_tx.c drivers/net/wireless/hostap/hostap_ap.c drivers/net/wireless/hostap/hostap_common.h drivers/net/wireless/hostap/hostap_cs.c drivers/net/wireless/hostap/hostap_download.c drivers/net/wireless/hostap/hostap_hw.c drivers/net/wireless/hostap/hostap_info.c drivers/net/wireless/hostap/hostap_ioctl.c drivers/net/wireless/hostap/hostap_main.c drivers/net/wireless/hostap/hostap_pci.c drivers/net/wireless/hostap/hostap_plx.c drivers/net/wireless/hostap/hostap_wlan.h drivers/net/wireless/ipw2x00/Kconfig 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.h drivers/net/wireless/ipw2x00/libipw_geo.c drivers/net/wireless/ipw2x00/libipw_module.c drivers/net/wireless/ipw2x00/libipw_rx.c drivers/net/wireless/ipw2x00/libipw_tx.c drivers/net/wireless/ipw2x00/libipw_wx.c drivers/net/wireless/iwlwifi/Kconfig drivers/net/wireless/iwlwifi/Makefile drivers/net/wireless/iwlwifi/iwl-1000.c drivers/net/wireless/iwlwifi/iwl-3945-fh.h drivers/net/wireless/iwlwifi/iwl-3945-hw.h drivers/net/wireless/iwlwifi/iwl-3945-led.c drivers/net/wireless/iwlwifi/iwl-3945-led.h drivers/net/wireless/iwlwifi/iwl-3945-rs.c drivers/net/wireless/iwlwifi/iwl-3945.c drivers/net/wireless/iwlwifi/iwl-3945.h drivers/net/wireless/iwlwifi/iwl-4965-hw.h drivers/net/wireless/iwlwifi/iwl-4965.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-rs.c drivers/net/wireless/iwlwifi/iwl-agn-rs.h drivers/net/wireless/iwlwifi/iwl-agn.c drivers/net/wireless/iwlwifi/iwl-calib.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-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-spectrum.h drivers/net/wireless/iwlwifi/iwl-sta.c drivers/net/wireless/iwlwifi/iwl-sta.h drivers/net/wireless/iwlwifi/iwl-tx.c drivers/net/wireless/iwlwifi/iwl3945-base.c drivers/net/wireless/iwmc3200wifi/Kconfig drivers/net/wireless/iwmc3200wifi/Makefile drivers/net/wireless/iwmc3200wifi/bus.h drivers/net/wireless/iwmc3200wifi/cfg80211.c drivers/net/wireless/iwmc3200wifi/commands.c drivers/net/wireless/iwmc3200wifi/commands.h drivers/net/wireless/iwmc3200wifi/debug.h drivers/net/wireless/iwmc3200wifi/debugfs.c drivers/net/wireless/iwmc3200wifi/eeprom.c drivers/net/wireless/iwmc3200wifi/eeprom.h drivers/net/wireless/iwmc3200wifi/fw.c drivers/net/wireless/iwmc3200wifi/hal.c drivers/net/wireless/iwmc3200wifi/hal.h drivers/net/wireless/iwmc3200wifi/iwm.h drivers/net/wireless/iwmc3200wifi/lmac.h drivers/net/wireless/iwmc3200wifi/main.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/iwmc3200wifi/umac.h drivers/net/wireless/libertas/Makefile drivers/net/wireless/libertas/README drivers/net/wireless/libertas/cmd.c drivers/net/wireless/libertas/cmd.h 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_usb.c drivers/net/wireless/libertas/main.c drivers/net/wireless/libertas/radiotap.h drivers/net/wireless/libertas/rx.c drivers/net/wireless/libertas/tx.c drivers/net/wireless/libertas/types.h drivers/net/wireless/libertas_tf/cmd.c drivers/net/wireless/libertas_tf/if_usb.c drivers/net/wireless/libertas_tf/libertas_tf.h drivers/net/wireless/libertas_tf/main.c drivers/net/wireless/mac80211_hwsim.c drivers/net/wireless/mv8686/scan.h drivers/net/wireless/mv8686/wext.h drivers/net/wireless/mwl8k.c drivers/net/wireless/orinoco/Kconfig drivers/net/wireless/orinoco/Makefile drivers/net/wireless/orinoco/airport.c drivers/net/wireless/orinoco/cfg.c drivers/net/wireless/orinoco/fw.c drivers/net/wireless/orinoco/hermes.c drivers/net/wireless/orinoco/hermes.h drivers/net/wireless/orinoco/hermes_dld.c drivers/net/wireless/orinoco/hw.c drivers/net/wireless/orinoco/hw.h drivers/net/wireless/orinoco/main.c drivers/net/wireless/orinoco/main.h drivers/net/wireless/orinoco/orinoco.h drivers/net/wireless/orinoco/orinoco_cs.c drivers/net/wireless/orinoco/orinoco_nortel.c drivers/net/wireless/orinoco/orinoco_pci.c drivers/net/wireless/orinoco/orinoco_plx.c drivers/net/wireless/orinoco/orinoco_tmd.c drivers/net/wireless/orinoco/scan.c 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/fwio.c drivers/net/wireless/p54/led.c drivers/net/wireless/p54/main.c drivers/net/wireless/p54/net2280.h drivers/net/wireless/p54/p54.h drivers/net/wireless/p54/p54pci.c drivers/net/wireless/p54/p54pci.h drivers/net/wireless/p54/p54spi.c drivers/net/wireless/p54/p54spi.h drivers/net/wireless/p54/p54usb.c drivers/net/wireless/p54/p54usb.h drivers/net/wireless/p54/txrx.c drivers/net/wireless/prism54/isl_ioctl.c drivers/net/wireless/prism54/isl_oid.h drivers/net/wireless/prism54/islpci_dev.c drivers/net/wireless/prism54/islpci_eth.c drivers/net/wireless/prism54/islpci_eth.h drivers/net/wireless/prism54/islpci_hotplug.c drivers/net/wireless/prism54/islpci_mgt.c drivers/net/wireless/prism54/islpci_mgt.h drivers/net/wireless/prism54/oid_mgt.c drivers/net/wireless/ray_cs.c drivers/net/wireless/ray_cs.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/rt2500usb.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/rt2x00debug.h drivers/net/wireless/rt2x00/rt2x00dev.c drivers/net/wireless/rt2x00/rt2x00dump.h drivers/net/wireless/rt2x00/rt2x00firmware.c drivers/net/wireless/rt2x00/rt2x00ht.c drivers/net/wireless/rt2x00/rt2x00leds.c drivers/net/wireless/rt2x00/rt2x00leds.h 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/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/rtl8180.h drivers/net/wireless/rtl818x/rtl8180_dev.c drivers/net/wireless/rtl818x/rtl8180_grf5101.c drivers/net/wireless/rtl818x/rtl8180_max2820.c drivers/net/wireless/rtl818x/rtl8180_rtl8225.c drivers/net/wireless/rtl818x/rtl8180_sa2400.c drivers/net/wireless/rtl818x/rtl8187.h drivers/net/wireless/rtl818x/rtl8187_dev.c drivers/net/wireless/rtl818x/rtl8187_leds.c drivers/net/wireless/rtl818x/rtl8187_leds.h drivers/net/wireless/rtl818x/rtl8187_rfkill.c drivers/net/wireless/rtl818x/rtl8187_rtl8225.c drivers/net/wireless/rtl818x/rtl818x.h drivers/net/wireless/wl12xx/Kconfig drivers/net/wireless/wl12xx/Makefile drivers/net/wireless/wl12xx/wl1251.h drivers/net/wireless/wl12xx/wl1251_acx.c drivers/net/wireless/wl12xx/wl1251_acx.h drivers/net/wireless/wl12xx/wl1251_boot.c drivers/net/wireless/wl12xx/wl1251_cmd.c drivers/net/wireless/wl12xx/wl1251_cmd.h drivers/net/wireless/wl12xx/wl1251_debugfs.c drivers/net/wireless/wl12xx/wl1251_event.c drivers/net/wireless/wl12xx/wl1251_event.h drivers/net/wireless/wl12xx/wl1251_init.c drivers/net/wireless/wl12xx/wl1251_init.h drivers/net/wireless/wl12xx/wl1251_io.h drivers/net/wireless/wl12xx/wl1251_main.c drivers/net/wireless/wl12xx/wl1251_ps.c drivers/net/wireless/wl12xx/wl1251_ps.h drivers/net/wireless/wl12xx/wl1251_reg.h drivers/net/wireless/wl12xx/wl1251_rx.c drivers/net/wireless/wl12xx/wl1251_rx.h drivers/net/wireless/wl12xx/wl1251_sdio.c drivers/net/wireless/wl12xx/wl1251_spi.c drivers/net/wireless/wl12xx/wl1251_tx.c drivers/net/wireless/wl12xx/wl1251_tx.h drivers/net/wireless/wl12xx/wl1271.h drivers/net/wireless/wl12xx/wl1271_acx.c drivers/net/wireless/wl12xx/wl1271_acx.h drivers/net/wireless/wl12xx/wl1271_boot.c drivers/net/wireless/wl12xx/wl1271_boot.h drivers/net/wireless/wl12xx/wl1271_cmd.c drivers/net/wireless/wl12xx/wl1271_cmd.h drivers/net/wireless/wl12xx/wl1271_debugfs.c drivers/net/wireless/wl12xx/wl1271_event.c drivers/net/wireless/wl12xx/wl1271_event.h drivers/net/wireless/wl12xx/wl1271_init.c drivers/net/wireless/wl12xx/wl1271_init.h drivers/net/wireless/wl12xx/wl1271_main.c drivers/net/wireless/wl12xx/wl1271_ps.c drivers/net/wireless/wl12xx/wl1271_ps.h drivers/net/wireless/wl12xx/wl1271_reg.h drivers/net/wireless/wl12xx/wl1271_rx.c drivers/net/wireless/wl12xx/wl1271_rx.h drivers/net/wireless/wl12xx/wl1271_spi.c drivers/net/wireless/wl12xx/wl1271_tx.c drivers/net/wireless/wl12xx/wl1271_tx.h drivers/net/wireless/wl12xx/wl12xx_80211.h drivers/net/wireless/wl3501.h drivers/net/wireless/wl3501_cs.c drivers/net/wireless/zd1201.c drivers/net/wireless/zd1211rw/Kconfig drivers/net/wireless/zd1211rw/zd_chip.c drivers/net/wireless/zd1211rw/zd_chip.h drivers/net/wireless/zd1211rw/zd_mac.c drivers/net/wireless/zd1211rw/zd_mac.h drivers/net/wireless/zd1211rw/zd_rf_uw2453.c drivers/net/wireless/zd1211rw/zd_usb.c drivers/net/wireless/zd1211rw/zd_usb.h drivers/power/Kconfig drivers/power/Makefile drivers/power/wm831x_backup.c drivers/power/wm831x_power.c drivers/regulator/Kconfig drivers/regulator/Makefile drivers/regulator/wm831x-dcdc.c drivers/regulator/wm8994-regulator.c drivers/rtc/Makefile drivers/rtc/rtc-wm831x.c drivers/serial/Kconfig drivers/spi/Kconfig drivers/spi/Makefile drivers/staging/Kconfig drivers/staging/Makefile drivers/staging/dream/Kconfig drivers/staging/iio/Kconfig drivers/staging/iio/Makefile drivers/usb/core/hub.c drivers/usb/gadget/gadget_chips.h drivers/video/Kconfig drivers/video/backlight/Kconfig drivers/video/backlight/Makefile drivers/video/backlight/wm831x_bl.c drivers/watchdog/Kconfig drivers/watchdog/Makefile fs/partitions/check.c include/asm-generic/gpio.h include/linux/fb.h include/linux/i82593.h include/linux/l3g4200d.h include/linux/mfd/wm831x/core.h include/linux/mfd/wm831x/pdata.h include/linux/mfd/wm8994/core.h include/linux/mfd/wm8994/gpio.h include/linux/mfd/wm8994/pdata.h include/linux/mmc/card.h include/linux/mmc/host.h include/linux/mtd/nand.h include/linux/serial_core.h include/linux/videodev2.h include/media/v4l2-chip-ident.h include/sound/soc-dai.h include/sound/soc-dapm.h 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-dapm.c
606 lines
24 KiB
C
Executable file
606 lines
24 KiB
C
Executable file
/* ------------------------------------------------------------------------- */
|
|
/* */
|
|
/* i2c.h - definitions for the i2c-bus interface */
|
|
/* */
|
|
/* ------------------------------------------------------------------------- */
|
|
/* Copyright (C) 1995-2000 Simon G. Vogl
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
|
|
/* ------------------------------------------------------------------------- */
|
|
|
|
/* With some changes from Kyösti Mälkki <kmalkki@cc.hut.fi> and
|
|
Frodo Looijaard <frodol@dds.nl> */
|
|
|
|
#ifndef _LINUX_I2C_H
|
|
#define _LINUX_I2C_H
|
|
|
|
#include <linux/types.h>
|
|
#ifdef __KERNEL__
|
|
#include <linux/module.h>
|
|
#include <linux/i2c-id.h>
|
|
#include <linux/mod_devicetable.h>
|
|
#include <linux/device.h> /* for struct device */
|
|
#include <linux/sched.h> /* for completion */
|
|
#include <linux/mutex.h>
|
|
#include <linux/of.h> /* for struct device_node */
|
|
|
|
extern struct bus_type i2c_bus_type;
|
|
extern struct device_type i2c_adapter_type;
|
|
|
|
/* --- General options ------------------------------------------------ */
|
|
|
|
struct i2c_msg;
|
|
struct i2c_algorithm;
|
|
struct i2c_adapter;
|
|
struct i2c_client;
|
|
struct i2c_driver;
|
|
union i2c_smbus_data;
|
|
struct i2c_board_info;
|
|
|
|
#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
|
|
/*
|
|
* The master routines are the ones normally used to transmit data to devices
|
|
* on a bus (or read from them). Apart from two basic transfer functions to
|
|
* transmit one message at a time, a more complex version can be used to
|
|
* transmit an arbitrary number of messages without interruption.
|
|
* @count must be be less than 64k since msg.len is u16.
|
|
*/
|
|
#if defined (CONFIG_I2C_RK2818) || defined(CONFIG_I2C_RK29)
|
|
/* If everything went ok, return 'count' transmitted, else error code. */
|
|
extern int i2c_master_normal_send(struct i2c_client *client,const char *buf ,int count, int scl_rate);
|
|
extern int i2c_master_normal_recv(struct i2c_client *client, char *buf ,int count, int scl_rate);
|
|
extern int i2c_master_reg8_send(struct i2c_client *client, const char reg, const char *buf, int count, int scl_rate);
|
|
extern int i2c_master_reg8_recv(struct i2c_client *client, const char reg, char *buf, int count, int scl_rate);
|
|
extern int i2c_master_reg16_send(struct i2c_client *client, const short regs, const short *buf, int count, int scl_rate);
|
|
extern int i2c_master_reg16_recv(struct i2c_client *client, const short regs, short *buf, int count, int scl_rate);
|
|
extern int i2c_suspended(struct i2c_adapter *adap);
|
|
#endif
|
|
|
|
extern int i2c_master_send(struct i2c_client *client, const char *buf,
|
|
int count);
|
|
extern int i2c_master_recv(struct i2c_client *client, char *buf, int count);
|
|
|
|
/* Transfer num messages.
|
|
*/
|
|
extern int i2c_transfer(struct i2c_adapter *adap, struct i2c_msg *msgs,
|
|
int num);
|
|
|
|
/* This is the very generalized SMBus access routine. You probably do not
|
|
want to use this, though; one of the functions below may be much easier,
|
|
and probably just as fast.
|
|
Note that we use i2c_adapter here, because you do not need a specific
|
|
smbus adapter to call this function. */
|
|
extern s32 i2c_smbus_xfer(struct i2c_adapter *adapter, u16 addr,
|
|
unsigned short flags, char read_write, u8 command,
|
|
int size, union i2c_smbus_data *data);
|
|
|
|
/* Now follow the 'nice' access routines. These also document the calling
|
|
conventions of i2c_smbus_xfer. */
|
|
|
|
extern s32 i2c_smbus_read_byte(struct i2c_client *client);
|
|
extern s32 i2c_smbus_write_byte(struct i2c_client *client, u8 value);
|
|
extern s32 i2c_smbus_read_byte_data(struct i2c_client *client, u8 command);
|
|
extern s32 i2c_smbus_write_byte_data(struct i2c_client *client,
|
|
u8 command, u8 value);
|
|
extern s32 i2c_smbus_read_word_data(struct i2c_client *client, u8 command);
|
|
extern s32 i2c_smbus_write_word_data(struct i2c_client *client,
|
|
u8 command, u16 value);
|
|
/* Returns the number of read bytes */
|
|
extern s32 i2c_smbus_read_block_data(struct i2c_client *client,
|
|
u8 command, u8 *values);
|
|
extern s32 i2c_smbus_write_block_data(struct i2c_client *client,
|
|
u8 command, u8 length, const u8 *values);
|
|
/* Returns the number of read bytes */
|
|
extern s32 i2c_smbus_read_i2c_block_data(struct i2c_client *client,
|
|
u8 command, u8 length, u8 *values);
|
|
extern s32 i2c_smbus_write_i2c_block_data(struct i2c_client *client,
|
|
u8 command, u8 length,
|
|
const u8 *values);
|
|
#endif /* I2C */
|
|
|
|
/**
|
|
* struct i2c_driver - represent an I2C device driver
|
|
* @class: What kind of i2c device we instantiate (for detect)
|
|
* @attach_adapter: Callback for bus addition (for legacy drivers)
|
|
* @detach_adapter: Callback for bus removal (for legacy drivers)
|
|
* @probe: Callback for device binding
|
|
* @remove: Callback for device unbinding
|
|
* @shutdown: Callback for device shutdown
|
|
* @suspend: Callback for device suspend
|
|
* @resume: Callback for device resume
|
|
* @alert: Alert callback, for example for the SMBus alert protocol
|
|
* @command: Callback for bus-wide signaling (optional)
|
|
* @driver: Device driver model driver
|
|
* @id_table: List of I2C devices supported by this driver
|
|
* @detect: Callback for device detection
|
|
* @address_list: The I2C addresses to probe (for detect)
|
|
* @clients: List of detected clients we created (for i2c-core use only)
|
|
*
|
|
* The driver.owner field should be set to the module owner of this driver.
|
|
* The driver.name field should be set to the name of this driver.
|
|
*
|
|
* For automatic device detection, both @detect and @address_data must
|
|
* be defined. @class should also be set, otherwise only devices forced
|
|
* with module parameters will be created. The detect function must
|
|
* fill at least the name field of the i2c_board_info structure it is
|
|
* handed upon successful detection, and possibly also the flags field.
|
|
*
|
|
* If @detect is missing, the driver will still work fine for enumerated
|
|
* devices. Detected devices simply won't be supported. This is expected
|
|
* for the many I2C/SMBus devices which can't be detected reliably, and
|
|
* the ones which can always be enumerated in practice.
|
|
*
|
|
* The i2c_client structure which is handed to the @detect callback is
|
|
* not a real i2c_client. It is initialized just enough so that you can
|
|
* call i2c_smbus_read_byte_data and friends on it. Don't do anything
|
|
* else with it. In particular, calling dev_dbg and friends on it is
|
|
* not allowed.
|
|
*/
|
|
struct i2c_driver {
|
|
unsigned int class;
|
|
|
|
/* Notifies the driver that a new bus has appeared or is about to be
|
|
* removed. You should avoid using this if you can, it will probably
|
|
* be removed in a near future.
|
|
*/
|
|
int (*attach_adapter)(struct i2c_adapter *);
|
|
int (*detach_adapter)(struct i2c_adapter *);
|
|
|
|
/* Standard driver model interfaces */
|
|
int (*probe)(struct i2c_client *, const struct i2c_device_id *);
|
|
int (*remove)(struct i2c_client *);
|
|
|
|
/* driver model interfaces that don't relate to enumeration */
|
|
void (*shutdown)(struct i2c_client *);
|
|
int (*suspend)(struct i2c_client *, pm_message_t mesg);
|
|
int (*resume)(struct i2c_client *);
|
|
|
|
/* Alert callback, for example for the SMBus alert protocol.
|
|
* The format and meaning of the data value depends on the protocol.
|
|
* For the SMBus alert protocol, there is a single bit of data passed
|
|
* as the alert response's low bit ("event flag").
|
|
*/
|
|
void (*alert)(struct i2c_client *, unsigned int data);
|
|
|
|
/* a ioctl like command that can be used to perform specific functions
|
|
* with the device.
|
|
*/
|
|
int (*command)(struct i2c_client *client, unsigned int cmd, void *arg);
|
|
|
|
struct device_driver driver;
|
|
const struct i2c_device_id *id_table;
|
|
|
|
/* Device detection callback for automatic device creation */
|
|
int (*detect)(struct i2c_client *, struct i2c_board_info *);
|
|
const unsigned short *address_list;
|
|
struct list_head clients;
|
|
};
|
|
#define to_i2c_driver(d) container_of(d, struct i2c_driver, driver)
|
|
|
|
/**
|
|
* struct i2c_client - represent an I2C slave device
|
|
* @flags: I2C_CLIENT_TEN indicates the device uses a ten bit chip address;
|
|
* I2C_CLIENT_PEC indicates it uses SMBus Packet Error Checking
|
|
* @addr: Address used on the I2C bus connected to the parent adapter.
|
|
* @name: Indicates the type of the device, usually a chip name that's
|
|
* generic enough to hide second-sourcing and compatible revisions.
|
|
* @adapter: manages the bus segment hosting this I2C device
|
|
* @driver: device's driver, hence pointer to access routines
|
|
* @dev: Driver model device node for the slave.
|
|
* @irq: indicates the IRQ generated by this device (if any)
|
|
* @detected: member of an i2c_driver.clients list or i2c-core's
|
|
* userspace_devices list
|
|
*
|
|
* An i2c_client identifies a single device (i.e. chip) connected to an
|
|
* i2c bus. The behaviour exposed to Linux is defined by the driver
|
|
* managing the device.
|
|
*/
|
|
struct i2c_client {
|
|
unsigned short flags; /* div., see below */
|
|
unsigned short addr; /* chip address - NOTE: 7bit */
|
|
/* addresses are stored in the */
|
|
/* _LOWER_ 7 bits */
|
|
char name[I2C_NAME_SIZE];
|
|
struct i2c_adapter *adapter; /* the adapter we sit on */
|
|
struct i2c_driver *driver; /* and our access routines */
|
|
struct device dev; /* the device structure */
|
|
int irq; /* irq issued by device */
|
|
int udelay;
|
|
struct list_head detected;
|
|
};
|
|
#define to_i2c_client(d) container_of(d, struct i2c_client, dev)
|
|
|
|
extern struct i2c_client *i2c_verify_client(struct device *dev);
|
|
|
|
static inline struct i2c_client *kobj_to_i2c_client(struct kobject *kobj)
|
|
{
|
|
struct device * const dev = container_of(kobj, struct device, kobj);
|
|
return to_i2c_client(dev);
|
|
}
|
|
|
|
static inline void *i2c_get_clientdata(const struct i2c_client *dev)
|
|
{
|
|
return dev_get_drvdata(&dev->dev);
|
|
}
|
|
|
|
static inline void i2c_set_clientdata(struct i2c_client *dev, void *data)
|
|
{
|
|
dev_set_drvdata(&dev->dev, data);
|
|
}
|
|
|
|
/**
|
|
* struct i2c_board_info - template for device creation
|
|
* @type: chip type, to initialize i2c_client.name
|
|
* @flags: to initialize i2c_client.flags
|
|
* @addr: stored in i2c_client.addr
|
|
* @platform_data: stored in i2c_client.dev.platform_data
|
|
* @archdata: copied into i2c_client.dev.archdata
|
|
* @of_node: pointer to OpenFirmware device node
|
|
* @irq: stored in i2c_client.irq
|
|
*
|
|
* I2C doesn't actually support hardware probing, although controllers and
|
|
* devices may be able to use I2C_SMBUS_QUICK to tell whether or not there's
|
|
* a device at a given address. Drivers commonly need more information than
|
|
* that, such as chip type, configuration, associated IRQ, and so on.
|
|
*
|
|
* i2c_board_info is used to build tables of information listing I2C devices
|
|
* that are present. This information is used to grow the driver model tree.
|
|
* For mainboards this is done statically using i2c_register_board_info();
|
|
* bus numbers identify adapters that aren't yet available. For add-on boards,
|
|
* i2c_new_device() does this dynamically with the adapter already known.
|
|
*/
|
|
struct i2c_board_info {
|
|
char type[I2C_NAME_SIZE];
|
|
unsigned short flags;
|
|
unsigned short addr;
|
|
void *platform_data;
|
|
struct dev_archdata *archdata;
|
|
#ifdef CONFIG_OF
|
|
struct device_node *of_node;
|
|
#endif
|
|
int irq;
|
|
int udelay; //add by kfx
|
|
};
|
|
|
|
/**
|
|
* I2C_BOARD_INFO - macro used to list an i2c device and its address
|
|
* @dev_type: identifies the device type
|
|
* @dev_addr: the device's address on the bus.
|
|
*
|
|
* This macro initializes essential fields of a struct i2c_board_info,
|
|
* declaring what has been provided on a particular board. Optional
|
|
* fields (such as associated irq, or device-specific platform_data)
|
|
* are provided using conventional syntax.
|
|
*/
|
|
#define I2C_BOARD_INFO(dev_type, dev_addr) \
|
|
.type = dev_type, .addr = (dev_addr)
|
|
|
|
|
|
#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
|
|
/* Add-on boards should register/unregister their devices; e.g. a board
|
|
* with integrated I2C, a config eeprom, sensors, and a codec that's
|
|
* used in conjunction with the primary hardware.
|
|
*/
|
|
extern struct i2c_client *
|
|
i2c_new_device(struct i2c_adapter *adap, struct i2c_board_info const *info);
|
|
|
|
/* If you don't know the exact address of an I2C device, use this variant
|
|
* instead, which can probe for device presence in a list of possible
|
|
* addresses. The "probe" callback function is optional. If it is provided,
|
|
* it must return 1 on successful probe, 0 otherwise. If it is not provided,
|
|
* a default probing method is used.
|
|
*/
|
|
extern struct i2c_client *
|
|
i2c_new_probed_device(struct i2c_adapter *adap,
|
|
struct i2c_board_info *info,
|
|
unsigned short const *addr_list,
|
|
int (*probe)(struct i2c_adapter *, unsigned short addr));
|
|
|
|
/* Common custom probe functions */
|
|
extern int i2c_probe_func_quick_read(struct i2c_adapter *, unsigned short addr);
|
|
|
|
/* For devices that use several addresses, use i2c_new_dummy() to make
|
|
* client handles for the extra addresses.
|
|
*/
|
|
extern struct i2c_client *
|
|
i2c_new_dummy(struct i2c_adapter *adap, u16 address);
|
|
|
|
extern void i2c_unregister_device(struct i2c_client *);
|
|
#endif /* I2C */
|
|
|
|
/* Mainboard arch_initcall() code should register all its I2C devices.
|
|
* This is done at arch_initcall time, before declaring any i2c adapters.
|
|
* Modules for add-on boards must use other calls.
|
|
*/
|
|
#ifdef CONFIG_I2C_BOARDINFO
|
|
extern int
|
|
i2c_register_board_info(int busnum, struct i2c_board_info const *info,
|
|
unsigned n);
|
|
#else
|
|
static inline int
|
|
i2c_register_board_info(int busnum, struct i2c_board_info const *info,
|
|
unsigned n)
|
|
{
|
|
return 0;
|
|
}
|
|
#endif /* I2C_BOARDINFO */
|
|
|
|
/*
|
|
* The following structs are for those who like to implement new bus drivers:
|
|
* i2c_algorithm is the interface to a class of hardware solutions which can
|
|
* be addressed using the same bus algorithms - i.e. bit-banging or the PCF8584
|
|
* to name two of the most common.
|
|
*/
|
|
struct i2c_algorithm {
|
|
/* If an adapter algorithm can't do I2C-level access, set master_xfer
|
|
to NULL. If an adapter algorithm can do SMBus access, set
|
|
smbus_xfer. If set to NULL, the SMBus protocol is simulated
|
|
using common I2C messages */
|
|
/* master_xfer should return the number of messages successfully
|
|
processed, or a negative value on error */
|
|
int (*master_xfer)(struct i2c_adapter *adap, struct i2c_msg *msgs,
|
|
int num);
|
|
int (*smbus_xfer) (struct i2c_adapter *adap, u16 addr,
|
|
unsigned short flags, char read_write,
|
|
u8 command, int size, union i2c_smbus_data *data);
|
|
|
|
/* To determine what the adapter supports */
|
|
u32 (*functionality) (struct i2c_adapter *);
|
|
};
|
|
|
|
/*
|
|
* i2c_adapter is the structure used to identify a physical i2c bus along
|
|
* with the access algorithms necessary to access it.
|
|
*/
|
|
struct i2c_adapter {
|
|
struct module *owner;
|
|
unsigned int id;
|
|
unsigned int class; /* classes to allow probing for */
|
|
const struct i2c_algorithm *algo; /* the algorithm to access the bus */
|
|
void *algo_data;
|
|
|
|
/* data fields that are valid for all devices */
|
|
struct rt_mutex bus_lock;
|
|
|
|
int timeout; /* in jiffies */
|
|
int retries;
|
|
struct device dev; /* the adapter device */
|
|
|
|
int nr;
|
|
char name[48];
|
|
struct completion dev_released;
|
|
|
|
struct mutex userspace_clients_lock;
|
|
struct list_head userspace_clients;
|
|
};
|
|
#define to_i2c_adapter(d) container_of(d, struct i2c_adapter, dev)
|
|
|
|
static inline void *i2c_get_adapdata(const struct i2c_adapter *dev)
|
|
{
|
|
return dev_get_drvdata(&dev->dev);
|
|
}
|
|
|
|
static inline void i2c_set_adapdata(struct i2c_adapter *dev, void *data)
|
|
{
|
|
dev_set_drvdata(&dev->dev, data);
|
|
}
|
|
|
|
static inline int i2c_parent_is_i2c_adapter(const struct i2c_adapter *adapter)
|
|
{
|
|
return adapter->dev.parent != NULL
|
|
&& adapter->dev.parent->bus == &i2c_bus_type
|
|
&& adapter->dev.parent->type == &i2c_adapter_type;
|
|
}
|
|
|
|
/* Adapter locking functions, exported for shared pin cases */
|
|
void i2c_lock_adapter(struct i2c_adapter *);
|
|
void i2c_unlock_adapter(struct i2c_adapter *);
|
|
|
|
/*flags for the client struct: */
|
|
#define I2C_CLIENT_PEC 0x04 /* Use Packet Error Checking */
|
|
#define I2C_CLIENT_TEN 0x10 /* we have a ten bit chip address */
|
|
/* Must equal I2C_M_TEN below */
|
|
#define I2C_CLIENT_WAKE 0x80 /* for board_info; true iff can wake */
|
|
|
|
/* i2c adapter classes (bitmask) */
|
|
#define I2C_CLASS_HWMON (1<<0) /* lm_sensors, ... */
|
|
#define I2C_CLASS_TV_ANALOG (1<<1) /* bttv + friends */
|
|
#define I2C_CLASS_TV_DIGITAL (1<<2) /* dvb cards */
|
|
#define I2C_CLASS_DDC (1<<3) /* DDC bus on graphics adapters */
|
|
#define I2C_CLASS_SPD (1<<7) /* SPD EEPROMs and similar */
|
|
|
|
/* Internal numbers to terminate lists */
|
|
#define I2C_CLIENT_END 0xfffeU
|
|
|
|
/* The numbers to use to set I2C bus address */
|
|
#define ANY_I2C_BUS 0xffff
|
|
|
|
/* Construct an I2C_CLIENT_END-terminated array of i2c addresses */
|
|
#define I2C_ADDRS(addr, addrs...) \
|
|
((const unsigned short []){ addr, ## addrs, I2C_CLIENT_END })
|
|
|
|
|
|
/* ----- functions exported by i2c.o */
|
|
|
|
/* administration...
|
|
*/
|
|
#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
|
|
extern int i2c_add_adapter(struct i2c_adapter *);
|
|
extern int i2c_del_adapter(struct i2c_adapter *);
|
|
extern int i2c_add_numbered_adapter(struct i2c_adapter *);
|
|
|
|
extern int i2c_register_driver(struct module *, struct i2c_driver *);
|
|
extern void i2c_del_driver(struct i2c_driver *);
|
|
|
|
static inline int i2c_add_driver(struct i2c_driver *driver)
|
|
{
|
|
return i2c_register_driver(THIS_MODULE, driver);
|
|
}
|
|
|
|
extern struct i2c_client *i2c_use_client(struct i2c_client *client);
|
|
extern void i2c_release_client(struct i2c_client *client);
|
|
|
|
/* call the i2c_client->command() of all attached clients with
|
|
* the given arguments */
|
|
extern void i2c_clients_command(struct i2c_adapter *adap,
|
|
unsigned int cmd, void *arg);
|
|
|
|
extern struct i2c_adapter *i2c_get_adapter(int id);
|
|
extern void i2c_put_adapter(struct i2c_adapter *adap);
|
|
|
|
|
|
/* Return the functionality mask */
|
|
static inline u32 i2c_get_functionality(struct i2c_adapter *adap)
|
|
{
|
|
return adap->algo->functionality(adap);
|
|
}
|
|
|
|
/* Return 1 if adapter supports everything we need, 0 if not. */
|
|
static inline int i2c_check_functionality(struct i2c_adapter *adap, u32 func)
|
|
{
|
|
return (func & i2c_get_functionality(adap)) == func;
|
|
}
|
|
|
|
/* Return the adapter number for a specific adapter */
|
|
static inline int i2c_adapter_id(struct i2c_adapter *adap)
|
|
{
|
|
return adap->nr;
|
|
}
|
|
#endif /* I2C */
|
|
#endif /* __KERNEL__ */
|
|
|
|
/**
|
|
* struct i2c_msg - an I2C transaction segment beginning with START
|
|
* @addr: Slave address, either seven or ten bits. When this is a ten
|
|
* bit address, I2C_M_TEN must be set in @flags and the adapter
|
|
* must support I2C_FUNC_10BIT_ADDR.
|
|
* @flags: I2C_M_RD is handled by all adapters. No other flags may be
|
|
* provided unless the adapter exported the relevant I2C_FUNC_*
|
|
* flags through i2c_check_functionality().
|
|
* @len: Number of data bytes in @buf being read from or written to the
|
|
* I2C slave address. For read transactions where I2C_M_RECV_LEN
|
|
* is set, the caller guarantees that this buffer can hold up to
|
|
* 32 bytes in addition to the initial length byte sent by the
|
|
* slave (plus, if used, the SMBus PEC); and this value will be
|
|
* incremented by the number of block data bytes received.
|
|
* @buf: The buffer into which data is read, or from which it's written.
|
|
*
|
|
* An i2c_msg is the low level representation of one segment of an I2C
|
|
* transaction. It is visible to drivers in the @i2c_transfer() procedure,
|
|
* to userspace from i2c-dev, and to I2C adapter drivers through the
|
|
* @i2c_adapter.@master_xfer() method.
|
|
*
|
|
* Except when I2C "protocol mangling" is used, all I2C adapters implement
|
|
* the standard rules for I2C transactions. Each transaction begins with a
|
|
* START. That is followed by the slave address, and a bit encoding read
|
|
* versus write. Then follow all the data bytes, possibly including a byte
|
|
* with SMBus PEC. The transfer terminates with a NAK, or when all those
|
|
* bytes have been transferred and ACKed. If this is the last message in a
|
|
* group, it is followed by a STOP. Otherwise it is followed by the next
|
|
* @i2c_msg transaction segment, beginning with a (repeated) START.
|
|
*
|
|
* Alternatively, when the adapter supports I2C_FUNC_PROTOCOL_MANGLING then
|
|
* passing certain @flags may have changed those standard protocol behaviors.
|
|
* Those flags are only for use with broken/nonconforming slaves, and with
|
|
* adapters which are known to support the specific mangling options they
|
|
* need (one or more of IGNORE_NAK, NO_RD_ACK, NOSTART, and REV_DIR_ADDR).
|
|
*/
|
|
struct i2c_msg {
|
|
__u16 addr; /* slave address */
|
|
__u16 flags;
|
|
#define I2C_M_TEN 0x0010 /* this is a ten bit chip address */
|
|
#define I2C_M_RD 0x0001 /* read data, from slave to master */
|
|
#define I2C_M_NOSTART 0x4000 /* if I2C_FUNC_PROTOCOL_MANGLING */
|
|
#define I2C_M_REV_DIR_ADDR 0x2000 /* if I2C_FUNC_PROTOCOL_MANGLING */
|
|
#define I2C_M_IGNORE_NAK 0x1000 /* if I2C_FUNC_PROTOCOL_MANGLING */
|
|
#define I2C_M_NO_RD_ACK 0x0800 /* if I2C_FUNC_PROTOCOL_MANGLING */
|
|
#define I2C_M_RECV_LEN 0x0400 /* length will be first received byte */
|
|
#define I2C_M_NEED_DELAY 0x0020 // add by kfx
|
|
#define I2C_M_REG8_DIRECT 0x0040 // add by kfx
|
|
__u16 len; /* msg length */
|
|
__u8 *buf; /* pointer to msg data */
|
|
__u32 scl_rate; // add by kfx
|
|
int udelay; //add by kfx
|
|
__u16 read_type;
|
|
};
|
|
|
|
/* To determine what functionality is present */
|
|
|
|
#define I2C_FUNC_I2C 0x00000001
|
|
#define I2C_FUNC_10BIT_ADDR 0x00000002
|
|
#define I2C_FUNC_PROTOCOL_MANGLING 0x00000004 /* I2C_M_NOSTART etc. */
|
|
#define I2C_FUNC_SMBUS_PEC 0x00000008
|
|
#define I2C_FUNC_SMBUS_BLOCK_PROC_CALL 0x00008000 /* SMBus 2.0 */
|
|
#define I2C_FUNC_SMBUS_QUICK 0x00010000
|
|
#define I2C_FUNC_SMBUS_READ_BYTE 0x00020000
|
|
#define I2C_FUNC_SMBUS_WRITE_BYTE 0x00040000
|
|
#define I2C_FUNC_SMBUS_READ_BYTE_DATA 0x00080000
|
|
#define I2C_FUNC_SMBUS_WRITE_BYTE_DATA 0x00100000
|
|
#define I2C_FUNC_SMBUS_READ_WORD_DATA 0x00200000
|
|
#define I2C_FUNC_SMBUS_WRITE_WORD_DATA 0x00400000
|
|
#define I2C_FUNC_SMBUS_PROC_CALL 0x00800000
|
|
#define I2C_FUNC_SMBUS_READ_BLOCK_DATA 0x01000000
|
|
#define I2C_FUNC_SMBUS_WRITE_BLOCK_DATA 0x02000000
|
|
#define I2C_FUNC_SMBUS_READ_I2C_BLOCK 0x04000000 /* I2C-like block xfer */
|
|
#define I2C_FUNC_SMBUS_WRITE_I2C_BLOCK 0x08000000 /* w/ 1-byte reg. addr. */
|
|
|
|
#define I2C_FUNC_SMBUS_BYTE (I2C_FUNC_SMBUS_READ_BYTE | \
|
|
I2C_FUNC_SMBUS_WRITE_BYTE)
|
|
#define I2C_FUNC_SMBUS_BYTE_DATA (I2C_FUNC_SMBUS_READ_BYTE_DATA | \
|
|
I2C_FUNC_SMBUS_WRITE_BYTE_DATA)
|
|
#define I2C_FUNC_SMBUS_WORD_DATA (I2C_FUNC_SMBUS_READ_WORD_DATA | \
|
|
I2C_FUNC_SMBUS_WRITE_WORD_DATA)
|
|
#define I2C_FUNC_SMBUS_BLOCK_DATA (I2C_FUNC_SMBUS_READ_BLOCK_DATA | \
|
|
I2C_FUNC_SMBUS_WRITE_BLOCK_DATA)
|
|
#define I2C_FUNC_SMBUS_I2C_BLOCK (I2C_FUNC_SMBUS_READ_I2C_BLOCK | \
|
|
I2C_FUNC_SMBUS_WRITE_I2C_BLOCK)
|
|
|
|
#define I2C_FUNC_SMBUS_EMUL (I2C_FUNC_SMBUS_QUICK | \
|
|
I2C_FUNC_SMBUS_BYTE | \
|
|
I2C_FUNC_SMBUS_BYTE_DATA | \
|
|
I2C_FUNC_SMBUS_WORD_DATA | \
|
|
I2C_FUNC_SMBUS_PROC_CALL | \
|
|
I2C_FUNC_SMBUS_WRITE_BLOCK_DATA | \
|
|
I2C_FUNC_SMBUS_I2C_BLOCK | \
|
|
I2C_FUNC_SMBUS_PEC)
|
|
|
|
/*
|
|
* Data for SMBus Messages
|
|
*/
|
|
#define I2C_SMBUS_BLOCK_MAX 32 /* As specified in SMBus standard */
|
|
union i2c_smbus_data {
|
|
__u8 byte;
|
|
__u16 word;
|
|
__u8 block[I2C_SMBUS_BLOCK_MAX + 2]; /* block[0] is used for length */
|
|
/* and one more for user-space compatibility */
|
|
};
|
|
|
|
/* i2c_smbus_xfer read or write markers */
|
|
#define I2C_SMBUS_READ 1
|
|
#define I2C_SMBUS_WRITE 0
|
|
|
|
/* SMBus transaction types (size parameter in the above functions)
|
|
Note: these no longer correspond to the (arbitrary) PIIX4 internal codes! */
|
|
#define I2C_SMBUS_QUICK 0
|
|
#define I2C_SMBUS_BYTE 1
|
|
#define I2C_SMBUS_BYTE_DATA 2
|
|
#define I2C_SMBUS_WORD_DATA 3
|
|
#define I2C_SMBUS_PROC_CALL 4
|
|
#define I2C_SMBUS_BLOCK_DATA 5
|
|
#define I2C_SMBUS_I2C_BLOCK_BROKEN 6
|
|
#define I2C_SMBUS_BLOCK_PROC_CALL 7 /* SMBus 2.0 */
|
|
#define I2C_SMBUS_I2C_BLOCK_DATA 8
|
|
|
|
#endif /* _LINUX_I2C_H */
|