Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

BCM2708: Use brcm,bcm2835-system-timer #1098

Merged
merged 1 commit into from
Aug 13, 2015

Conversation

notro
Copy link
Contributor

@notro notro commented Aug 13, 2015

When booting with Device Tree use drivers/clocksource/bcm2835_timer.c

Tested with and without DT.

@notro
Copy link
Contributor Author

notro commented Aug 13, 2015

Oh, I forgot about the warning, I'll see if I can fix that.

  CC      drivers/clocksource/bcm2835_timer.o
drivers/clocksource/bcm2835_timer.c:39:0: warning: "MAX_TIMER" redefined [enabled by default]
 #define MAX_TIMER 3
 ^
In file included from arch/arm/mach-bcm2708/include/mach/irqs.h:26:0,
                 from ./arch/arm/include/asm/irq.h:7,
                 from ./arch/arm/include/asm/hardirq.h:6,
                 from include/linux/hardirq.h:8,
                 from include/linux/interrupt.h:12,
                 from drivers/clocksource/bcm2835_timer.c:22:
arch/arm/mach-bcm2708/include/mach/platform.h:186:0: note: this is the location of the previous definition
 #define MAX_TIMER                       2
 ^

@pelwell
Copy link
Contributor

pelwell commented Aug 13, 2015

Is that symbol even used?

@notro
Copy link
Contributor Author

notro commented Aug 13, 2015

No it doesn't look like it is. I'm doing a build to be sure.

When booting with Device Tree use drivers/clocksource/bcm2835_timer.c

Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
@notro
Copy link
Contributor Author

notro commented Aug 13, 2015

I have removed MAX_TIMER from arch/arm/mach-bcm2708/include/mach/platform.h

@pelwell
Copy link
Contributor

pelwell commented Aug 13, 2015

That works for me.

pelwell added a commit that referenced this pull request Aug 13, 2015
BCM2708: Use brcm,bcm2835-system-timer
@pelwell pelwell merged commit 6245847 into raspberrypi:rpi-4.2.y Aug 13, 2015
@notro notro deleted the timer2708 branch August 13, 2015 20:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants