From patchwork Tue Mar 27 04:40:38 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sachin Kamat X-Patchwork-Id: 7475 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 E112923DEA for ; Tue, 27 Mar 2012 04:48:27 +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 A2554A182CD for ; Tue, 27 Mar 2012 04:48:27 +0000 (UTC) Received: by mail-iy0-f180.google.com with SMTP id e36so12275254iag.11 for ; Mon, 26 Mar 2012 21:48:27 -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=+DPgr8TDb49UtiMxivekXWgbQVh1cuR5w0pALn5iqzI=; b=GL5XNtSMaNotrBSN+AiW/flzJwDr77sJ0B/zl0WG7zxmwI+0ZwtPy42sASoj82cPIH 0KB6kTya3W8K9WNJCGr5vxdJNZ+eOcVKWN3KBwaV9EtrD2I1xzwpXa28ws+lpw2nJt8P iJD5S+GYPfz4Ekx8dNfjR2iQMkOISnesxQso0uivpr7cdA5jVWVrfbVbATJnUUKddNxi +KknP7W8WRTeS/VXIMz/DehSb7+rcHQC8OvCvj5gnQ+9Radg1I/eoTNzMFBr/2Cx6YmC ilzHyQXCGE8zBTlH3Bc4nQIBzP3AJ8A5x8RG+rtd8xgUGjiLP7DAhXI8XLyPX6ppkGA3 qBmw== Received: by 10.50.46.195 with SMTP id x3mr7605997igm.54.1332823707410; Mon, 26 Mar 2012 21:48:27 -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 13csp7494ibw; Mon, 26 Mar 2012 21:48:26 -0700 (PDT) Received: by 10.68.218.134 with SMTP id pg6mr58716262pbc.111.1332823706501; Mon, 26 Mar 2012 21:48:26 -0700 (PDT) Received: from mail-pb0-f50.google.com (mail-pb0-f50.google.com [209.85.160.50]) by mx.google.com with ESMTPS id c5si20745130pbl.136.2012.03.26.21.48.26 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 26 Mar 2012 21:48:26 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.160.50 is neither permitted nor denied by best guess record for domain of sachin.kamat@linaro.org) client-ip=209.85.160.50; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.160.50 is neither permitted nor denied by best guess record for domain of sachin.kamat@linaro.org) smtp.mail=sachin.kamat@linaro.org Received: by mail-pb0-f50.google.com with SMTP id xa12so8103646pbc.37 for ; Mon, 26 Mar 2012 21:48:26 -0700 (PDT) Received: by 10.68.136.65 with SMTP id py1mr58696724pbb.64.1332823706194; Mon, 26 Mar 2012 21:48:26 -0700 (PDT) Received: from localhost.localdomain ([115.113.119.130]) by mx.google.com with ESMTPS id d4sm14022018pbe.36.2012.03.26.21.48.23 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 26 Mar 2012 21:48:25 -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 1/2] ARM: EXYNOS: Add DRM device to Origen Date: Tue, 27 Mar 2012 10:10:38 +0530 Message-Id: <1332823239-12280-2-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: ALoCoQkdS5/udv3A3Il55u6xZexbGPrrGei3Th+x632T/2EnxyO6mMu9b1nslZqSXVyW8qHlyRGz DRM core device and FIMD DRM platform device support is added to Origen board. Signed-off-by: Sachin Kamat --- arch/arm/mach-exynos/Kconfig | 1 + arch/arm/mach-exynos/mach-origen.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 0 deletions(-) diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig index 9124ce9..2bb21af 100644 --- a/arch/arm/mach-exynos/Kconfig +++ b/arch/arm/mach-exynos/Kconfig @@ -332,6 +332,7 @@ config MACH_ORIGEN select S5P_DEV_USB_EHCI select SAMSUNG_DEV_BACKLIGHT select SAMSUNG_DEV_PWM + select EXYNOS_DEV_DRM select EXYNOS4_DEV_DMA select EXYNOS4_DEV_USB_OHCI select EXYNOS4_SETUP_FIMD0 diff --git a/arch/arm/mach-exynos/mach-origen.c b/arch/arm/mach-exynos/mach-origen.c index 827cb99..dbc2145 100644 --- a/arch/arm/mach-exynos/mach-origen.c +++ b/arch/arm/mach-exynos/mach-origen.c @@ -45,6 +45,7 @@ #include #include +#include #include "common.h" /* Following are default values for UCON, ULCON and UFCON UART registers */ @@ -581,6 +582,27 @@ static struct platform_device origen_lcd_hv070wsa = { .dev.platform_data = &origen_lcd_hv070wsa_data, }; +#ifdef CONFIG_DRM_EXYNOS +static struct exynos_drm_fimd_pdata drm_fimd_pdata = { + .panel = { + .timing = { + .left_margin = 64, + .right_margin = 16, + .upper_margin = 64, + .lower_margin = 16, + .hsync_len = 48, + .vsync_len = 3, + .xres = 1024, + .yres = 600, + }, + }, + .vidcon0 = VIDCON0_VIDOUT_RGB | VIDCON0_PNRMODE_RGB, + .vidcon1 = VIDCON1_INV_HSYNC | VIDCON1_INV_VSYNC | + VIDCON1_INV_VCLK, + .default_win = 0, + .bpp = 32, +}; +#else static struct s3c_fb_pd_win origen_fb_win0 = { .win_mode = { .left_margin = 64, @@ -603,6 +625,7 @@ static struct s3c_fb_platdata origen_lcd_pdata __initdata = { VIDCON1_INV_VCLK, .setup_gpio = exynos4_fimd0_gpio_setup_24bpp, }; +#endif /* Bluetooth rfkill gpio platform data */ struct rfkill_gpio_platform_data origen_bt_pdata = { @@ -642,6 +665,9 @@ static struct platform_device *origen_devices[] __initdata = { &s5p_device_mfc_l, &s5p_device_mfc_r, &s5p_device_mixer, +#ifdef CONFIG_DRM_EXYNOS + &exynos_device_drm, +#endif &exynos4_device_ohci, &origen_device_gpiokeys, &origen_lcd_hv070wsa, @@ -717,7 +743,12 @@ static void __init origen_machine_init(void) s5p_tv_setup(); s5p_i2c_hdmiphy_set_platdata(NULL); +#ifdef CONFIG_DRM_EXYNOS + s5p_device_fimd0.dev.platform_data = &drm_fimd_pdata; + exynos4_fimd0_gpio_setup_24bpp(); +#else s5p_fimd0_set_platdata(&origen_lcd_pdata); +#endif platform_add_devices(origen_devices, ARRAY_SIZE(origen_devices));