From patchwork Fri Sep 30 10:31:52 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sachin Kamat X-Patchwork-Id: 4450 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 639F323EF6 for ; Fri, 30 Sep 2011 10:36:31 +0000 (UTC) Received: from mail-fx0-f52.google.com (mail-fx0-f52.google.com [209.85.161.52]) by fiordland.canonical.com (Postfix) with ESMTP id 5A078A187A0 for ; Fri, 30 Sep 2011 10:36:31 +0000 (UTC) Received: by fxe23 with SMTP id 23so3904365fxe.11 for ; Fri, 30 Sep 2011 03:36:31 -0700 (PDT) Received: by 10.223.63.8 with SMTP id z8mr5461274fah.84.1317378988688; Fri, 30 Sep 2011 03:36:28 -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.152.3.234 with SMTP id f10cs47428laf; Fri, 30 Sep 2011 03:36:28 -0700 (PDT) Received: by 10.236.37.202 with SMTP id y50mr71668617yha.101.1317378987520; Fri, 30 Sep 2011 03:36:27 -0700 (PDT) Received: from mail-gy0-f178.google.com (mail-gy0-f178.google.com [209.85.160.178]) by mx.google.com with ESMTPS id i9si2143868ana.2.2011.09.30.03.36.26 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 30 Sep 2011 03:36:27 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.160.178 is neither permitted nor denied by best guess record for domain of sachin.kamat@linaro.org) client-ip=209.85.160.178; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.160.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 gyf1 with SMTP id 1so1616277gyf.37 for ; Fri, 30 Sep 2011 03:36:26 -0700 (PDT) Received: by 10.68.42.99 with SMTP id n3mr54647254pbl.118.1317378986242; Fri, 30 Sep 2011 03:36:26 -0700 (PDT) Received: from localhost.localdomain ([115.113.119.130]) by mx.google.com with ESMTPS id e3sm16753571pbi.7.2011.09.30.03.36.23 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 30 Sep 2011 03:36:25 -0700 (PDT) From: Sachin Kamat To: linux-samsung-soc@vger.kernel.org Cc: kgene.kim@samsung.com, patches@linaro.org, sachin.kamat@linaro.org Subject: [PATCH] ARM: EXYNOS4: Enable MFC on Origen Date: Fri, 30 Sep 2011 16:01:52 +0530 Message-Id: <1317378712-12287-1-git-send-email-sachin.kamat@linaro.org> X-Mailer: git-send-email 1.7.4.1 This patch enables multi-format codec (MFC) support on Origen board. Signed-off-by: Sachin Kamat --- PD related code in KConfig and header are added only because for-next branch of Kgene's tree does not have it enabled yet. --- arch/arm/mach-exynos4/Kconfig | 2 ++ arch/arm/mach-exynos4/mach-origen.c | 13 +++++++++++++ 2 files changed, 15 insertions(+), 0 deletions(-) diff --git a/arch/arm/mach-exynos4/Kconfig b/arch/arm/mach-exynos4/Kconfig index d0491c2..93f9a62 100644 --- a/arch/arm/mach-exynos4/Kconfig +++ b/arch/arm/mach-exynos4/Kconfig @@ -243,6 +243,8 @@ config MACH_ORIGEN select S5P_DEV_I2C_HDMIPHY select S5P_DEV_TV select S5P_DEV_USB_EHCI + select S5P_DEV_MFC + select EXYNOS4_DEV_PD select SAMSUNG_DEV_BACKLIGHT select SAMSUNG_DEV_PWM select EXYNOS4_SETUP_SDHCI diff --git a/arch/arm/mach-exynos4/mach-origen.c b/arch/arm/mach-exynos4/mach-origen.c index 421294b..4e53d10 100644 --- a/arch/arm/mach-exynos4/mach-origen.c +++ b/arch/arm/mach-exynos4/mach-origen.c @@ -30,6 +30,8 @@ #include #include #include +#include +#include #include @@ -167,6 +169,10 @@ static struct platform_device *origen_devices[] __initdata = { &s5p_device_hdmi, &s5p_device_i2c_hdmiphy, &s5p_device_mixer, + &s5p_device_mfc, + &s5p_device_mfc_l, + &s5p_device_mfc_r, + &exynos4_device_pd[PD_MFC], &origen_device_gpiokeys, }; @@ -188,6 +194,11 @@ static void __init origen_map_io(void) s3c24xx_init_uarts(origen_uartcfgs, ARRAY_SIZE(origen_uartcfgs)); } +static void __init origen_reserve(void) +{ + s5p_mfc_reserve_mem(0x43000000, 8 << 20, 0x51000000, 8 << 20); +} + static void __init origen_machine_init(void) { /* @@ -203,6 +214,7 @@ static void __init origen_machine_init(void) s5p_i2c_hdmiphy_set_platdata(NULL); platform_add_devices(origen_devices, ARRAY_SIZE(origen_devices)); + s5p_device_mfc.dev.parent = &exynos4_device_pd[PD_MFC].dev; samsung_bl_set(&origen_bl_gpio_info, &origen_bl_data); } @@ -214,4 +226,5 @@ MACHINE_START(ORIGEN, "ORIGEN") .map_io = origen_map_io, .init_machine = origen_machine_init, .timer = &exynos4_timer, + .reserve = &origen_reserve, MACHINE_END