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

Commit e3ed766b authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'acpi-init' 

* acpi-init:
  clocksource: cosmetic: Drop OF 'dependency' from symbols
  clocksource / arm_arch_timer: Convert to ACPI probing
  clocksource: Add new CLKSRC_{PROBE,ACPI} config symbols
  clocksource / ACPI: Add probing infrastructure for ACPI-based clocksources
  irqchip / GIC: Convert the GIC driver to ACPI probing
  irqchip / ACPI: Add probing infrastructure for ACPI-based irqchips
  ACPI: Add early device probing infrastructure
parents 343ccb04 3722ed23

arch/arm/kernel/time.c

+1 −1
Original line number Diff line number Diff line
@@ -120,6 +120,6 @@ void __init time_init(void) 
#ifdef CONFIG_COMMON_CLK

		of_clk_init(NULL);

#endif

		clocksource_of_init();

		clocksource_probe();

	}

}

arch/arm/mach-omap2/timer.c

+2 −2
Original line number Diff line number Diff line
@@ -647,7 +647,7 @@ static OMAP_SYS_32K_TIMER_INIT(4, 1, "timer_32k_ck", "ti,timer-alwon", 
void __init omap4_local_timer_init(void)

{

	omap4_sync32k_timer_init();

	clocksource_of_init();

	clocksource_probe();

}

#else

void __init omap4_local_timer_init(void)
@@ -663,7 +663,7 @@ void __init omap5_realtime_timer_init(void) 
	omap4_sync32k_timer_init();

	realtime_counter_init();



	clocksource_of_init();

	clocksource_probe();

}

#endif /* CONFIG_SOC_OMAP5 || CONFIG_SOC_DRA7XX */

arch/arm/mach-rockchip/rockchip.c

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ static void __init rockchip_timer_init(void) 
	}



	of_clk_init(NULL);

	clocksource_of_init();

	clocksource_probe();

}



static void __init rockchip_dt_init(void)

arch/arm/mach-shmobile/setup-r8a7779.c

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ static u32 __init r8a7779_read_mode_pins(void) 
static void __init r8a7779_init_time(void)

{

	r8a7779_clocks_init(r8a7779_read_mode_pins());

	clocksource_of_init();

	clocksource_probe();

}



static const char *const r8a7779_compat_dt[] __initconst = {

arch/arm/mach-shmobile/setup-rcar-gen2.c

+1 −1
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ void __init rcar_gen2_timer_init(void) 
#endif /* CONFIG_ARM_ARCH_TIMER */



	rcar_gen2_clocks_init(mode);

	clocksource_of_init();

	clocksource_probe();

}



struct memory_reserve_config {