diff options
| author | Dave Airlie <airlied@redhat.com> | 2014-08-05 09:26:09 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-08-05 09:26:09 +1000 |
| commit | 920f946428b70494eb1c64e0de260da0d8bde040 (patch) | |
| tree | f858df3d40b2ef36b282949b7feaa82cd8b95e8a /Documentation | |
| parent | eceb55a0ecd584ac5bebf667ffd8e859f261d0c0 (diff) | |
| parent | c707c3619ca81f499a5ce032021405e989a96ff0 (diff) | |
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
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/drm/i2c/tda998x.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/drm/i2c/tda998x.txt b/Documentation/devicetree/bindings/drm/i2c/tda998x.txt index d7df01c5bb3a..e9e4bce40760 100644 --- a/Documentation/devicetree/bindings/drm/i2c/tda998x.txt +++ b/Documentation/devicetree/bindings/drm/i2c/tda998x.txt @@ -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 |