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

Updates from Jean-Fracois for the TDA998x driver, which are on top of
the fixes you have previously pulled, except these changes aren't
intended for -rc, but the next merge window.

Several of these are issues of correctness - passing more correct HDMI
info packets, not reading registers in older chips documented as write
only (despite appearing to be read/write in later chips).  Others are
code cleanups (using definitions rather than constants where we have
them already in the kernel).

Additional functionality is also added by way of optional support for
the IRQ from the TDA998x, which allows us to avoid busy-waiting for
the EDID reads.

* 'tda998x-devel' of git://ftp.arm.linux.org.uk/~rmk/linux-cubox:
  drm/i2c: tda998x: always use the same device for all kernel messages
  drm/i2c: tda998x: adjust the audio clock divider for S/PDIF
  drm/i2c: tda998x: code optimization
  drm/i2c: tda998x: remove the unused variable ca_i2s
  drm/i2c: tda998x: make the audio code more readable
  drm/i2c: tda998x: use irq for connection status and EDID read
  drm/i2c: tda998x: always enable EDID read IRQ
  drm/i2c: tda998x: add DT documentation
  drm/i2c: tda998x: add DT support
  drm/i2c: tda998x: don't read write-only registers
  drm/i2c: tda998x: don't freeze the system at audio startup time
  drm/i2c: tda998x: change probe message origin
  drm/i2c: tda998x: code cleanup
  drm/i2c: tda998x: clean up error chip version checking
  drm/i2c: tda998x: check more I/O errors
  drm/i2c: tda998x: simplify the i2c read/write functions
  drm/i2c: tda998x: use ALSA IEC958 definitions and update audio frequency
  drm/i2c: tda998x: add the active aspect in HDMI AVI frame
  drm/i2c: tda998x: use HDMI constants
  • Loading branch information
Dave Airlie committed Feb 27, 2014
2 parents 3e09dcd + 5e7fe2f commit c48cdd2
Show file tree
Hide file tree
Showing 2 changed files with 410 additions and 219 deletions.
27 changes: 27 additions & 0 deletions Documentation/devicetree/bindings/drm/i2c/tda998x.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
Device-Tree bindings for the NXP TDA998x HDMI transmitter

Required properties;
- compatible: must be "nxp,tda998x"

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

- pinctrl-0: pin control group to be used for
screen plug/unplug interrupt.

- pinctrl-names: must contain a "default" entry.

- video-ports: 24 bits value which defines how the video controller
output is wired to the TDA998x input - default: <0x230145>

Example:

tda998x: hdmi-encoder {
compatible = "nxp,tda998x";
reg = <0x70>;
interrupt-parent = <&gpio0>;
interrupts = <27 2>; /* falling edge */
pinctrl-0 = <&pmx_camera>;
pinctrl-names = "default";
};
Loading

0 comments on commit c48cdd2

Please sign in to comment.