author | Praneeth Bajjuri <praneeth@ti.com> | |
Mon, 15 Jul 2013 06:20:43 +0000 (01:20 -0500) | ||
committer | Praneeth Bajjuri <praneeth@ti.com> | |
Mon, 15 Jul 2013 06:20:43 +0000 (01:20 -0500) |
* 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>
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>
1 | 2 | |||
---|---|---|---|---|
arch/arm/boot/dts/dra7-evm.dts | patch | | diff1 | | diff2 | | blob | history |
diff --cc arch/arm/boot/dts/dra7-evm.dts
index 435024659b366fadce9d1ffde56b3a5a5a76b44b,7a56b6d4ac25e3128ed7e455a830d5eae06f0fb8..8f0495b049218f134ae748cdbe0e7bf0aa24f268
mode 100755,100644..100755
mode 100755,100644..100755
regulator-max-microvolt = <3000000>;
};
+ 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 {