summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoonyoung Shim <jy0922.shim@samsung.com>2014-10-01 17:04:11 +0900
committerJoonyoung Shim <jy0922.shim@samsung.com>2014-10-01 21:39:16 +0900
commit313b8a5a30d2944ba0d00b402e0a6d53c42924bc (patch)
treefce117798b38999f1ca76505bf9c757fc46848fa
parent5b64bbdc428d3944b04457a4933565474263eaec (diff)
downloadlinux-3.10-313b8a5a30d2944ba0d00b402e0a6d53c42924bc.tar.gz
linux-3.10-313b8a5a30d2944ba0d00b402e0a6d53c42924bc.tar.bz2
linux-3.10-313b8a5a30d2944ba0d00b402e0a6d53c42924bc.zip
ARM: dts: enable g2d for odroid x2/u3
Update DTS and defconfig for g2d. Change-Id: I1bf301630e6bf543b56d0df8717c7b592c786b81 Signed-off-by: Joonyoung Shim <jy0922.shim@samsung.com>
-rw-r--r--arch/arm/boot/dts/exynos4412-odroid-common.dtsi4
-rwxr-xr-xarch/arm/configs/tizen_odroid_defconfig6
2 files changed, 8 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
index 2234c2274cd..74844ce2f09 100644
--- a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
+++ b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
@@ -569,6 +569,10 @@
vtmu-supply = <&ldo10_reg>;
status = "okay";
};
+
+ g2d@10800000 {
+ status = "okay";
+ };
};
&pinctrl_1 {
diff --git a/arch/arm/configs/tizen_odroid_defconfig b/arch/arm/configs/tizen_odroid_defconfig
index b9367d0fbc3..1d7b433a500 100755
--- a/arch/arm/configs/tizen_odroid_defconfig
+++ b/arch/arm/configs/tizen_odroid_defconfig
@@ -127,8 +127,9 @@ CONFIG_USER_NS=y
CONFIG_PID_NS=y
CONFIG_NET_NS=y
CONFIG_UIDGID_CONVERTED=y
-# CONFIG_UIDGID_STRICT_TYPE_CHECKS is not set
+CONFIG_UIDGID_STRICT_TYPE_CHECKS=y
CONFIG_SCHED_AUTOGROUP=y
+CONFIG_MM_OWNER=y
# CONFIG_SYSFS_DEPRECATED is not set
# CONFIG_RELAY is not set
CONFIG_BLK_DEV_INITRD=y
@@ -2388,11 +2389,12 @@ CONFIG_DRM_EXYNOS_DPI=y
CONFIG_DRM_EXYNOS_DSI=y
CONFIG_DRM_EXYNOS_HDMI=y
# CONFIG_DRM_EXYNOS_VIDI is not set
-# CONFIG_DRM_EXYNOS_G2D is not set
+CONFIG_DRM_EXYNOS_G2D=y
CONFIG_DRM_EXYNOS_IPP=y
CONFIG_DRM_EXYNOS_FIMC=y
# CONFIG_DRM_EXYNOS_ROTATOR is not set
# CONFIG_DRM_EXYNOS_GSC is not set
+# CONFIG_DRM_EXYNOS_SC is not set
# CONFIG_DRM_UDL is not set
# CONFIG_DRM_TILCDC is not set
CONFIG_DRM_PANEL=y