Skip to contentSkip to conversation

ARM: sunxi: fix struct sys_timer removal

PATCH New Stephen Warren 3 participants 3 messages Jan 8, 2013

Subsystems (3)
Arm (32-bit) Arm sub-architectures Arm/Allwinner sunXi SoC support
lore
Share & tools
lore

Stephen Warren

author
#0 lore raw

PATCH 1/1 ARM: sunxi: fix struct sys_timer removal

From: Stephen Warren <[email protected]>

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 <[email protected]>

---
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(-)
arch/arm/mach-sunxi/sunxi.c +1 -1
index 9be910f..cba4cd3 100644
@@ -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
Signature · 1 line
1.7.10.4
#1 lore raw

PATCH 1/1 ARM: sunxi: fix struct sys_timer removal

Hi Stephen,

Quoted 17 lines · Stephen Warren

From: Stephen Warren <[email protected]>

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 <[email protected]>

---
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.

Quoted 3 lines

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 <[email protected]>

Since I assume that Olof will apply this directly?

Maxime

Signature · 4 lines
Maxime Ripard, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
#2 lore raw

PATCH 1/1 ARM: sunxi: fix struct sys_timer removal

Quoted 24 lines · Maxime Ripard

Hi Stephen,

Quoted 17 lines · Stephen Warren

From: Stephen Warren <[email protected]>

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 <[email protected]>

---
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.

Quoted 3 lines

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?

Quoted 5 lines

I'm fine with having it as a follow-up patch.

Also, you can add my

Acked-by Maxime Ripard <[email protected]>

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