diff options
author | Dave Airlie <airlied@redhat.com> | 2016-07-19 17:51:19 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2016-07-19 17:51:19 +1000 |
commit | 0cf09031540cc6d8a6b41fcb1a32a704d5e55af7 (patch) | |
tree | f4fa3fa1b31c487be6d2f206fe3b43aaa5f6025b /drivers/gpu/drm/bridge/adv7511/Makefile | |
parent | d315495d21bf44fd5e422807e8324ff82bfaabab (diff) | |
parent | 1d926114d8f4e9f138617b95c6cd377667c36369 (diff) | |
download | talos-obmc-linux-0cf09031540cc6d8a6b41fcb1a32a704d5e55af7.tar.gz talos-obmc-linux-0cf09031540cc6d8a6b41fcb1a32a704d5e55af7.zip |
Merge branch 'drm_bridge_for_4.8' of https://github.com/boddob/linux into drm-next
This is an update to the previous drm bridge pull request. The ADV7511
driver's conversion from slave encoder to bridge meant that its users
(the rcar-du kms driver) should use the bridge interface too. This pull
request now also contains a commit that updates the rcar-du's hdmi encoder
interface from slave encoder to bridge.
The other updates are as before:
- Converts the ADV7511 i2c slave encoder driver to a bridge driver.
Adds support for the ADV7533 bridge chip.
- Add bridge driver for TC358767 (DSI/DPI to eDP) encoder chips.
* 'drm_bridge_for_4.8' of https://github.com/boddob/linux:
drm: rcar-du: Remove i2c slave encoder interface for hdmi encoder
drm/bridge: tc358767: Add DPI to eDP bridge driver
dt-bindings: tc358767: add DT documentation
dt-bindings: drm/bridge: Update bindings for ADV7533
drm/bridge: adv7533: Change number of DSI lanes dynamically
drm/bridge: adv7533: Use internal timing generator
drm/bridge: adv7533: Create a MIPI DSI device
drm/bridge: adv7533: Initial support for ADV7533
drm/bridge: adv7511: Fix mutex deadlock when interrupts are disabled
drm/i2c: adv7511: Move to bridge folder
drm/i2c: adv7511: Convert to drm_bridge
Diffstat (limited to 'drivers/gpu/drm/bridge/adv7511/Makefile')
-rw-r--r-- | drivers/gpu/drm/bridge/adv7511/Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/bridge/adv7511/Makefile b/drivers/gpu/drm/bridge/adv7511/Makefile new file mode 100644 index 000000000000..9019327fff4c --- /dev/null +++ b/drivers/gpu/drm/bridge/adv7511/Makefile @@ -0,0 +1,3 @@ +adv7511-y := adv7511_drv.o +adv7511-$(CONFIG_DRM_I2C_ADV7533) += adv7533.o +obj-$(CONFIG_DRM_I2C_ADV7511) += adv7511.o |