Merge branch 'p-ti-linux-3.8.y-video' into p-ti-android-3.8.y-video

* p-ti-linux-3.8.y-video:
  ARM: OMAP: omap2plus_defconfig: Enable Kernel Preemption
  arm: dra: Add gpu interface clock
  arm: dra7xx: Add gpu hwmod
  arm/dts: dra7: Add gpu supply
  arm: dts: dra7xx: Add gpu data

Conflicts:
	arch/arm/boot/dts/dra7-evm.dts

Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
Merge branch 'p-ti-android-3.8.y' of git://git.ti.com/android-sdk/kernel-omap into p-ti-android-3.8.y-video

* 'p-ti-android-3.8.y' of git://git.ti.com/android-sdk/kernel-omap:
  OMAP5: android: defconfig: Enable display and video features
  ARM: GPIO: android: defconfig: Enable GPIO Switch Class support
  ARM: OMAP: android: defconfig: Enable Kernel Preemption

Conflicts:
	arch/arm/boot/dts/dra7-evm.dts

Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
Merge remote-tracking branch 'remotes/gitomapzoom/p-ti-android-3.8.y' into p-ti-android-3.8.y-video
gc320: OMAP4: Adding cache-2dmanager

Based on k3.0 commit:
p-android-omap-3.0: 43eb373199a [Jack Yen <jyen@ti.com>]

Change-Id: I7e43de75a20a1cead49e902a7fedad9d4f568855
Signed-off-by: Jack Yen <jyen@ti.com>
Signed-off-by: Volodymyr Mieshkov <volodymyr.mieshkov@ti.com>
Signed-off-by: Sundar Raman <sunds@ti.com>
platform_data: Added platform data for GC320

The omap_gcx.h file which contains platform specific
structures for gc320 IP is being added as part of this
patch

Change-Id: I4889333139bb8cd3724ec99ad3e108952e585ed1
Signed-off-by: Sundar Raman <a0393242@ti.com>
devices: Initialize GC320 as part of devices init

With K3.8, devices.c is used to initialize platform
devices. Added GC320 initialization here so that it is
done as part of bootup.

Change-Id: I45d3e3b18fb4b419f7a5aabfa7cea54460ffe46a
Signed-off-by: Sundar Raman <a0393242@ti.com>
gc320: Adapt GC320 driver for K3.8

Modified SOC checks and a few other minor changes.

Change-Id: I426c2f017bea0384c7602dd50c0b558329d79b1a
Signed-off-by: Sundar Raman <a0393242@ti.com>
gc320: adding gcxxx support in Makefiles

Ported from k3.0, commit Id 6c14dfc5c011ce3
[ David Sin <davidsin@ti.com> ]

Change-Id: Ie3b211ff273c9257b596560b6260058466152b35
Signed-off-by: Volodymyr Mieshkov <volodymyr.mieshkov@ti.com>
Signed-off-by: Sundar Raman <sunds@ti.com>
gc320: Increase VRAM buffers to 4

With GC320 driver integrated and LCD/HDMI output using VRAM buffers
for SGX composition, it is necessary to increase the number of VRAM
buffers to 4 inorder to allow GC320 to use 2 buffers for composition
output.

Change-Id: I2a481ab9c5c16cd26ac5635b543f41e8c5929fdf
Signed-off-by: Sundar Raman <a0393242@ti.com>
gc320: Added  missing programming of MTLB base second time

This patch fixes a crash when running the bvtest test case
second time around. The MTLB base address was not programmed
second time around leading to a bad MMU state. This patch
ensures that the MTLB base is programmed correctly.

Change-Id: Iab33425bc61c1e1618c78bdb17f64cbb9d7b4309
Signed-off-by: Alexei Shlychkov <shlychkov@gmail.com>
Signed-off-by: Sundar Raman <a0393242@ti.com>
gc320: gcx: [WA] Allocate MMU page tables as non cached

In K3.8, the cache flushing APIs for the MMU page tables are not
working correctly. Changed the allocations to non cached to
workaround the problem until the correct root cause is found.

Change-Id: Id87497b86d3d93941926f4fc417a4f8d81a5d570
Signed-off-by: Sundar Raman <a0393242@ti.com>
ARM: OMAP5/DRA7: hwmod: add ADDR_TYPE_RT to bb2d address flags

This is required so that the omap_hwmod_get_mpu_rt_va()
api returns a virtual register base address for the IP.

Change-Id: I29aff07f34653c552b3eac3a1ac3f10e36b7efbb
Signed-off-by: Sundar Raman <a0393242@ti.com>
Merge remote-tracking branch 'origin/omaplfb' into p-ti-android-3.8.y-video

This contains GC320 series

* origin/omaplfb:
  ARM: OMAP5/DRA7: hwmod: add ADDR_TYPE_RT to bb2d address flags
  gc320: gcx: [WA] Allocate MMU page tables as non cached
  gc320: Added  missing programming of MTLB base second time
  gc320: Increase VRAM buffers to 4
  gc320: adding gcxxx support in Makefiles
  gc320: Adapt GC320 driver for K3.8
  devices: Initialize GC320 as part of devices init
  platform_data: Added platform data for GC320
  gc320: OMAP4: Adding cache-2dmanager

Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
Merge branch 'p-ti-android-3.8.y-video' of git://git.ti.com/android-sdk/kernel-video into p-ti-android-3.8.y

* 'p-ti-android-3.8.y-video' of git://git.ti.com/android-sdk/kernel-video:
  ARM: OMAP5/DRA7: hwmod: add ADDR_TYPE_RT to bb2d address flags
  gc320: gcx: [WA] Allocate MMU page tables as non cached
  gc320: Added  missing programming of MTLB base second time
  gc320: Increase VRAM buffers to 4
  gc320: adding gcxxx support in Makefiles
  gc320: Adapt GC320 driver for K3.8
  devices: Initialize GC320 as part of devices init
  platform_data: Added platform data for GC320
  gc320: OMAP4: Adding cache-2dmanager

Change-Id: I7b240582c78cb9ba0c5d77e56ab0cf06d29a64a4
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>