Dave Airlie
8337486a8f
Merge branch 'drm/next/du' of git://linuxtv.org/pinchartl/fbdev into drm-next ...
Commit "drm/rcar-du: Use struct videomode in platform data" touches board code
in arch/arm/mach-shmobile. There is, to the best of my knowledge, no risk of
conflict for v3.18. Simon, are you fine with getting those changes merged
through Dave's tree (and could you confirm that no conflict should occur) ?
Simon acked the merge:
Acked-by: Simon Horman <horms+renesas@verge.net.au>
* 'drm/next/du' of git://linuxtv.org/pinchartl/fbdev:
drm/rcar-du: Add OF support
drm/rcar-du: Use struct videomode in platform data
video: Add DT bindings for the R-Car Display Unit
video: Add THC63LVDM83D DT bindings documentation
video: Add ADV7123 DT bindings documentation
video: Add DT binding documentation for VGA connector
devicetree: Add vendor prefix "thine" to vendor-prefixes.txt
devicetree: Add vendor prefix "mitsubishi" to vendor-prefixes.txt
drm/shmob: Update copyright notice
drm/rcar-du: Update copyright notice
2014-09-18 21:53:47 +10:00
staging:iio:ad7291: Move out of staging
2014-07-08 21:17:30 +01:00
iio:dac: Add support for the AD7303
2013-06-11 20:25:58 +01:00
ASoC: Add ADAU1381/ADAU1781 audio CODEC support
2014-05-27 20:54:51 +01:00
ASoC: Add ADAU1977 CODEC driver
2014-02-19 13:36:15 +09:00
ARM: ux500: move PM-related PRCMU functions to machine
2013-04-08 13:57:53 +02:00
ASoC: samsung: remove s5pc100 related codes
2014-07-14 19:05:00 +01:00
ASoC: s3c24xx: Remove invalid file reference
2014-02-25 21:29:31 +09:00
ASoC: mcbsp: Trivial cleanup in asoc-ti-mcbsp.h
2013-12-30 11:50:16 +00:00
ARM: ux500: Don't use enums for MSP IDs - for easy DT conversion
2014-01-07 15:36:09 +00:00
misc: (at24) move header to linux/platform_data/
2013-09-30 06:02:34 +02:00
iio: adc: at91_adc: Add support for touchscreens without TSMR
2014-05-07 18:28:40 +02:00
ata: pata_samsung_cf: removes s5pc100 related ata codes
2014-06-30 10:48:08 -04:00
TTY/Serial driver patches for 3.16-rc1
2014-06-03 09:01:02 -07:00
backlight: Add ROHM BD6107 backlight driver
2013-07-16 13:01:19 +09:00
brcmfmac: abstract tx packet processing functions
2013-08-15 16:07:55 -04:00
staging/bluetooth: Add hci_h4p driver
2014-02-07 10:13:53 -08:00
[media] V4L2: mx3_camera: add support for asynchronous subdevice registration
2013-08-18 09:06:37 -03:00
[media] V4L2: soc_camera: Renesas R-Car VIN driver
2013-08-18 09:01:10 -03:00
ARM: integrator: switch to fetch clocks from device tree
2014-02-13 11:20:42 +01:00
ACPI / LPSS: register clock device for Lynxpoint DMA properly
2013-05-14 10:23:58 +05:30
clk: ux500: Copy u8500_clk_init() ready for DT enablement
2013-09-26 11:05:26 +02:00
media: coda: use genalloc API
2013-04-29 18:28:13 -07:00
ARM: AT91SAM9G45: same platform data structure for all crypto peripherals
2013-03-10 16:46:41 +08:00
Input: cyttsp4 - add core driver for Cypress TMA4XX touchscreen devices
2013-06-30 21:24:21 -07:00
ASoC: davinci-mcasp: Rename platform data struct
2014-02-03 18:26:59 +00:00
dmaengine: at_hdmac: extend hardware handshaking interface identification
2013-07-05 11:40:29 +05:30
dma: coh901318: create a proper platform data file
2013-01-07 17:35:57 +01:00
dma: imx-sdma: Add sdma firmware version 2 support
2013-12-16 09:18:47 +05:30
Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma
2014-08-11 07:14:01 -07:00
dma: Cleanup dma-mmp_tdma.h header
2014-01-13 13:30:30 +05:30
dma: mv_xor: Cleanup in dma-mv_xor.h header
2014-01-13 13:30:31 +05:30
shdma: add R-Car Audio DMAC peri peri driver
2014-03-29 19:38:09 +05:30
dma: add driver for R-Car HPB-DMAC
2013-09-02 17:35:55 +05:30
ARM: S3C24XX: add dma pdata for s3c2410, s3c2440 and s3c2442
2013-10-21 05:32:48 +09:00
dmaengine: ste_dma40: Allow memcpy channels to be configured from DT
2013-06-04 11:12:11 +02:00
usb: dwc3: omap: remove platform data associated with dwc3-omap
2013-03-18 11:16:38 +02:00
ARM: edma: Add edma_assign_channel_eventq() to move channel to a give queue
2014-07-28 17:03:13 +05:30
spi: new controller driver for efm32 SoCs
2013-08-09 17:32:57 +01:00
mtd: nand: omap: add support for BCH16_ECC - ELM driver updates
2014-05-20 17:52:14 -07:00
memory: emif: Handle devices which are not rated for >85C
2013-03-25 13:18:12 -07:00
net: Cleanup in eth-netx.h
2014-01-02 03:30:35 -05:00
Add support for GMT G762/G763 PWM fan controllers
2013-06-27 10:31:42 -07:00
gpio: remove obsolete tnetv107x driver
2014-03-05 10:44:44 +08:00
gpio: em: Add pinctrl support
2013-07-21 17:24:41 +02:00
ARM: lpc32xx: move custom GPIO header
2013-12-03 11:26:06 +01:00
gpio-rcar: Add RCAR_GP_PIN macro
2013-06-04 21:03:56 +09:00
backlight: Add GPIO-based backlight driver
2013-07-16 13:01:05 +09:00
hwmon: (s3c) Trivial cleanup in hwmon-s3c.h
2014-01-14 21:36:52 -08:00
i2c: s3c2410: Trivial cleanup in header file
2014-03-10 17:32:28 +01:00
watchdog: add Intel MID watchdog driver support
2014-06-10 21:48:16 +02:00
Invensense MPU6050 Device Driver.
2013-02-10 17:42:43 +00:00
iommu/omap: Remove platform data da_start and da_end fields
2014-07-29 12:39:56 +02:00
iommu: Add driver for Renesas VMSA-compatible IPMMU
2014-05-26 11:18:21 +02:00
irqchip: intc-irqpin: GPL header for platform data
2013-03-18 21:26:06 +09:00
irqchip: Renesas IRQC driver
2013-03-18 21:26:06 +09:00
Input: keypad-ep93xx - cleanup header file
2013-12-27 17:20:21 -08:00
Input: keypad-omap - cleanup header file
2013-12-27 17:20:22 -08:00
Input: pxa27x-keypad - use matrix_keymap for matrix keys
2013-06-18 22:56:51 -07:00
leds: kirkwood: Cleanup in header files
2014-01-27 17:28:51 -08:00
leds: kirkwood: Cleanup in header files
2014-01-27 17:28:51 -08:00
leds: lp55xx: handle enable pin in driver
2013-10-25 10:13:25 -07:00
leds-pca9633: Rename to leds-pca963x
2013-08-26 17:22:14 -07:00
leds: leds-s3c24xx: Trivial cleanup in header file
2014-02-27 09:57:11 -08:00
backlight: lm3630: apply chip revision
2013-11-13 12:09:15 +09:00
backlight: lp855x_bl: support new LP8555 device
2013-11-13 12:09:14 +09:00
regulator: lp8755: new driver for LP8755
2012-12-24 16:32:34 +00:00
backlight: Add Sanyo LV5207LP backlight driver
2013-07-16 13:01:10 +09:00
ARM: OMAP2+: add user and fifo info to mailbox platform data
2013-06-11 11:41:30 -05:00
hwmon: (max197) add include guard
2014-01-14 21:36:53 -08:00
usb: host: max3421-hcd: Allow platform-data to specify Vbus polarity
2014-05-29 11:19:30 -07:00
hwmon: Driver for Maxim MAX6697 and compatibles
2013-02-06 09:57:56 -08:00
mfd: Cleanup mfd-mcp-sa11x0.h header
2014-01-21 08:28:59 +00:00
NFC: Initial support for Inside Secure microread
2013-02-03 20:37:42 +01:00
ARM: davinci: mmc: derive version information from device name
2013-04-03 09:42:16 +05:30
mmc: sdhci-esdhc-imx: add delay line setting support
2013-10-21 15:58:13 -04:00
mmc: msm: Cleanup mmc-msm_sdcc.h header
2014-02-25 15:43:15 -05:00
mmc: mvsdio: Cleanup mmc-mvsdio.h header
2014-02-25 15:43:23 -05:00
mmc: omap_hsmmc: Enable SDIO interrupt
2014-07-09 11:26:03 +02:00
ARM: pxa: propagate errors from regulator_enable() to pxamci
2013-07-23 12:15:15 -07:00
mmc: sdhci-s3c: remove platform dependencies
2013-04-19 13:51:23 +02:00
ARM: davinci: aemif: get rid of davinci-nand driver dependency on aemif
2014-02-23 20:33:18 +05:30
mtd: nand: omap: Revert to using software ECC by default
2014-08-25 16:15:32 -07:00
mtd: nand: pxa3xx: Use ECC strength and step size devicetree binding
2014-05-21 12:55:09 -07:00
mtd: nand: s3c2410: Trivial cleanup in header file
2014-03-10 22:42:26 -07:00
mtd: omap2: Cleanup header files
2014-01-11 11:39:18 -08:00
mtd: orion: Cleanup mtd-orion_nand.h header
2014-01-11 11:39:23 -08:00
usb: mv_usb: remove clock name from pdata
2013-04-02 11:42:47 +03:00
cw1200: rename the cw1200 platform definition header
2013-06-03 15:54:56 -04:00
hwmon: (ntc_thermistor) Support B57330V2103 from EPCOS
2014-08-04 07:01:35 -07:00
gpio: (gpio-pca953x) move header to linux/platform_data/
2013-08-29 12:33:52 -07:00
pinctrl: ADI PIN control driver for the GPIO controller on bf54x and bf60x.
2013-09-19 14:37:27 +02:00
pinctrl: single: Add support for auxdata
2013-10-10 15:30:47 -07:00
nfc: Fix FSF address in file headers
2013-12-11 10:56:21 -05:00
drm/rcar-du: Use struct videomode in platform data
2014-09-15 11:55:47 +03:00
remoteproc/omap: fix a sparse warning
2013-07-01 15:30:51 +03:00
ARM defconfigs: add missing inclusions of linux/platform_device.h
2013-02-14 15:14:32 -08:00
usb: phy: samsung: Introducing usb phy driver for hsotg
2013-01-18 15:06:30 +02:00
serial: imx: Remove init() and exit() platform callbacks
2014-02-28 16:36:45 -08:00
SERIAL: OMAP: Remove the slave idle handling from the driver
2013-05-19 16:37:08 -06:00
Revert "serial: sccnxp: Add DT support"
2013-08-02 15:25:19 +08:00
iommu/shmobile: Add iommu driver for Renesas IPMMU modules
2013-02-06 10:57:25 +01:00
hwmon: (sht15) add include guard
2014-01-14 21:36:53 -08:00
hwmon: add support for Sensirion SHTC1 sensor
2014-06-12 08:36:48 -07:00
clk: si5351: remove variant from platform_data
2014-01-27 11:20:22 -08:00
fbdev changes for 3.12:
2013-09-05 09:49:32 -07:00
ARM: davinci: move private EDMA API to arm/common
2013-06-18 10:52:03 +05:30
spi: nuc900: Cleanup spi-nuc900.h header
2013-12-30 12:46:20 +00:00
spi: spi-omap2-mcspi.c: Toggle CS after each word
2013-01-26 17:00:04 +08:00
spi/s3c64xx: Trivial cleanup in header file
2014-02-16 09:59:13 +08:00
ASoC: Add ssm2518 support
2013-05-25 10:33:30 -04:00
NFC: ST21NFCA: Add driver for STMicroelectronics ST21NFCA NFC Chip
2014-04-22 00:37:25 +02:00
NFC: st21nfcb: few code clean up
2014-07-23 00:49:37 +02:00
Input: st1232 - add reset pin handling
2013-04-15 10:00:44 -07:00
iio: Added ST-sensors platform data to select the DRDY interrupt pin
2013-08-03 18:40:28 +01:00
mfd: syscon: Add platform data with a regmap config name
2014-05-15 17:02:19 +01:00
Input: s3c2410 - trivial cleanup in header file
2014-02-14 00:09:43 -08:00
iio:light:tsl2563 move out of staging
2013-01-27 17:37:24 +00:00
ARM: imx: move EHCI platform defines out of platform_data header
2014-07-18 16:10:04 +08:00
usb: ehci: Cleanup usb-ehci-orion.h header
2014-01-03 12:37:57 -08:00
usb: musb: ux500: move channel number knowledge into the driver
2013-06-04 11:12:02 +02:00
mfd: omap-usb-host: override number of ports from platform data
2013-02-13 13:22:49 +02:00
usb: omap1: add extcon to platform data
2013-12-06 14:36:37 -06:00
usb: phy: Add RCAR Gen2 USB phy
2013-10-10 11:59:48 -05:00
phy-rcar-usb: add R8A7778 support
2013-06-11 16:11:16 +09:00
usb: misc: usb3503: Add to select the ports to disable
2013-05-30 21:32:52 +09:00
watchdog: Add support for ux500_wdt watchdog
2013-02-14 00:22:53 +01:00
video: fix up versatile CLCD helper move
2014-07-23 17:41:00 +02:00
video: ep93xx: Cleanup video-ep93xx.h header
2014-01-17 10:57:41 +02:00
video: imxfb: Remove unused fields from platform data structure
2014-02-28 12:35:22 +02:00
video: msm: Cleanup video-msm_fb.h header
2014-01-17 10:57:42 +02:00
video: pxa: Cleanup video-pxafb.h header
2014-01-17 10:57:42 +02:00
video/s3c: move platform_data out of arch/arm
2013-04-11 14:49:20 +03:00
[media] v4l: vsp1: Add LUT support
2013-12-11 09:25:20 -02:00
Input: add driver for Neonode zForce based touchscreens
2013-10-31 08:46:08 -07:00
8337486a8f