MIPS/Malta: Probe gic-timer via devicetree (4287adec) · Commits · 戴 / test

The Malta platform is the only platform remaining to probe the GIC clocksource via gic_clocksource_init. This route hardcodes an expected virq number based on MIPS_GIC_IRQ_BASE, which can be fragile to the eventual virq layout. Instread, probe the driver using the preferred and more modern devicetree method. Before the driver is probed, set the "clock-frequency" property of the devicetree node to the value detected by Malta platform code. Signed-off-by:

Matt Redfearn <matt.redfearn@imgtec.com> Cc: linux-mips@linux-mips.org Cc: James Hogan <james.hogan@imgtec.com> Cc: Daniel Lezcano <daniel.lezcano@linaro.org> Cc: Ralf Baechle <ralf@linux-mips.org> Link: http://lkml.kernel.org/r/1492604806-23420-1-git-send-email-matt.redfearn@imgtec.com Signed-off-by:

Thomas Gleixner <tglx@linutronix.de>

arch/mips/mti-malta/malta-time.c

+30 −1

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@
		#include <linux/i8253.h>
		#include <linux/init.h>
		#include <linux/kernel_stat.h>
		#include <linux/libfdt.h>
		#include <linux/math64.h>
		#include <linux/sched.h>
		#include <linux/spinlock.h>
		@@ -207,6 +208,33 @@ static void __init init_rtc(void)
		CMOS_WRITE(ctrl & ~RTC_SET, RTC_CONTROL);
		}

		#ifdef CONFIG_CLKSRC_MIPS_GIC
		static u32 gic_frequency_dt;

		static struct property gic_frequency_prop = {
		.name = "clock-frequency",
		.length = sizeof(u32),
		.value = &gic_frequency_dt,
		};

		static void update_gic_frequency_dt(void)
		{
		struct device_node *node;

		gic_frequency_dt = cpu_to_be32(gic_frequency);

		node = of_find_compatible_node(NULL, NULL, "mti,gic-timer");
		if (!node) {
		pr_err("mti,gic-timer device node not found\n");
		return;
		}

		if (of_update_property(node, &gic_frequency_prop) < 0)
		pr_err("error updating gic frequency property\n");
		}

		#endif

		void __init plat_time_init(void)
		{
		unsigned int prid = read_c0_prid() & (PRID_COMP_MASK \| PRID_IMP_MASK);
		@@ -236,7 +264,8 @@ void __init plat_time_init(void)
		printk("GIC frequency %d.%02d MHz\n", freq/1000000,
		(freq%1000000)*100/1000000);
		#ifdef CONFIG_CLKSRC_MIPS_GIC
		gic_clocksource_init(gic_frequency);
		update_gic_frequency_dt();
		clocksource_probe();
		#endif
		}
		#endif

Admin message