Re: [PATCH v2 04/11] OMAP4: hwmod: Include CSI2A and CSIPHY1 memory sections

[Kevin Hilman <khilman@ti.com>]

+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-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html