From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 1 Mar 2017 17:42:42 +0000 (-0800)
Subject: Merge tag 'drm-ast-2500-for-v4.11' of git://people.freedesktop.org/~airlied/linux
X-Git-Tag: v4.11-rc1~41
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=3437f9f0a69c7c9e926f702fb0d1abd1f750a40e;p=users%2Fdwmw2%2Flinux.git

Merge tag 'drm-ast-2500-for-v4.11' of git://people.freedesktop.org/~airlied/linux

Pull drm AST2500 support from Dave Airlie:
 "This is a set of changes to enable the AST2500 BMC hardware, and also
  fix some bugs interacting with the older AST hardware.

  Some of the bug fixes are cc'ed to stable"

* tag 'drm-ast-2500-for-v4.11' of git://people.freedesktop.org/~airlied/linux:
  drm/ast: Call open_key before enable_mmio in POST code
  drm/ast: Fix test for VGA enabled
  drm/ast: POST code for the new AST2500
  drm/ast: Rename ast_init_dram_2300 to ast_post_chip_2300
  drm/ast: Factor mmc_test code in POST code
  drm/ast: Fixed vram size incorrect issue on POWER
  drm/ast: Base support for AST2500
  drm/ast: Fix calculation of MCLK
  drm/ast: Remove spurious include
  drm/ast: const'ify mode setting tables
  drm/ast: Handle configuration without P2A bridge
  drm/ast: Fix AST2400 POST failure without BMC FW or VBIOS
---

3437f9f0a69c7c9e926f702fb0d1abd1f750a40e