Skip to content

Commit

Permalink
Merge branch 'tda998x-devel' of git://ftp.arm.linux.org.uk/~rmk/linux…
Browse files Browse the repository at this point in the history
…-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
  • Loading branch information
Dave Airlie committed Aug 4, 2014
2 parents eceb55a + c707c36 commit 920f946
Show file tree
Hide file tree
Showing 2 changed files with 308 additions and 81 deletions.
2 changes: 2 additions & 0 deletions Documentation/devicetree/bindings/drm/i2c/tda998x.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ Device-Tree bindings for the NXP TDA998x HDMI transmitter
Required properties;
- compatible: must be "nxp,tda998x"

- reg: I2C address

Optional properties:
- interrupts: interrupt number and trigger type
default: polling
Expand Down
Loading

0 comments on commit 920f946

Please sign in to comment.