Message ID | 1322698500-29924-5-git-send-email-saaguirre@ti.com (mailing list archive) |
---|---|
State | RFC, archived |
Headers |
Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from <linux-media-owner@vger.kernel.org>) id 1RVuJk-0006zD-NS; Thu, 01 Dec 2011 01:16:00 +0100 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-2) with esmtp id 1RVuJj-0001oq-Ia; Thu, 01 Dec 2011 01:16:00 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753348Ab1LAAPw (ORCPT <rfc822;hunold@linuxtv.org> + 4 others); Wed, 30 Nov 2011 19:15:52 -0500 Received: from arroyo.ext.ti.com ([192.94.94.40]:37094 "EHLO arroyo.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753075Ab1LAAPQ (ORCPT <rfc822;linux-media@vger.kernel.org>); Wed, 30 Nov 2011 19:15:16 -0500 Received: from dlep33.itg.ti.com ([157.170.170.112]) by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id pB10F4fp004172 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 30 Nov 2011 18:15:05 -0600 Received: from dlep26.itg.ti.com (smtp-le.itg.ti.com [157.170.170.27]) by dlep33.itg.ti.com (8.13.7/8.13.8) with ESMTP id pB10F4li016513; Wed, 30 Nov 2011 18:15:04 -0600 (CST) Received: from DFLE70.ent.ti.com (localhost [127.0.0.1]) by dlep26.itg.ti.com (8.13.8/8.13.8) with ESMTP id pB10F4KW029583; Wed, 30 Nov 2011 18:15:04 -0600 (CST) Received: from dlelxv23.itg.ti.com (172.17.1.198) by dfle70.ent.ti.com (128.247.5.40) with Microsoft SMTP Server id 14.1.323.3; Wed, 30 Nov 2011 18:15:05 -0600 Received: from legion.dal.design.ti.com (legion.dal.design.ti.com [128.247.22.53]) by dlelxv23.itg.ti.com (8.13.8/8.13.8) with ESMTP id pB10F4iJ013186; Wed, 30 Nov 2011 18:15:04 -0600 Received: from localhost (dtx0091359-ubuntu-2.am.dhcp.ti.com [10.247.19.253]) by legion.dal.design.ti.com (8.11.7p1+Sun/8.11.7) with ESMTP id pB10F3028924; Wed, 30 Nov 2011 18:15:03 -0600 (CST) From: Sergio Aguirre <saaguirre@ti.com> To: <linux-media@vger.kernel.org> CC: <linux-omap@vger.kernel.org>, <laurent.pinchart@ideasonboard.com>, <sakari.ailus@iki.fi>, Sergio Aguirre <saaguirre@ti.com> Subject: [PATCH v2 04/11] OMAP4: hwmod: Include CSI2A and CSIPHY1 memory sections Date: Wed, 30 Nov 2011 18:14:53 -0600 Message-ID: <1322698500-29924-5-git-send-email-saaguirre@ti.com> X-Mailer: git-send-email 1.7.7.4 In-Reply-To: <1322698500-29924-1-git-send-email-saaguirre@ti.com> References: <1322698500-29924-1-git-send-email-saaguirre@ti.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: <linux-media.vger.kernel.org> X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 5.6.1.2065439, Antispam-Engine: 2.7.2.376379, Antispam-Data: 2011.12.1.319 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' MULTIPLE_RCPTS 0.1, MSGID_ADDED_BY_MTA 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_1400_1499 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, DATE_TZ_NA 0, __ANY_URI 0, __CP_URI_IN_BODY 0, __CT 0, __CT_TEXT_PLAIN 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __MIME_TEXT_ONLY 0, __MIME_VERSION 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 ' X-LSpam-Score: -6.9 (------) X-LSpam-Report: No, score=-6.9 required=5.0 tests=BAYES_00=-1.9, RCVD_IN_DNSWL_HI=-5 autolearn=ham |
Commit Message
Aguirre Rodriguez, Sergio Alberto
Dec. 1, 2011, 12:14 a.m. UTC
Signed-off-by: Sergio Aguirre <saaguirre@ti.com>
---
arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
Comments
> -----Original Message----- > From: linux-media-owner@vger.kernel.org [mailto:linux-media- > owner@vger.kernel.org] On Behalf Of Aguirre, Sergio > Sent: Thursday, December 01, 2011 5:45 AM > To: linux-media@vger.kernel.org > Cc: linux-omap@vger.kernel.org; laurent.pinchart@ideasonboard.com; > sakari.ailus@iki.fi; Aguirre, Sergio > Subject: [PATCH v2 04/11] OMAP4: hwmod: Include CSI2A and CSIPHY1 memory > sections > > Signed-off-by: Sergio Aguirre <saaguirre@ti.com> > --- > arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 16 +++++++++++++--- > 1 files changed, 13 insertions(+), 3 deletions(-) > > diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach- > omap2/omap_hwmod_44xx_data.c > index 7695e5d..1b59e2f 100644 > --- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c > +++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c > @@ -2623,8 +2623,18 @@ static struct omap_hwmod_ocp_if > *omap44xx_iss_masters[] = { > > static struct omap_hwmod_addr_space omap44xx_iss_addrs[] = { > { > - .pa_start = 0x52000000, > - .pa_end = 0x520000ff, > + .pa_start = OMAP44XX_ISS_TOP_BASE, > + .pa_end = OMAP44XX_ISS_TOP_END, > + .flags = ADDR_TYPE_RT > + }, > + { > + .pa_start = OMAP44XX_ISS_CSI2_A_REGS1_BASE, > + .pa_end = OMAP44XX_ISS_CSI2_A_REGS1_END, > + .flags = ADDR_TYPE_RT > + }, > + { > + .pa_start = OMAP44XX_ISS_CAMERARX_CORE1_BASE, > + .pa_end = OMAP44XX_ISS_CAMERARX_CORE1_END, > .flags = ADDR_TYPE_RT > }, This patch will result in build failure, because, the above base addresses are getting defined in the next patch [PATCH v2 05/11] OMAP4: Add base addresses for ISS Thanks, Vaibhav > { } > @@ -5350,7 +5360,7 @@ static __initdata struct omap_hwmod > *omap44xx_hwmods[] = { > &omap44xx_ipu_c1_hwmod, > > /* iss class */ > -/* &omap44xx_iss_hwmod, */ > + &omap44xx_iss_hwmod, > > /* iva class */ > &omap44xx_iva_hwmod, > -- > 1.7.7.4 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-media" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Vaibhav, Thanks for the comments. On Thu, Dec 1, 2011 at 12:34 AM, Hiremath, Vaibhav <hvaibhav@ti.com> wrote: > >> -----Original Message----- >> From: linux-media-owner@vger.kernel.org [mailto:linux-media- >> owner@vger.kernel.org] On Behalf Of Aguirre, Sergio >> Sent: Thursday, December 01, 2011 5:45 AM >> To: linux-media@vger.kernel.org >> Cc: linux-omap@vger.kernel.org; laurent.pinchart@ideasonboard.com; >> sakari.ailus@iki.fi; Aguirre, Sergio >> Subject: [PATCH v2 04/11] OMAP4: hwmod: Include CSI2A and CSIPHY1 memory >> sections >> >> Signed-off-by: Sergio Aguirre <saaguirre@ti.com> >> --- >> arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 16 +++++++++++++--- >> 1 files changed, 13 insertions(+), 3 deletions(-) >> >> diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach- >> omap2/omap_hwmod_44xx_data.c >> index 7695e5d..1b59e2f 100644 >> --- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c >> +++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c >> @@ -2623,8 +2623,18 @@ static struct omap_hwmod_ocp_if >> *omap44xx_iss_masters[] = { >> >> static struct omap_hwmod_addr_space omap44xx_iss_addrs[] = { >> { >> - .pa_start = 0x52000000, >> - .pa_end = 0x520000ff, >> + .pa_start = OMAP44XX_ISS_TOP_BASE, >> + .pa_end = OMAP44XX_ISS_TOP_END, >> + .flags = ADDR_TYPE_RT >> + }, >> + { >> + .pa_start = OMAP44XX_ISS_CSI2_A_REGS1_BASE, >> + .pa_end = OMAP44XX_ISS_CSI2_A_REGS1_END, >> + .flags = ADDR_TYPE_RT >> + }, >> + { >> + .pa_start = OMAP44XX_ISS_CAMERARX_CORE1_BASE, >> + .pa_end = OMAP44XX_ISS_CAMERARX_CORE1_END, >> .flags = ADDR_TYPE_RT >> }, > This patch will result in build failure, because, the above base addresses > are getting defined in the next patch > > [PATCH v2 05/11] OMAP4: Add base addresses for ISS Agreed. Will revisit "git-bisectability" of the patch series. Will fix. Regards, Sergio > > Thanks, > Vaibhav > >> { } >> @@ -5350,7 +5360,7 @@ static __initdata struct omap_hwmod >> *omap44xx_hwmods[] = { >> &omap44xx_ipu_c1_hwmod, >> >> /* iss class */ >> -/* &omap44xx_iss_hwmod, */ >> + &omap44xx_iss_hwmod, >> >> /* iva class */ >> &omap44xx_iva_hwmod, >> -- >> 1.7.7.4 >> >> -- >> To unsubscribe from this list: send the line "unsubscribe linux-media" in >> the body of a message to majordomo@vger.kernel.org >> More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
+Benoit, "Aguirre, Sergio" <saaguirre@ti.com> writes: > Hi Vaibhav, > > Thanks for the comments. > > On Thu, Dec 1, 2011 at 12:34 AM, Hiremath, Vaibhav <hvaibhav@ti.com> wrote: >> >>> -----Original Message----- >>> From: linux-media-owner@vger.kernel.org [mailto:linux-media- >>> owner@vger.kernel.org] On Behalf Of Aguirre, Sergio >>> Sent: Thursday, December 01, 2011 5:45 AM >>> To: linux-media@vger.kernel.org >>> Cc: linux-omap@vger.kernel.org; laurent.pinchart@ideasonboard.com; >>> sakari.ailus@iki.fi; Aguirre, Sergio >>> Subject: [PATCH v2 04/11] OMAP4: hwmod: Include CSI2A and CSIPHY1 memory >>> sections >>> >>> Signed-off-by: Sergio Aguirre <saaguirre@ti.com> >>> --- >>> arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 16 +++++++++++++--- >>> 1 files changed, 13 insertions(+), 3 deletions(-) >>> >>> diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach- >>> omap2/omap_hwmod_44xx_data.c >>> index 7695e5d..1b59e2f 100644 >>> --- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c >>> +++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c >>> @@ -2623,8 +2623,18 @@ static struct omap_hwmod_ocp_if >>> *omap44xx_iss_masters[] = { >>> >>> static struct omap_hwmod_addr_space omap44xx_iss_addrs[] = { >>> { >>> - .pa_start = 0x52000000, >>> - .pa_end = 0x520000ff, >>> + .pa_start = OMAP44XX_ISS_TOP_BASE, >>> + .pa_end = OMAP44XX_ISS_TOP_END, >>> + .flags = ADDR_TYPE_RT >>> + }, >>> + { >>> + .pa_start = OMAP44XX_ISS_CSI2_A_REGS1_BASE, >>> + .pa_end = OMAP44XX_ISS_CSI2_A_REGS1_END, >>> + .flags = ADDR_TYPE_RT >>> + }, >>> + { >>> + .pa_start = OMAP44XX_ISS_CAMERARX_CORE1_BASE, >>> + .pa_end = OMAP44XX_ISS_CAMERARX_CORE1_END, >>> .flags = ADDR_TYPE_RT >>> }, >> This patch will result in build failure, because, the above base addresses >> are getting defined in the next patch >> >> [PATCH v2 05/11] OMAP4: Add base addresses for ISS > > Agreed. Will revisit "git-bisectability" of the patch series. Will fix. To fix this, just drop the #defines from the header, and use raw addresses directly. Also, work with Benoit to make sure at the scripts that autogenerate this data are updated to include these two regions. Kevin -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Kevin, Thanks for the review. On Fri, Dec 2, 2011 at 4:49 PM, Kevin Hilman <khilman@ti.com> wrote: > +Benoit, > > "Aguirre, Sergio" <saaguirre@ti.com> writes: > >> Hi Vaibhav, >> >> Thanks for the comments. >> >> On Thu, Dec 1, 2011 at 12:34 AM, Hiremath, Vaibhav <hvaibhav@ti.com> wrote: >>> >>>> -----Original Message----- >>>> From: linux-media-owner@vger.kernel.org [mailto:linux-media- >>>> owner@vger.kernel.org] On Behalf Of Aguirre, Sergio >>>> Sent: Thursday, December 01, 2011 5:45 AM >>>> To: linux-media@vger.kernel.org >>>> Cc: linux-omap@vger.kernel.org; laurent.pinchart@ideasonboard.com; >>>> sakari.ailus@iki.fi; Aguirre, Sergio >>>> Subject: [PATCH v2 04/11] OMAP4: hwmod: Include CSI2A and CSIPHY1 memory >>>> sections >>>> >>>> Signed-off-by: Sergio Aguirre <saaguirre@ti.com> >>>> --- >>>> arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 16 +++++++++++++--- >>>> 1 files changed, 13 insertions(+), 3 deletions(-) >>>> >>>> diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach- >>>> omap2/omap_hwmod_44xx_data.c >>>> index 7695e5d..1b59e2f 100644 >>>> --- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c >>>> +++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c >>>> @@ -2623,8 +2623,18 @@ static struct omap_hwmod_ocp_if >>>> *omap44xx_iss_masters[] = { >>>> >>>> static struct omap_hwmod_addr_space omap44xx_iss_addrs[] = { >>>> { >>>> - .pa_start = 0x52000000, >>>> - .pa_end = 0x520000ff, >>>> + .pa_start = OMAP44XX_ISS_TOP_BASE, >>>> + .pa_end = OMAP44XX_ISS_TOP_END, >>>> + .flags = ADDR_TYPE_RT >>>> + }, >>>> + { >>>> + .pa_start = OMAP44XX_ISS_CSI2_A_REGS1_BASE, >>>> + .pa_end = OMAP44XX_ISS_CSI2_A_REGS1_END, >>>> + .flags = ADDR_TYPE_RT >>>> + }, >>>> + { >>>> + .pa_start = OMAP44XX_ISS_CAMERARX_CORE1_BASE, >>>> + .pa_end = OMAP44XX_ISS_CAMERARX_CORE1_END, >>>> .flags = ADDR_TYPE_RT >>>> }, >>> This patch will result in build failure, because, the above base addresses >>> are getting defined in the next patch >>> >>> [PATCH v2 05/11] OMAP4: Add base addresses for ISS >> >> Agreed. Will revisit "git-bisectability" of the patch series. Will fix. > > To fix this, just drop the #defines from the header, and use raw > addresses directly. Ok, i'll drop patch #5 in this series. > > Also, work with Benoit to make sure at the scripts that autogenerate > this data are updated to include these two regions. Ok. As a side note, I might need more addresses for the rest of the ISP components later on. I'll enable more subsystems once the CSI2-A only initial version is in an acceptable state. Regards, Sergio > > Kevin -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
"Aguirre, Sergio" <saaguirre@ti.com> writes: [...] >> >> Also, work with Benoit to make sure at the scripts that autogenerate >> this data are updated to include these two regions. > > Ok. > > As a side note, I might need more addresses for the rest of the ISP > components later on. I'll enable more subsystems once the CSI2-A only > initial version is in an acceptable state. That's fine, just work with Benoit to be sure that the autogen scripts are updated for all the subsystems. Kevin -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c index 7695e5d..1b59e2f 100644 --- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c @@ -2623,8 +2623,18 @@ static struct omap_hwmod_ocp_if *omap44xx_iss_masters[] = { static struct omap_hwmod_addr_space omap44xx_iss_addrs[] = { { - .pa_start = 0x52000000, - .pa_end = 0x520000ff, + .pa_start = OMAP44XX_ISS_TOP_BASE, + .pa_end = OMAP44XX_ISS_TOP_END, + .flags = ADDR_TYPE_RT + }, + { + .pa_start = OMAP44XX_ISS_CSI2_A_REGS1_BASE, + .pa_end = OMAP44XX_ISS_CSI2_A_REGS1_END, + .flags = ADDR_TYPE_RT + }, + { + .pa_start = OMAP44XX_ISS_CAMERARX_CORE1_BASE, + .pa_end = OMAP44XX_ISS_CAMERARX_CORE1_END, .flags = ADDR_TYPE_RT }, { } @@ -5350,7 +5360,7 @@ static __initdata struct omap_hwmod *omap44xx_hwmods[] = { &omap44xx_ipu_c1_hwmod, /* iss class */ -/* &omap44xx_iss_hwmod, */ + &omap44xx_iss_hwmod, /* iva class */ &omap44xx_iva_hwmod,