Commit 920f9464 authored by Dave Airlie's avatar Dave Airlie

Merge branch 'tda998x-devel' of git://ftp.arm.linux.org.uk/~rmk/linux-cubox into drm-next

This builds upon the previous set of fixes which were pulled on 6th July.
Included in this set are:
- an update from Jean-Francois to add the missing reg documentation entry
  to the device tree documentation.
- conversion of the tda998x driver to the component helpers.

* 'tda998x-devel' of git://ftp.arm.linux.org.uk/~rmk/linux-cubox:
  drm/i2c: tda998x: add component support
  drm/i2c: tda998x: allow re-use of tda998x support code
  drm/i2c: tda998x: fix lack of required reg in DT documentation

Conflicts:
	drivers/gpu/drm/i2c/tda998x_drv.c
parents eceb55a0 c707c361
...@@ -3,6 +3,8 @@ Device-Tree bindings for the NXP TDA998x HDMI transmitter ...@@ -3,6 +3,8 @@ Device-Tree bindings for the NXP TDA998x HDMI transmitter
Required properties; Required properties;
- compatible: must be "nxp,tda998x" - compatible: must be "nxp,tda998x"
- reg: I2C address
Optional properties: Optional properties:
- interrupts: interrupt number and trigger type - interrupts: interrupt number and trigger type
default: polling default: polling
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment