OpenCloudOS-Kernel/arch/arm/plat-mxc/include/mach
Linus Torvalds aace99e57c Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
Pull media fixes from Mauro Carvalho Chehab.

Trivial conflict due to new USB HID ID's being added next to each other
(Baanto vs Axentia).

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (44 commits)
  [media] smia: Fix compile failures
  [media]  Fix VIDIOC_DQEVENT docbook entry
  [media] s5p-fimc: Fix control creation function
  [media] s5p-mfc: Fix checkpatch error in s5p_mfc_shm.h file
  [media] s5p-mfc: Fix setting controls
  [media] v4l/s5p-mfc: added image size align in VIDIOC_TRY_FMT
  [media] v4l/s5p-mfc: corrected encoder v4l control definitions
  [media] v4l: mem2mem_testdev: Fix race conditions in driver
  [media] s5p-mfc: Bug fix of timestamp/timecode copy mechanism
  [media] cxd2820r: Fix an incorrect modulation type bitmask
  [media] em28xx: Show a warning if the board does not support remote controls
  [media] em28xx: Add remote control support for Terratec's Cinergy HTC Stick HD
  [media] USB: Staging: media: lirc: initialize spinlocks before usage
  [media] Revert "[media] media: mx2_camera: Fix mbus format handling"
  [media] bw-qcam: driver and pixfmt documentation fixes
  [media] cx88: fix firmware load on big-endian systems
  [media] cx18: support big-endian systems
  [media] ivtv: fix support for big-endian systems
  [media] tuner-core: return the frequency range of the correct tuner
  [media] v4l2-dev.c: fix g_parm regression in determine_valid_ioctls()
  ...
2012-06-25 14:53:09 -07:00
..
3ds_debugboard.h mxc: add common debug board for 3-stack platforms 2010-07-26 14:29:19 +02:00
board-mx31lilly.h ARM: mxc: grammar fix 2010-06-24 15:40:36 +02:00
board-mx31lite.h ARM: mxc: grammar fix 2010-06-24 15:40:36 +02:00
board-mx31moboard.h ARM: mxc: grammar fix 2010-06-24 15:40:36 +02:00
board-pcm038.h ARM: mxc: grammar fix 2010-06-24 15:40:36 +02:00
clock.h ARM i.MX: prepare for common clock framework 2012-04-25 17:03:46 +02:00
common.h Some fixes for the fresh i.MX common clock support 2012-06-07 11:47:28 -07:00
debug-macro.S ARM: imx6: Add UART2 for low-level debug 2012-05-11 15:17:57 +08:00
devices-common.h [media] MX2: Add platform definitions for eMMa-PrP device 2012-02-28 07:20:32 -03:00
dma.h ARM: mxc: make imx_dma_is_general_purpose more generic for sdma 2012-02-27 15:17:58 +08:00
esdhc.h mmc: sdhci-esdhc-imx: extend card_detect and write_protect support for mx5 2011-07-27 09:31:14 +08:00
eukrea-baseboards.h mx5: add cpuimx51sd module and its baseboard 2010-10-19 18:45:00 +02:00
gpio.h Merge branch 'highbank/soc' into next/soc 2011-11-02 02:46:10 +01:00
hardware.h ARM: create a common IOMEM definition 2012-03-13 21:22:09 -05:00
i2c.h i2c-imx: remove init/exit hooks from platform data 2011-09-14 22:14:41 +01:00
iim.h
imx-uart.h Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm 2009-06-14 13:42:43 -07:00
imxfb.h ARM: imx: dynamically register imx-fb devices 2010-11-17 10:01:27 +01:00
iomux-mx1.h arm/imx/iomux-v1: rename header file 2010-02-24 10:07:15 +01:00
iomux-mx2x.h mx2/iomux: Set direction for CSPI2 pins 2011-03-25 08:21:34 +01:00
iomux-mx3.h mx31moboard: Add poweroff support 2011-09-20 14:53:00 +02:00
iomux-mx21.h arm/imx/iomux-v1: rename header file 2010-02-24 10:07:15 +01:00
iomux-mx25.h iomux-mx25.h slew rate adjusted for LCD __LD pins 2012-03-13 13:57:07 +01:00
iomux-mx27.h arm/imx/iomux-v1: rename header file 2010-02-24 10:07:15 +01:00
iomux-mx35.h ARM: imx35: fix ATA_DATA3 pad control address 2011-03-07 19:29:09 +01:00
iomux-mx50.h ARM: imx50: correct iomux-mx50.h wrong daisy chain settings 2011-02-18 11:01:34 +01:00
iomux-mx51.h ARM: i.MX51 iomux: add missed definitions for SION-bit and mode for some pads 2012-05-02 10:25:27 +02:00
iomux-mx53.h ARM: mx53: fix pad definitions for MX53_PAD_EIM_D28__I2C1_SDA and MX53_PAD_GPIO_8__CAN1_RXCAN 2012-05-02 10:28:36 +02:00
iomux-v1.h ARM: imx: iomux-v1.h: Fix build error due to __init annotation 2012-01-26 12:56:37 +01:00
iomux-v3.h Merge branch 'next/fixes' into next/cleanup 2011-10-31 23:25:41 +01:00
ipu.h i.MX31: Image Processing Unit DMA and IRQ drivers 2009-01-19 15:36:21 -07:00
iram.h ARM: imx: Add iram allocator functions 2010-10-19 18:44:57 +02:00
irqs.h arm/imx6q: add core definitions and low-level debug uart 2011-10-31 14:26:21 +01:00
mmc.h mxcmmc: add card detect through DAT3 possibility 2010-07-26 14:17:46 +02:00
mx1.h ARM: plat-mxc: remove inclusion of <mach/vmalloc.h> 2011-11-15 22:30:39 -05:00
mx1_camera.h V4L/DVB (11350): Add camera (CSI) driver for MX1 2009-04-06 21:43:58 -03:00
mx2_cam.h [media] Revert "[media] media: mx2_camera: Fix mbus format handling" 2012-06-18 08:17:42 -03:00
mx2x.h ARM: imx: remove deprecated symbols as all users are gone now 2010-11-17 08:58:12 +01:00
mx3_camera.h ARM: mxc: remove paragraphs with old address of the FSF 2010-06-30 09:00:28 +02:00
mx3fb.h video i.MX IPU: Fix display connections 2011-12-08 12:59:03 +05:30
mx3x.h ARM: mx35: use generic function for displaying silicon revision 2011-08-26 08:50:59 +02:00
mx6q.h ARM: imx6: Add UART2 for low-level debug 2012-05-11 15:17:57 +08:00
mx21-usbhost.h USB: MXC: Add i.MX21 specific USB host controller driver. 2010-03-02 14:52:55 -08:00
mx21.h ARM: mx25: move registration of gpios to plat-mxc/gpio.c 2010-11-17 10:01:38 +01:00
mx25.h Merge branches 'features/assorted', 'features/imx-pata' and 'features/imx-multi-irq-v2' into imx-features 2011-09-29 10:40:29 +02:00
mx27.h arm/imx: remove mx27_setup_weimcs() from mx27.h 2011-10-17 21:41:03 +02:00
mx31.h arm/imx: remove mx31_setup_weimcs() from mx31.h 2011-10-17 21:41:03 +02:00
mx35.h ARM: imx: Add PATA resources for other i.MX processors 2011-08-24 10:11:40 +02:00
mx50.h ARM: mx50: Add support to get the silicon revision 2011-03-23 15:08:15 +01:00
mx51.h Merge branches 'cleanups/assorted' and 'cleanups/mm-tzic' into imx-cleanup 2011-09-20 10:09:08 +02:00
mx53.h ARM: mx5/mm: consolidate TZIC map code 2011-09-20 09:55:06 +02:00
mxc.h ARM: mx5: use generic irq chip pm interface for pm functions on 2011-12-25 12:02:28 +08:00
mxc_ehci.h usb: otg: Rename otg_transceiver to usb_phy 2012-02-13 13:34:36 +02:00
mxc_nand.h Fix common misspellings 2011-03-31 11:26:23 -03:00
sdma.h dmaengine: imx-sdma: use platform_device_id to identify sdma version 2011-07-27 09:31:45 +08:00
spi.h spi: add SPI driver for most known i.MX SoCs 2009-09-23 07:39:43 -07:00
ssi.h ASoC: imx-ssi.c: add new choices to platform configuration 2010-06-03 19:00:16 +01:00
timex.h ARM i.MX: define CLOCK_TICK_RATE to bogus value 2011-07-07 09:59:58 +02:00
ulpi.h usb: otg: ulpi: Start using struct usb_otg 2012-02-13 13:35:56 +02:00
uncompress.h enable uncompress log on cpuimx35sd 2011-12-19 12:26:09 +01:00
usb.h imx: exit functions can/should be void 2009-05-07 16:15:58 +02:00