Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5d292ebf authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'bcm2835-for-3.9-cleanup' of... 

Merge tag 'bcm2835-for-3.9-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-rpi into next/cleanup

From Stephen Warren:
ARM: bcm2835: cleanup

This pull request simply converts the bcm2835 clocksource driver to use
the recently added CLKSRC_OF feature.

The branch is based on v3.8-rc3, followed by a merge of arm-soc's
timer/cleanup branch.

* tag 'bcm2835-for-3.9-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-rpi

:
  ARM: bcm2835: make use of CLKSRC_OF

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents c1353ef2 c1b724f6

arch/arm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -344,6 +344,7 @@ config ARCH_BCM2835 
	select ARM_ERRATA_411920

	select ARM_TIMER_SP804

	select CLKDEV_LOOKUP

	select CLKSRC_OF

	select COMMON_CLK

	select CPU_V6

	select GENERIC_CLOCKEVENTS

arch/arm/mach-bcm2835/bcm2835.c

+2 −2
Original line number Diff line number Diff line
@@ -17,8 +17,8 @@ 
#include <linux/irqchip/bcm2835.h>

#include <linux/of_address.h>

#include <linux/of_platform.h>

#include <linux/bcm2835_timer.h>

#include <linux/clk/bcm2835.h>

#include <linux/clocksource.h>



#include <asm/mach/arch.h>

#include <asm/mach/map.h>
@@ -104,7 +104,7 @@ DT_MACHINE_START(BCM2835, "BCM2835") 
	.init_irq = bcm2835_init_irq,

	.handle_irq = bcm2835_handle_irq,

	.init_machine = bcm2835_init,

	.init_time = bcm2835_timer_init,

	.init_time = clocksource_of_init,

	.restart = bcm2835_restart,

	.dt_compat = bcm2835_compat

MACHINE_END

drivers/clocksource/bcm2835_timer.c

+3 −2
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

 */



#include <linux/bcm2835_timer.h>

#include <linux/bitops.h>

#include <linux/clockchips.h>

#include <linux/clocksource.h>
@@ -101,7 +100,7 @@ static struct of_device_id bcm2835_time_match[] __initconst = { 
	{}

};



void __init bcm2835_timer_init(void)

static void __init bcm2835_timer_init(void)

{

	struct device_node *node;

	void __iomem *base;
@@ -155,3 +154,5 @@ void __init bcm2835_timer_init(void) 


	pr_info("bcm2835: system timer (irq = %d)\n", irq);

}

CLOCKSOURCE_OF_DECLARE(bcm2835, "brcm,bcm2835-system-timer",

			bcm2835_timer_init);

include/linux/bcm2835_timer.h

deleted100644 → 0
+0 −22
Original line number Diff line number Diff line 
/*

 * Copyright 2012 Simon Arlott

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; either version 2 of the License, or

 * (at your option) any later version.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */



#ifndef __BCM2835_TIMER_H

#define __BCM2835_TIMER_H



#include <asm/mach/time.h>



extern void bcm2835_timer_init(void);



#endif