Merge branch 'gma500-next' of git://github.com/patjak/drm-gma500 into drm-next
commitcf0613d242805797f252535fcf7bb019512beb46
authorDave Airlie <airlied@redhat.com>
Sun, 10 Nov 2013 21:25:33 +0000 (11 07:25 +1000)
committerDave Airlie <airlied@redhat.com>
Sun, 10 Nov 2013 21:25:33 +0000 (11 07:25 +1000)
tree5b50ea717d86049a1b2bc99ecb82c9fe140a4714
parent8d01e1ef6766babffb5965218beb207dde693fb5
parentcd3fdbe853c47c5890d5362363b59504c2e5fb5f
Merge branch 'gma500-next' of git://github.com/patjak/drm-gma500 into drm-next

SDVO support for minnowboard

* 'gma500-next' of git://github.com/patjak/drm-gma500:
  drm/gma500/mrst: Add SDVO to output init
  drm/gma500/mrst: Don't blindly guess a mode for LVDS
  drm/gma500/mrst: Setup GMBUS for oaktrail/mrst
  drm/gma500/mrst: Replace WMs and chickenbits with values from EMGD
  drm/gma500/mrst: Add aux register writes to SDVO
  drm/gma500/mrst: Properly route oaktrail hdmi hooks
  drm/gma500/mrst: Add aux register writes when programming pipe
  drm/gma500/mrst: Add SDVO clock calculation
  drm/gma500: Add aux device support for gmbus
  drm/gma500: Add support for aux pci vdc device
  drm/gma500: Add chip specific sdvo masks
  drm/gma500: Add Minnowboard to the IS_MRST() macro