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

Commit 67d4e669 authored by Ezequiel Garcia's avatar Ezequiel Garcia Committed by Ralf Baechle
Browse files

CLOCKSOURCE: mips-gic: Split clocksource and clockevent initialization 



This is preparation work for the introduction of clockevent frequency
update with a clock notifier. This is only possible when the device
is passed a clk struct, so let's split the legacy and devicetree
initialization.

Reviewed-by: default avatarAndrew Bresticker <abrestic@chromium.org>
Signed-off-by: default avatarEzequiel Garcia <ezequiel.garcia@imgtec.com>
Acked-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
Cc: linux-kernel@vger.kernel.org
Cc: linux-mips@linux-mips.org
Cc: devicetree@vger.kernel.org
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: James Hartley <James.Hartley@imgtec.com>
Cc: Govindraj Raja <Govindraj.Raja@imgtec.com>
Cc: Damien Horsley <Damien.Horsley@imgtec.com>
Cc: James Hogan <James.Hogan@imgtec.com>
Cc: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
Patchwork: https://patchwork.linux-mips.org/patch/10781/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent f95ac855

drivers/clocksource/mips-gic-timer.c

+8 −5
Original line number Diff line number Diff line
@@ -142,11 +142,6 @@ static void __init __gic_clocksource_init(void) 
	ret = clocksource_register_hz(&gic_clocksource, gic_frequency);

	if (ret < 0)

		pr_warn("GIC: Unable to register clocksource\n");



	gic_clockevent_init();



	/* And finally start the counter */

	gic_start_count();

}



void __init gic_clocksource_init(unsigned int frequency)
@@ -156,6 +151,10 @@ void __init gic_clocksource_init(unsigned int frequency) 
		GIC_LOCAL_TO_HWIRQ(GIC_LOCAL_INT_COMPARE);



	__gic_clocksource_init();

	gic_clockevent_init();



	/* And finally start the counter */

	gic_start_count();

}



static void __init gic_clocksource_of_init(struct device_node *node)
@@ -187,6 +186,10 @@ static void __init gic_clocksource_of_init(struct device_node *node) 
	}



	__gic_clocksource_init();

	gic_clockevent_init();



	/* And finally start the counter */

	gic_start_count();

}

CLOCKSOURCE_OF_DECLARE(mips_gic_timer, "mti,gic-timer",

		       gic_clocksource_of_init);