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

Commit e937274f authored by Lee Jones's avatar Lee Jones Committed by Linus Walleij
Browse files

ARM: ux500: Clean-up non-DT IRQ initialisation 



Decommission the non-DT boot path.

Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent f4b3f523

arch/arm/mach-ux500/cpu.c

+6 −16
Original line number Diff line number Diff line
@@ -63,12 +63,7 @@ void __init ux500_init_irq(void) 
	} else

		ux500_unknown_soc();



#ifdef CONFIG_OF

	if (of_have_populated_dt())

	irqchip_init();

	else

#endif

		gic_init(0, 29, dist_base, cpu_base);



	/*

	 * Init clocks here so that they are available for system timer
@@ -78,16 +73,11 @@ void __init ux500_init_irq(void) 
		prcmu_early_init(U8500_PRCMU_BASE, SZ_8K - 1);

		ux500_pm_init(U8500_PRCMU_BASE, SZ_8K - 1);



		if (of_have_populated_dt())

		u8500_of_clk_init(U8500_CLKRST1_BASE,

				  U8500_CLKRST2_BASE,

				  U8500_CLKRST3_BASE,

				  U8500_CLKRST5_BASE,

				  U8500_CLKRST6_BASE);

		else

			u8500_clk_init(U8500_CLKRST1_BASE, U8500_CLKRST2_BASE,

				       U8500_CLKRST3_BASE, U8500_CLKRST5_BASE,

				       U8500_CLKRST6_BASE);

	} else if (cpu_is_u9540()) {

		prcmu_early_init(U8500_PRCMU_BASE, SZ_8K - 1);

		ux500_pm_init(U8500_PRCMU_BASE, SZ_8K - 1);