From patchwork Tue Mar 27 04:40:39 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sachin Kamat X-Patchwork-Id: 7476 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 1AB9123DEA for ; Tue, 27 Mar 2012 04:48:31 +0000 (UTC) Received: from mail-iy0-f180.google.com (mail-iy0-f180.google.com [209.85.210.180]) by fiordland.canonical.com (Postfix) with ESMTP id D7B94A1801B for ; Tue, 27 Mar 2012 04:48:30 +0000 (UTC) Received: by mail-iy0-f180.google.com with SMTP id e36so12275254iag.11 for ; Mon, 26 Mar 2012 21:48:30 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=oU/Ek706ehmixk+iYMXjnQw4YjtJO7o+nSTqD297AC8=; b=HUCrJmLWW3kI7NUqSkb+Y2CpXwQvuCZoHbjF3bLtMDG0uUvGq1o6Qb5ukB/wId402y eBk5wRhpd1may5OJ+qzDxvyl/MJ45LDZI9mVjtEp4lEdEWu7GZtiyV2MrqSqdQYaCfvP QpTZQbbaFVIixFiVmJqqzZwxegcCEyg5Rg2+uIYYy9h4hD0RU/5gUBBguJIXH/xELYDS Ych0VbO70bR9F8WFsx9EHoDW+ZCfcmV1/v45Xk0PybfbRxVgVD3iJsN7+iMZj3zbWP9i K89uotk0ltHp23qEB1YyOOdRUGIKP4D7WOaVe4gHElp90EYZBx2mrxdNFvbqzAM/U3OV JCIg== Received: by 10.50.45.234 with SMTP id q10mr7584457igm.54.1332823710651; Mon, 26 Mar 2012 21:48:30 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.231.5.205 with SMTP id 13csp7495ibw; Mon, 26 Mar 2012 21:48:30 -0700 (PDT) Received: by 10.50.194.133 with SMTP id hw5mr7442922igc.57.1332823710243; Mon, 26 Mar 2012 21:48:30 -0700 (PDT) Received: from mail-iy0-f178.google.com (mail-iy0-f178.google.com [209.85.210.178]) by mx.google.com with ESMTPS id ay4si15059407igb.49.2012.03.26.21.48.30 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 26 Mar 2012 21:48:30 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.210.178 is neither permitted nor denied by best guess record for domain of sachin.kamat@linaro.org) client-ip=209.85.210.178; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.210.178 is neither permitted nor denied by best guess record for domain of sachin.kamat@linaro.org) smtp.mail=sachin.kamat@linaro.org Received: by iakl21 with SMTP id l21so12635576iak.37 for ; Mon, 26 Mar 2012 21:48:30 -0700 (PDT) Received: by 10.68.231.66 with SMTP id te2mr59948181pbc.42.1332823709748; Mon, 26 Mar 2012 21:48:29 -0700 (PDT) Received: from localhost.localdomain ([115.113.119.130]) by mx.google.com with ESMTPS id d4sm14022018pbe.36.2012.03.26.21.48.26 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 26 Mar 2012 21:48:29 -0700 (PDT) From: Sachin Kamat To: linux-samsung-soc@vger.kernel.org Cc: kgene.kim@samsung.com, sachin.kamat@linaro.org, patches@linaro.org Subject: [PATCH 2/2] ARM: EXYNOS: Add DRM device to SMDKV310 Date: Tue, 27 Mar 2012 10:10:39 +0530 Message-Id: <1332823239-12280-3-git-send-email-sachin.kamat@linaro.org> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1332823239-12280-1-git-send-email-sachin.kamat@linaro.org> References: <1332823239-12280-1-git-send-email-sachin.kamat@linaro.org> X-Gm-Message-State: ALoCoQmMWqYduoxiPr6GIXF6rRlovA9ZzsA9Cgd98CJH+BsIeTtVuHanNlShaueHRFrTekouTIxq DRM core device and FIMD DRM platform device support is added to SMDKV310 board. Signed-off-by: Sachin Kamat --- arch/arm/mach-exynos/Kconfig | 1 + arch/arm/mach-exynos/mach-smdkv310.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 0 deletions(-) diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig index 2bb21af..967c670 100644 --- a/arch/arm/mach-exynos/Kconfig +++ b/arch/arm/mach-exynos/Kconfig @@ -210,6 +210,7 @@ config MACH_SMDKV310 select S3C_DEV_HSMMC2 select S3C_DEV_HSMMC3 select SAMSUNG_DEV_BACKLIGHT + select EXYNOS_DEV_DRM select EXYNOS4_DEV_AHCI select SAMSUNG_DEV_KEYPAD select EXYNOS4_DEV_DMA diff --git a/arch/arm/mach-exynos/mach-smdkv310.c b/arch/arm/mach-exynos/mach-smdkv310.c index f08529f..9052e22 100644 --- a/arch/arm/mach-exynos/mach-smdkv310.c +++ b/arch/arm/mach-exynos/mach-smdkv310.c @@ -44,6 +44,7 @@ #include #include +#include #include "common.h" /* Following are default values for UCON, ULCON and UFCON UART registers */ @@ -156,6 +157,26 @@ static struct platform_device smdkv310_lcd_lte480wv = { .dev.platform_data = &smdkv310_lcd_lte480wv_data, }; +#ifdef CONFIG_DRM_EXYNOS +static struct exynos_drm_fimd_pdata drm_fimd_pdata = { + .panel = { + .timing = { + .left_margin = 13, + .right_margin = 8, + .upper_margin = 7, + .lower_margin = 5, + .hsync_len = 3, + .vsync_len = 1, + .xres = 800, + .yres = 480, + }, + }, + .vidcon0 = VIDCON0_VIDOUT_RGB | VIDCON0_PNRMODE_RGB, + .vidcon1 = VIDCON1_INV_HSYNC | VIDCON1_INV_VSYNC, + .default_win = 0, + .bpp = 32, +}; +#else static struct s3c_fb_pd_win smdkv310_fb_win0 = { .win_mode = { .left_margin = 13, @@ -177,6 +198,7 @@ static struct s3c_fb_platdata smdkv310_lcd0_pdata __initdata = { .vidcon1 = VIDCON1_INV_HSYNC | VIDCON1_INV_VSYNC, .setup_gpio = exynos4_fimd0_gpio_setup_24bpp, }; +#endif static struct resource smdkv310_smsc911x_resources[] = { [0] = { @@ -269,6 +291,9 @@ static struct platform_device *smdkv310_devices[] __initdata = { &s5p_device_fimc_md, &s5p_device_g2d, &s5p_device_jpeg, +#ifdef CONFIG_DRM_EXYNOS + &exynos_device_drm, +#endif &exynos4_device_ac97, &exynos4_device_i2s0, &exynos4_device_ohci, @@ -360,7 +385,12 @@ static void __init smdkv310_machine_init(void) samsung_keypad_set_platdata(&smdkv310_keypad_data); samsung_bl_set(&smdkv310_bl_gpio_info, &smdkv310_bl_data); +#ifdef CONFIG_DRM_EXYNOS + s5p_device_fimd0.dev.platform_data = &drm_fimd_pdata; + exynos4_fimd0_gpio_setup_24bpp(); +#else s5p_fimd0_set_platdata(&smdkv310_lcd0_pdata); +#endif smdkv310_ehci_init(); smdkv310_ohci_init();