author | Praneeth Bajjuri <praneeth@ti.com> | |
Sat, 13 Jul 2013 00:36:54 +0000 (19:36 -0500) | ||
committer | Praneeth Bajjuri <praneeth@ti.com> | |
Sat, 13 Jul 2013 00:36:54 +0000 (19:36 -0500) |
* 'p-ti-android-3.8.y-video' of git://git.ti.com/android-sdk/kernel-video: (103 commits)
HDMI: Add reading edid and mode db creation
HDMI: Select correct clock source.
HDMI: Select DVI or HDMI based on EDID
HDMI: Add fb mode db construction
HDMI: Add edid read and clear functions
HDMI: Add FB mode database setting support
OMAPDSS: HDMI: Add setmode support for android
OMAP: HDMI : Add initial support for fb mode translation
OMAPDSS: OMAPLFB: (HACK) Use VRAM buffers instead of tiler 2D
OMAPDSS: OMAPLFB: VRAM buffers for second FB.
gpu: OMAP2: generic Android display configuration setup
OMAPDSS: DSSCOMP: OMAPLFB: Enabling dual FB configuration for multidisplay feature
gpu: android-display: DO NOT MERGE: android display compilation fixes
gc320: OMAP4:GCXXX: Fixing build warnings
OMAPDSS: OMAPLFB: Fix compilation issue for tiler path
gpu: omap_hwc: Adds a flag to hint omaplfb a blit FB is needed
gpu: omap_hwc: Describe the api agreement with omaplfb
gc320: Add header for dsscomp and optional bltsville data from Android HWC
gc320: Initial Open Color format Definitions (OCD).
gc320: OMAP4: adding Vivante Corp 2/3D gcxxx driver files
...
Conflicts:
arch/arm/boot/dts/dra7-evm.dts
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
HDMI: Add reading edid and mode db creation
HDMI: Select correct clock source.
HDMI: Select DVI or HDMI based on EDID
HDMI: Add fb mode db construction
HDMI: Add edid read and clear functions
HDMI: Add FB mode database setting support
OMAPDSS: HDMI: Add setmode support for android
OMAP: HDMI : Add initial support for fb mode translation
OMAPDSS: OMAPLFB: (HACK) Use VRAM buffers instead of tiler 2D
OMAPDSS: OMAPLFB: VRAM buffers for second FB.
gpu: OMAP2: generic Android display configuration setup
OMAPDSS: DSSCOMP: OMAPLFB: Enabling dual FB configuration for multidisplay feature
gpu: android-display: DO NOT MERGE: android display compilation fixes
gc320: OMAP4:GCXXX: Fixing build warnings
OMAPDSS: OMAPLFB: Fix compilation issue for tiler path
gpu: omap_hwc: Adds a flag to hint omaplfb a blit FB is needed
gpu: omap_hwc: Describe the api agreement with omaplfb
gc320: Add header for dsscomp and optional bltsville data from Android HWC
gc320: Initial Open Color format Definitions (OCD).
gc320: OMAP4: adding Vivante Corp 2/3D gcxxx driver files
...
Conflicts:
arch/arm/boot/dts/dra7-evm.dts
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
1 | 2 | |||
---|---|---|---|---|
arch/arm/boot/dts/dra7-evm.dts | patch | | diff1 | | diff2 | | blob | history |
diff --cc arch/arm/boot/dts/dra7-evm.dts
index 7a56b6d4ac25e3128ed7e455a830d5eae06f0fb8,435024659b366fadce9d1ffde56b3a5a5a76b44b..e6ab292d9c78373a02bc6da289a74fcd5a927ef9
mode 100644,100755..100755
mode 100644,100755..100755
regulator-max-microvolt = <3000000>;
};
- gpu-supply = <&avs_gpu>;
+ ion_config {
+ compatible = "ti,ion-omap";
+ ti,omap_ion_heap_secure_input_base = <0xba300000>;
+ ti,omap_ion_heap_tiler_base = <0xb4300000>;
+ ti,omap_ion_heap_nonsecure_tiler_base = <0xf00000>;
+ /*90 MB*/
+ ti,omap_ion_heap_secure_input_size = <0x5A00000>;
+ /*96 MB*/
+ ti,omap_ion_heap_tiler_size = <0x6000000>;
+ /*15 MB*/
+ ti,omap_ion_heap_nonsecure_tiler_size = <0xF00000>;
+ };
++
+ ocp {
+ gpu: gpu@0x56000000 {
-
++ gpu-supply = <&avs_gpu>;
+ };
+ };
};
&dra7_pmx_core {