[PATCH] ARM: S5PV210: Fix compilation error in mach-goni.c

[PATCH] ARM: S5PV210: Fix compilation error in mach-goni.c

[Sachin Kamat]

Commit 56bc91 ("[media] s5p-fimc: Redefine platform data structure for fimc-is")
split bus_type into fimc_bus_type and sensor_bus_type and converted all
instances of it. This file however escaped the change.

Without this patch we get the following build error:
arch/arm/mach-s5pv210/mach-goni.c:848:3: error:
unknown field ‘bus_type’ specified in initializer

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Cc: Sylwester Nawrocki <s.nawrocki@samsung.com>
---
Based on Linus' mainline kernel tree (v3.8+).
---
 arch/arm/mach-s5pv210/mach-goni.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/arm/mach-s5pv210/mach-goni.c b/arch/arm/mach-s5pv210/mach-goni.c
index 3a38f7b..e373de4 100644
--- a/arch/arm/mach-s5pv210/mach-goni.c
+++ b/arch/arm/mach-s5pv210/mach-goni.c
@@ -845,7 +845,7 @@ static struct fimc_source_info goni_camera_sensors[] = {
 		.mux_id		= 0,
 		.flags		= V4L2_MBUS_PCLK_SAMPLE_FALLING |
 				  V4L2_MBUS_VSYNC_ACTIVE_LOW,
-		.bus_type	= FIMC_BUS_TYPE_ITU_601,
+		.fimc_bus_type	= FIMC_BUS_TYPE_ITU_601,
 		.board_info	= &noon010pc30_board_info,
 		.i2c_bus_num	= 0,
 		.clk_frequency	= 16000000UL,
-- 
1.7.4.1

Re: [PATCH] ARM: S5PV210: Fix compilation error in mach-goni.c

[Sylwester Nawrocki]

Hi Sachin,

On 02/25/2013 09:12 AM, Sachin Kamat wrote:
> Commit 56bc91 ("[media] s5p-fimc: Redefine platform data structure for fimc-is")
> split bus_type into fimc_bus_type and sensor_bus_type and converted all
> instances of it. This file however escaped the change.
> 
> Without this patch we get the following build error:
> arch/arm/mach-s5pv210/mach-goni.c:848:3: error:
> unknown field ‘bus_type’ specified in initializer
> 
> Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
> Cc: Sylwester Nawrocki <s.nawrocki@samsung.com>

Thanks for the patch. My apologies for this omission, there is already
similar patch from Arnd [1], [2]. I've asked Mauro to add it to his
tree before the merge window has opened but the media tree was finally
sent without this fixup patch.

[1] https://patchwork.kernel.org/patch/2143211
[2] http://patchwork.linuxtv.org/patch/16892


Thanks,
Sylwester

Re: [PATCH] ARM: S5PV210: Fix compilation error in mach-goni.c

[Sachin Kamat]

Hi Sylwester,

On 25 February 2013 15:34, Sylwester Nawrocki <s.nawrocki@samsung.com> wrote:
> Hi Sachin,
>
> On 02/25/2013 09:12 AM, Sachin Kamat wrote:
>> Commit 56bc91 ("[media] s5p-fimc: Redefine platform data structure for fimc-is")
>> split bus_type into fimc_bus_type and sensor_bus_type and converted all
>> instances of it. This file however escaped the change.
>>
>> Without this patch we get the following build error:
>> arch/arm/mach-s5pv210/mach-goni.c:848:3: error:
>> unknown field ‘bus_type’ specified in initializer
>>
>> Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
>> Cc: Sylwester Nawrocki <s.nawrocki@samsung.com>
>
> Thanks for the patch. My apologies for this omission, there is already
> similar patch from Arnd [1], [2].

Yes, they fix the same issue. I had not noticed them earlier.

-- 
With warm regards,
Sachin

RE: [PATCH] ARM: S5PV210: Fix compilation error in mach-goni.c

[Kukjin Kim]

Sachin Kamat wrote:
> 
> Hi Sylwester,
> 
> On 25 February 2013 15:34, Sylwester Nawrocki <s.nawrocki@samsung.com>
> wrote:
> > Hi Sachin,
> >
> > On 02/25/2013 09:12 AM, Sachin Kamat wrote:
> >> Commit 56bc91 ("[media] s5p-fimc: Redefine platform data structure for
> fimc-is")
> >> split bus_type into fimc_bus_type and sensor_bus_type and converted all
> >> instances of it. This file however escaped the change.
> >>
> >> Without this patch we get the following build error:
> >> arch/arm/mach-s5pv210/mach-goni.c:848:3: error:
> >> unknown field 'bus_type' specified in initializer
> >>
> >> Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
> >> Cc: Sylwester Nawrocki <s.nawrocki@samsung.com>
> >
> > Thanks for the patch. My apologies for this omission, there is already
> > similar patch from Arnd [1], [2].
> 
> Yes, they fix the same issue. I had not noticed them earlier.
> 
So, when can be fixed?

arch/arm/mach-s5pv210/mach-goni.c:848:3: error: unknown field 'bus_type'
specified in initializer
  CC      arch/arm/mm/idmap.o
make[2]: *** [arch/arm/mach-s5pv210/mach-goni.o] Error 1
make[2]: *** Waiting for unfinished jobs....

- Kukjin

Re: [PATCH] ARM: S5PV210: Fix compilation error in mach-goni.c

[Sylwester Nawrocki]

On 03/04/2013 02:11 PM, Kukjin Kim wrote:
> Sachin Kamat wrote:
>> On 25 February 2013 15:34, Sylwester Nawrocki <s.nawrocki@samsung.com>
>> wrote:
>>> On 02/25/2013 09:12 AM, Sachin Kamat wrote:
>>>> Commit 56bc91 ("[media] s5p-fimc: Redefine platform data structure for
>> fimc-is")
>>>> split bus_type into fimc_bus_type and sensor_bus_type and converted all
>>>> instances of it. This file however escaped the change.
>>>>
>>>> Without this patch we get the following build error:
>>>> arch/arm/mach-s5pv210/mach-goni.c:848:3: error:
>>>> unknown field 'bus_type' specified in initializer
>>>>
>>>> Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
>>>> Cc: Sylwester Nawrocki <s.nawrocki@samsung.com>
>>>
>>> Thanks for the patch. My apologies for this omission, there is already
>>> similar patch from Arnd [1], [2].
>>
>> Yes, they fix the same issue. I had not noticed them earlier.
>>
> So, when can be fixed?

Could you apply patch from Arnd: "[PATCH 8/9] s5p-fimc: fix s5pv210 build"
or teh $subject patch from Sachin ? It may take long time to push the fix
through the media tree, as Mauro sends bug fixes to Linus usually only
twice per whole -rc cycle. And now the issue is only at arch/arm, hence
the arm-soc tree may be more appropriate.

My apologies for overlooking this, I'll be more careful next time.

> arch/arm/mach-s5pv210/mach-goni.c:848:3: error: unknown field 'bus_type'
> specified in initializer
>   CC      arch/arm/mm/idmap.o
> make[2]: *** [arch/arm/mach-s5pv210/mach-goni.o] Error 1
> make[2]: *** Waiting for unfinished jobs....
> 
> - Kukjin

Regards,
Sylwester