From patchwork Wed May 2 15:15:42 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Aguirre Rodriguez, Sergio Alberto" X-Patchwork-Id: 10963 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1SPbHo-0004C9-DJ for patchwork@linuxtv.org; Wed, 02 May 2012 17:16:12 +0200 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.75/mailfrontend-3) with esmtp for id 1SPbHn-0003it-FX; Wed, 02 May 2012 17:16:12 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755431Ab2EBPQH (ORCPT ); Wed, 2 May 2012 11:16:07 -0400 Received: from na3sys009aog120.obsmtp.com ([74.125.149.140]:48018 "EHLO na3sys009aog120.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754281Ab2EBPQG (ORCPT ); Wed, 2 May 2012 11:16:06 -0400 Received: from mail-qc0-f176.google.com ([209.85.216.176]) (using TLSv1) by na3sys009aob120.postini.com ([74.125.148.12]) with SMTP ID DSNKT6FPtR/8NxqXW4ZNHb6GMUD6JqBR9lCo@postini.com; Wed, 02 May 2012 08:16:06 PDT Received: by qcsd1 with SMTP id d1so570915qcs.35 for ; Wed, 02 May 2012 08:16:04 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=JOQOtOlSG3BsVpVa+XcufTYG3yGWFO0PEVsHsWLFMmg=; b=eFUZvPyi3w6ksUV5mhPXPoRC5OuI/ydWY0k612Og8Bof3ILJTT3atCfcQO25fpqQb+ hgW71Zga/b66iX8tKPwRzM6uYnotqxx2MnJ+ZfuGs84KOBxfWafxmPXprxoOhfmHpORv 61vS7WATw5GV94iTo6MxBM5bJ+zgAid1uOAC4gqkykhAo96OcV676UEIj9IGPBSpNOq6 o9yEk/vIaIO2XYS0vYhXlh6gzhOZ0mKcK4DM9hknQvsvO54iXFb7Zypahhzi3FqZL7Vf PrukUc5JgeTY/fENNYIvFg5ADKaXXgm0DYpVcZdln+TseN3HtGksd7lU5NlZZdrwr9nh xoIw== Received: by 10.60.169.146 with SMTP id ae18mr40540063oec.36.1335971764331; Wed, 02 May 2012 08:16:04 -0700 (PDT) Received: from localhost.localdomain (dragon.ti.com. [192.94.94.33]) by mx.google.com with ESMTPS id bd10sm2259391obb.15.2012.05.02.08.16.02 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 02 May 2012 08:16:03 -0700 (PDT) From: Sergio Aguirre To: linux-media@vger.kernel.org Cc: linux-omap@vger.kernel.org, Sergio Aguirre Subject: [PATCH v3 03/10] OMAP4: Add base addresses for ISS Date: Wed, 2 May 2012 10:15:42 -0500 Message-Id: <1335971749-21258-4-git-send-email-saaguirre@ti.com> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1335971749-21258-1-git-send-email-saaguirre@ti.com> References: <1335971749-21258-1-git-send-email-saaguirre@ti.com> X-Gm-Message-State: ALoCoQn+20235oX8MdDx8FzMeyJhvcVWa+7SlP1WjuyflleUIaZ8eCxsq3n1HeEyIIyOGOxHnPVZ Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 5.6.1.2065439, Antispam-Engine: 2.7.2.376379, Antispam-Data: 2012.5.2.150327 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_1800_1899 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, DATE_TZ_NA 0, DATE_TZ_NEG_0500 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CP_URI_IN_BODY 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __MIME_TEXT_ONLY 0, __MULTIPLE_RCPTS_CC_X2 0, __SANE_MSGID 0, __SUBJ_ALPHA_END 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS ' NOTE: This isn't the whole list of features that the ISS supports, but the only ones supported at the moment. Signed-off-by: Sergio Aguirre --- arch/arm/mach-omap2/devices.c | 32 ++++++++++++++++++++++++++++++++ 1 files changed, 32 insertions(+), 0 deletions(-) diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c index e433603..2b8cf73 100644 --- a/arch/arm/mach-omap2/devices.c +++ b/arch/arm/mach-omap2/devices.c @@ -19,6 +19,8 @@ #include #include +#include + #include #include #include @@ -236,6 +238,36 @@ int omap3_init_camera(struct isp_platform_data *pdata) #endif +int omap4_init_camera(struct iss_platform_data *pdata, struct omap_board_data *bdata) +{ + struct platform_device *pdev; + struct omap_hwmod *oh; + struct iss_platform_data *omap4iss_pdata; + const char *oh_name = "iss"; + const char *name = "omap4iss"; + + oh = omap_hwmod_lookup(oh_name); + if (!oh) { + pr_err("Could not look up %s\n", oh_name); + return -ENODEV; + } + + omap4iss_pdata = pdata; + + pdev = omap_device_build(name, -1, oh, omap4iss_pdata, + sizeof(struct iss_platform_data), NULL, 0, 0); + + if (IS_ERR(pdev)) { + WARN(1, "Can't build omap_device for %s:%s.\n", + name, oh->name); + return PTR_ERR(pdev); + } + + oh->mux = omap_hwmod_mux_init(bdata->pads, bdata->pads_cnt); + + return 0; +} + static inline void omap_init_camera(void) { #if defined(CONFIG_VIDEO_OMAP2) || defined(CONFIG_VIDEO_OMAP2_MODULE)