From 72e0e3302e35a28646c6f4e94a619ade7bfecac0 Mon Sep 17 00:00:00 2001 From: OtherCrashOverride Date: Sun, 5 Mar 2017 07:33:38 +0000 Subject: [PATCH] ODROID-XU4: Enable G2D --- arch/arm/boot/dts/exynos5420.dtsi | 9 +++++++++ arch/arm/configs/odroidxu3_defconfig | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/exynos5420.dtsi b/arch/arm/boot/dts/exynos5420.dtsi index f85ed2c2951c..2dc638d0b371 100644 --- a/arch/arm/boot/dts/exynos5420.dtsi +++ b/arch/arm/boot/dts/exynos5420.dtsi @@ -191,6 +191,15 @@ clock-names = "fout_epll", "pll_ref", "pll_in", "sclk_audio", "sclk_pcm_in"; }; + g2d@10850000 { + compatible = "samsung,exynos5250-g2d"; + reg = <0x10850000 0x1000>; + interrupts = <0 91 0>; + clocks = <&clock CLK_G2D>; + clock-names = "fimg2d"; + iommus = <&sysmmu_g2dr>, <&sysmmu_g2dw>; + }; + mfc: codec@11000000 { compatible = "samsung,mfc-v7"; reg = <0x11000000 0x10000>; diff --git a/arch/arm/configs/odroidxu3_defconfig b/arch/arm/configs/odroidxu3_defconfig index ff7d99f01d44..11ec72a52225 100644 --- a/arch/arm/configs/odroidxu3_defconfig +++ b/arch/arm/configs/odroidxu3_defconfig @@ -3229,7 +3229,7 @@ CONFIG_VIDEO_EXYNOS4_ISP_DMA_CAPTURE=y # CONFIG_VIDEO_XILINX is not set CONFIG_V4L_MEM2MEM_DRIVERS=y # CONFIG_VIDEO_MEM2MEM_DEINTERLACE is not set -CONFIG_VIDEO_SAMSUNG_S5P_G2D=y +# CONFIG_VIDEO_SAMSUNG_S5P_G2D is not set CONFIG_VIDEO_SAMSUNG_S5P_JPEG=y CONFIG_VIDEO_SAMSUNG_S5P_MFC=y CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC=y @@ -3545,6 +3545,7 @@ CONFIG_DRM_EXYNOS_HDMI=y # # Sub-drivers # +CONFIG_DRM_EXYNOS_G2D=y CONFIG_DRM_EXYNOS_IPP=y CONFIG_DRM_EXYNOS_FIMC=y CONFIG_DRM_EXYNOS_ROTATOR=y