* [PATCH] ARM: sunxi: fix struct sys_timer removal
@ 2013-01-08 17:33 Stephen Warren
2013-01-08 19:13 ` Maxime Ripard
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Warren @ 2013-01-08 17:33 UTC (permalink / raw)
To: linux-arm-kernel
From: Stephen Warren <swarren@nvidia•com>
Commit 6bb27d7 "ARM: delete struct sys_timer" removed struct sys_timer,
but didn't update mach-sunxi/sunxi.c for this change, even though the
sunxi timer implementation itself was updated. This caused a build break:
arch/arm/mach-sunxi/sunxi.c:94:2: error: unknown field 'timer' specified in initializer
arch/arm/mach-sunxi/sunxi.c:94:12: error: 'sunxi_timer' undeclared here (not in a function)
Signed-off-by: Stephen Warren <swarren@nvidia•com>
---
Ideally, this commit would be squashed into 6bb27d7 in arm-soc's
timer-cleanup branch. However, that would change a few commit IDs, and
I've already pulled that branch into the Tegra and bcm2835 trees. I can
rebase those without issue if we co-ordinate so all the changes go into
the same linux-next version.
However, since sunxi isn't actually enabled in any defconfig until
v3.8-rc2, perhaps it's OK to apply this change as a separate patch on
top of timer-rework, and ignore the bisect issue?
arch/arm/mach-sunxi/sunxi.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/mach-sunxi/sunxi.c b/arch/arm/mach-sunxi/sunxi.c
index 9be910f..cba4cd3 100644
--- a/arch/arm/mach-sunxi/sunxi.c
+++ b/arch/arm/mach-sunxi/sunxi.c
@@ -91,6 +91,6 @@ DT_MACHINE_START(SUNXI_DT, "Allwinner A1X (Device Tree)")
.init_irq = sunxi_init_irq,
.handle_irq = sunxi_handle_irq,
.restart = sunxi_restart,
- .timer = &sunxi_timer,
+ .init_time = &sunxi_timer_init,
.dt_compat = sunxi_board_dt_compat,
MACHINE_END
--
1.7.10.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH] ARM: sunxi: fix struct sys_timer removal
2013-01-08 17:33 [PATCH] ARM: sunxi: fix struct sys_timer removal Stephen Warren
@ 2013-01-08 19:13 ` Maxime Ripard
2013-01-08 21:13 ` Olof Johansson
0 siblings, 1 reply; 3+ messages in thread
From: Maxime Ripard @ 2013-01-08 19:13 UTC (permalink / raw)
To: linux-arm-kernel
Hi Stephen,
On 08/01/2013 18:33, Stephen Warren wrote:
> From: Stephen Warren <swarren@nvidia•com>
>
> Commit 6bb27d7 "ARM: delete struct sys_timer" removed struct sys_timer,
> but didn't update mach-sunxi/sunxi.c for this change, even though the
> sunxi timer implementation itself was updated. This caused a build break:
>
> arch/arm/mach-sunxi/sunxi.c:94:2: error: unknown field 'timer' specified in initializer
> arch/arm/mach-sunxi/sunxi.c:94:12: error: 'sunxi_timer' undeclared here (not in a function)
>
> Signed-off-by: Stephen Warren <swarren@nvidia•com>
> ---
> Ideally, this commit would be squashed into 6bb27d7 in arm-soc's
> timer-cleanup branch. However, that would change a few commit IDs, and
> I've already pulled that branch into the Tegra and bcm2835 trees. I can
> rebase those without issue if we co-ordinate so all the changes go into
> the same linux-next version.
>
> However, since sunxi isn't actually enabled in any defconfig until
> v3.8-rc2, perhaps it's OK to apply this change as a separate patch on
> top of timer-rework, and ignore the bisect issue?
I'm fine with having it as a follow-up patch.
Also, you can add my
Acked-by: Maxime Ripard <maxime.ripard@free-electrons•com>
Since I assume that Olof will apply this directly?
Maxime
--
Maxime Ripard, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH] ARM: sunxi: fix struct sys_timer removal
2013-01-08 19:13 ` Maxime Ripard
@ 2013-01-08 21:13 ` Olof Johansson
0 siblings, 0 replies; 3+ messages in thread
From: Olof Johansson @ 2013-01-08 21:13 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Jan 8, 2013 at 11:13 AM, Maxime Ripard
<maxime.ripard@free-electrons•com> wrote:
> Hi Stephen,
>
> On 08/01/2013 18:33, Stephen Warren wrote:
>> From: Stephen Warren <swarren@nvidia•com>
>>
>> Commit 6bb27d7 "ARM: delete struct sys_timer" removed struct sys_timer,
>> but didn't update mach-sunxi/sunxi.c for this change, even though the
>> sunxi timer implementation itself was updated. This caused a build break:
>>
>> arch/arm/mach-sunxi/sunxi.c:94:2: error: unknown field 'timer' specified in initializer
>> arch/arm/mach-sunxi/sunxi.c:94:12: error: 'sunxi_timer' undeclared here (not in a function)
>>
>> Signed-off-by: Stephen Warren <swarren@nvidia•com>
>> ---
>> Ideally, this commit would be squashed into 6bb27d7 in arm-soc's
>> timer-cleanup branch. However, that would change a few commit IDs, and
>> I've already pulled that branch into the Tegra and bcm2835 trees. I can
>> rebase those without issue if we co-ordinate so all the changes go into
>> the same linux-next version.
>>
>> However, since sunxi isn't actually enabled in any defconfig until
>> v3.8-rc2, perhaps it's OK to apply this change as a separate patch on
>> top of timer-rework, and ignore the bisect issue?
>
> I'm fine with having it as a follow-up patch.
>
> Also, you can add my
> Acked-by: Maxime Ripard <maxime.ripard@free-electrons•com>
> Since I assume that Olof will apply this directly?
Yep, sorry I missed the reply -- I've already applied it actually.
Should show up in next linux-next.
-Olof
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-01-08 21:13 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-01-08 17:33 [PATCH] ARM: sunxi: fix struct sys_timer removal Stephen Warren
2013-01-08 19:13 ` Maxime Ripard
2013-01-08 21:13 ` Olof Johansson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox