Merge branch 'audio-display-ti-linux-4.1.y' of...

Merge branch 'audio-display-ti-linux-4.1.y' of git.ti.com:~darrene/ti-linux-kernel/audio-display-linux-feature-tree into ti-linux-4.1.y

TI-Feature: audio-display
TI-Tree: git@git.ti.com:~darrene/ti-linux-kernel/audio-display-linux-feature-tree.git
TI-Branch: audio-display-ti-linux-4.1.y

* 'audio-display-ti-linux-4.1.y' of git.ti.com:~darrene/ti-linux-kernel/audio-display-linux-feature-tree:
  media: ti-vpe: vip: Add scaler support
  media: ti-vpe: vip: make sure dma_contig context is cleaned up in error cases
  media: ti-vpe: vip: Set crop parameters in parser
  media: ti-vpe: vip: Split parser access to its own memory region
  arm: dts: dra7: Update VIP memory map section and names
  media: ti-vpe: vip: Update bindings
  media: ti-vpe: scaler: Add debug support for multi-instance
  media: ti-vpe: Add multi-instance scaler support
  media: ti-vpe: Make scaler library into its own module
  media: ti-vpe: vpdma: Clean up module build
  media: ti-vpe: Fix a parallel build issue
  ARM: DTS: am57xx-beagle-x15: Select SYS_CLK2 for audio clocks

Signed-off-by: LCPD Auto Merger <lcpd_integration@list.ti.com>