tree 946a13465467eb58f68cf8cf5e121017d380fe2a
parent 84dbfb2e093d5a5e7a6a88a52fc9103ac8ac9aff
parent 5018c55b44ca567f4d296cc911833da8f13c159d
author Wolfgang Denk <wd@denx.de> 1342601223 +0200
committer Wolfgang Denk <wd@denx.de> 1342601223 +0200

Merge branch 'next' of git://git.denx.de/u-boot-video

* 'next' of git://git.denx.de/u-boot-video:
  ipu_common: Add ldb_clk for use in parenting the pixel clock
  ipu_common: Do not hardcode the ipu_clk frequency
  ipu_common: Rename MXC_CCM_BASE
  ipu_common: Let clk_ipu_enable/disable only run on MX51 and MX53
  ipu_common: Only apply the erratum to MX51
  video: Rename CONFIG_VIDEO_MX5
  mx6: Allow mx6 to access the IPUv3 registers
  common lcd: minor coding style changes

Signed-off-by: Wolfgang Denk <wd@denx.de>