Skip to content

Comments

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

Merged
pelwell merged 1 commit intoraspberrypi:rpi-4.2.yfrom
notro:timer2708
Aug 13, 2015
Merged

BCM2708: Use brcm,bcm2835-system-timer#1098
pelwell merged 1 commit intoraspberrypi:rpi-4.2.yfrom
notro:timer2708

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.

@notro
BCM2708: Use brcm,bcm2835-system-timer
8a2bd9f 
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
@pelwell
Merge pull request #1098 from notro/timer2708
6245847 
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
@burtyb burtyb mentioned this pull request Mar 15, 2018
Closed
@Jamtek Jamtek mentioned this pull request Mar 17, 2018
Closed
@jonshouse1 jonshouse1 mentioned this pull request Apr 23, 2018
Closed
@wocka-wocka wocka-wocka mentioned this pull request Apr 26, 2018
Closed
@Zaitchikk Zaitchikk mentioned this pull request Aug 20, 2019
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@notro @pelwell