From patchwork Thu Mar 1 04:05:51 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sachin Kamat X-Patchwork-Id: 7024 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 398E123EA8 for ; Thu, 1 Mar 2012 04:12:30 +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 0237CA182AF for ; Thu, 1 Mar 2012 04:12:29 +0000 (UTC) Received: by mail-iy0-f180.google.com with SMTP id e36so377519iag.11 for ; Wed, 29 Feb 2012 20:12:29 -0800 (PST) Received: from mr.google.com ([10.43.52.74]) by 10.43.52.74 with SMTP id vl10mr2390557icb.55.1330575149836 (num_hops = 1); Wed, 29 Feb 2012 20:12:29 -0800 (PST) Received: by 10.43.52.74 with SMTP id vl10mr1969035icb.55.1330575149791; Wed, 29 Feb 2012 20:12:29 -0800 (PST) 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.53.18 with SMTP id k18csp7226ibg; Wed, 29 Feb 2012 20:12:29 -0800 (PST) Received: by 10.68.135.66 with SMTP id pq2mr2651861pbb.158.1330575149110; Wed, 29 Feb 2012 20:12:29 -0800 (PST) Received: from mail-pw0-f50.google.com (mail-pw0-f50.google.com [209.85.160.50]) by mx.google.com with ESMTPS id l9si1396252pbi.69.2012.02.29.20.12.28 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 29 Feb 2012 20:12:29 -0800 (PST) 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-pw0-f50.google.com with SMTP id wz7so407726pbc.37 for ; Wed, 29 Feb 2012 20:12:28 -0800 (PST) Received-SPF: pass (google.com: domain of sachin.kamat@linaro.org designates 10.68.197.35 as permitted sender) client-ip=10.68.197.35; Received: from mr.google.com ([10.68.197.35]) by 10.68.197.35 with SMTP id ir3mr15116933pbc.84.1330575148948 (num_hops = 1); Wed, 29 Feb 2012 20:12:28 -0800 (PST) MIME-Version: 1.0 Received: by 10.68.197.35 with SMTP id ir3mr12553267pbc.84.1330575148854; Wed, 29 Feb 2012 20:12:28 -0800 (PST) Received: from localhost.localdomain ([115.113.119.130]) by mx.google.com with ESMTPS id g4sm944394pbs.17.2012.02.29.20.12.25 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 29 Feb 2012 20:12:28 -0800 (PST) From: Sachin Kamat To: linux-samsung-soc@vger.kernel.org Cc: kgene.kim@samsung.com, sachin.kamat@linaro.org, patches@linaro.org Subject: [PATCH 3/4] ARM: S5PV210: Add JPEG board definition Date: Thu, 1 Mar 2012 09:35:51 +0530 Message-Id: <1330574752-14088-4-git-send-email-sachin.kamat@linaro.org> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1330574752-14088-1-git-send-email-sachin.kamat@linaro.org> References: <1330574752-14088-1-git-send-email-sachin.kamat@linaro.org> X-Gm-Message-State: ALoCoQkOlxj/OOcDe4Rugxm/NSyIipT1f6j24TUSHsKjTginVEPGeC88bRbPV8ytOeGyJwSCsbU/ Adds JPEG board definition to S5PV210 machine Signed-off-by: Sachin Kamat --- arch/arm/mach-s5pv210/clock.c | 5 +++++ arch/arm/mach-s5pv210/include/mach/map.h | 4 ++++ 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/arch/arm/mach-s5pv210/clock.c b/arch/arm/mach-s5pv210/clock.c index b9ec0c3..09609d5 100644 --- a/arch/arm/mach-s5pv210/clock.c +++ b/arch/arm/mach-s5pv210/clock.c @@ -340,6 +340,11 @@ static struct clk init_clocks_off[] = { .enable = s5pv210_clk_ip0_ctrl, .ctrlbit = (1 << 26), }, { + .name = "jpeg", + .parent = &clk_hclk_dsys.clk, + .enable = s5pv210_clk_ip0_ctrl, + .ctrlbit = (1 << 28), + }, { .name = "mfc", .devname = "s5p-mfc", .parent = &clk_pclk_psys.clk, diff --git a/arch/arm/mach-s5pv210/include/mach/map.h b/arch/arm/mach-s5pv210/include/mach/map.h index 89c34b8..b7c8a19 100644 --- a/arch/arm/mach-s5pv210/include/mach/map.h +++ b/arch/arm/mach-s5pv210/include/mach/map.h @@ -90,6 +90,8 @@ #define S5PV210_PA_FIMC1 0xFB300000 #define S5PV210_PA_FIMC2 0xFB400000 +#define S5PV210_PA_JPEG 0xFB600000 + #define S5PV210_PA_SDO 0xF9000000 #define S5PV210_PA_VP 0xF9100000 #define S5PV210_PA_MIXER 0xF9200000 @@ -132,6 +134,8 @@ #define S5P_PA_SYSCON S5PV210_PA_SYSCON #define S5P_PA_TIMER S5PV210_PA_TIMER +#define S5P_PA_JPEG S5PV210_PA_JPEG + #define SAMSUNG_PA_ADC S5PV210_PA_ADC #define SAMSUNG_PA_CFCON S5PV210_PA_CFCON #define SAMSUNG_PA_KEYPAD S5PV210_PA_KEYPAD