Commit 0fc869e8 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'cleanup/dt-clock' into next/soc 



Merging in dt clock cleanup as a pre-req with some of the later SoC branches.

There are a handful of conflicts here -- some of the already merged SoC
branches should have been based on the cleanup but weren't.

In particular, a remove/add of include on highbank and two remove/remove
conflicts on kirkwood were fixed up.

* cleanup/dt-clock: (28 commits)
  ARM: vt8500: remove custom .init_time hook
  ARM: vexpress: remove custom .init_time hook
  ARM: tegra: remove custom .init_time hook
  ARM: sunxi: remove custom .init_time hook
  ARM: sti: remove custom .init_time hook
  ARM: socfpga: remove custom .init_time hook
  ARM: rockchip: remove custom .init_time hook
  ARM: prima2: remove custom .init_time hook
  ARM: nspire: remove custom .init_time hook
  ARM: nomadik: remove custom .init_time hook
  ARM: mxs: remove custom .init_time hook
  ARM: kirkwood: remove custom .init_time hook
  ARM: imx: remove custom .init_time hook
  ARM: highbank: remove custom .init_time hook
  ARM: exynos: remove custom .init_time hook
  ARM: dove: remove custom .init_time hook
  ARM: bcm2835: remove custom .init_time hook
  ARM: bcm: provide common arch init for DT clocks
  ARM: call of_clk_init from default time_init handler
  ARM: vt8500: prepare for arch-wide .init_time callback
  ...

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 4dcf0334 64cc69ab

arch/arm/kernel/time.c

+17 −12
Original line number Diff line number Diff line
@@ -11,25 +11,26 @@ 
 *  This file contains the ARM-specific time handling details:

 *  reading the RTC at bootup, etc...

 */

#include <linux/clk-provider.h>

#include <linux/clocksource.h>

#include <linux/errno.h>

#include <linux/export.h>

#include <linux/kernel.h>

#include <linux/interrupt.h>

#include <linux/time.h>

#include <linux/init.h>

#include <linux/interrupt.h>

#include <linux/irq.h>

#include <linux/kernel.h>

#include <linux/profile.h>

#include <linux/sched.h>

#include <linux/sched_clock.h>

#include <linux/smp.h>

#include <linux/time.h>

#include <linux/timex.h>

#include <linux/errno.h>

#include <linux/profile.h>

#include <linux/timer.h>

#include <linux/clocksource.h>

#include <linux/irq.h>

#include <linux/sched_clock.h>



#include <asm/thread_info.h>

#include <asm/stacktrace.h>

#include <asm/mach/arch.h>

#include <asm/mach/time.h>

#include <asm/stacktrace.h>

#include <asm/thread_info.h>



#if defined(CONFIG_RTC_DRV_CMOS) || defined(CONFIG_RTC_DRV_CMOS_MODULE) || \

    defined(CONFIG_NVRAM) || defined(CONFIG_NVRAM_MODULE)
@@ -116,8 +117,12 @@ int __init register_persistent_clock(clock_access_fn read_boot, 


void __init time_init(void)

{

	if (machine_desc->init_time)

	if (machine_desc->init_time) {

		machine_desc->init_time();

	else

	} else {

#ifdef CONFIG_COMMON_CLK

		of_clk_init(NULL);

#endif

		clocksource_of_init();

	}

}

arch/arm/mach-bcm/board_bcm281xx.c

+0 −1
Original line number Diff line number Diff line
@@ -68,7 +68,6 @@ static void __init board_init(void) 
static const char * const bcm11351_dt_compat[] = { "brcm,bcm11351", NULL, };



DT_MACHINE_START(BCM11351_DT, "Broadcom Application Processor")

	.init_time = clocksource_of_init,

	.init_machine = board_init,

	.restart = bcm_kona_restart,

	.dt_compat = bcm11351_dt_compat,

arch/arm/mach-bcm2835/bcm2835.c

+0 −2
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 
#include <linux/of_address.h>

#include <linux/of_platform.h>

#include <linux/clk/bcm2835.h>

#include <linux/clocksource.h>



#include <asm/mach/arch.h>

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

	.handle_irq = bcm2835_handle_irq,

	.init_machine = bcm2835_init,

	.init_time = clocksource_of_init,

	.restart = bcm2835_restart,

	.dt_compat = bcm2835_compat

MACHINE_END

arch/arm/mach-dove/board-dt.c

+0 −11
Original line number Diff line number Diff line
@@ -10,17 +10,13 @@ 


#include <linux/init.h>

#include <linux/clk-provider.h>

#include <linux/clocksource.h>

#include <linux/irqchip.h>

#include <linux/of.h>

#include <linux/of_platform.h>

#include <linux/platform_data/usb-ehci-orion.h>

#include <asm/hardware/cache-tauros2.h>

#include <asm/mach/arch.h>

#include <mach/dove.h>

#include <mach/pm.h>

#include <plat/common.h>

#include <plat/irq.h>

#include "common.h"



/*
@@ -45,12 +41,6 @@ static void __init dove_legacy_clk_init(void) 
			 of_clk_get_from_provider(&clkspec));

}



static void __init dove_dt_time_init(void)

{

	of_clk_init(NULL);

	clocksource_of_init();

}



static void __init dove_dt_init_early(void)

{

	mvebu_mbus_init("marvell,dove-mbus",
@@ -84,7 +74,6 @@ static const char * const dove_dt_board_compat[] = { 
DT_MACHINE_START(DOVE_DT, "Marvell Dove (Flattened Device Tree)")

	.map_io		= dove_map_io,

	.init_early	= dove_dt_init_early,

	.init_time	= dove_dt_time_init,

	.init_machine	= dove_dt_init,

	.restart	= dove_restart,

	.dt_compat	= dove_dt_board_compat,

arch/arm/mach-exynos/common.c

+0 −8
Original line number Diff line number Diff line
@@ -26,8 +26,6 @@ 
#include <linux/export.h>

#include <linux/irqdomain.h>

#include <linux/of_address.h>

#include <linux/clocksource.h>

#include <linux/clk-provider.h>

#include <linux/irqchip/arm-gic.h>

#include <linux/irqchip/chained_irq.h>
@@ -367,12 +365,6 @@ static void __init exynos5_map_io(void) 
		iotable_init(exynos5250_iodesc, ARRAY_SIZE(exynos5250_iodesc));

}



void __init exynos_init_time(void)

{

	of_clk_init(NULL);

	clocksource_of_init();

}



struct bus_type exynos_subsys = {

	.name		= "exynos-core",

	.dev_name	= "exynos-core",

CRA Git | Maintained and supported by SUSTech CRA and CCSE