[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <CAMXH7KH1pwh7hJ=T30zxcWcx19wjXvr6Ff4OLy7fzqY5p79Fwg@mail.gmail.com>
Date: Mon, 23 Apr 2012 10:45:02 -0500
From: Rob Lee <rob.lee@...aro.org>
To: Sascha Hauer <s.hauer@...gutronix.de>
Cc: Shawn Guo <shawn.guo@...aro.org>, linaro-dev@...ts.linaro.org,
patches@...aro.org, daniel.lezcano@...aro.org,
linux-kernel@...r.kernel.org,
Amit Kucheria <amit.kucheria@...aro.org>,
kernel@...gutronix.de, linux-arm-kernel@...ts.infradead.org
Subject: Re: [PATCH 1/3] ARM: imx: Add common imx cpuidle init functionality.
>> Let me try last time. What about having a late_initcall hook in
>> machine_desc?
>
> Also fine with me.
>
Shall I add Shawn's patch to my imx cpuidle patchset or should the
arch/arm/kernel/setup.c and arch.h changes be submitted separately?
If separately, Shawn, did you want to submit this patch or should I?
Thanks,
Rob
>>
>> Regards,
>> Shawn
>>
>> 8<---
>>
>> diff --git a/arch/arm/include/asm/mach/arch.h b/arch/arm/include/asm/mach/arch.h
>> index d7692ca..0b1c94b 100644
>> --- a/arch/arm/include/asm/mach/arch.h
>> +++ b/arch/arm/include/asm/mach/arch.h
>> @@ -43,6 +43,7 @@ struct machine_desc {
>> void (*init_irq)(void);
>> struct sys_timer *timer; /* system tick timer */
>> void (*init_machine)(void);
>> + void (*init_late)(void);
>> #ifdef CONFIG_MULTI_IRQ_HANDLER
>> void (*handle_irq)(struct pt_regs *);
>> #endif
>> diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
>> index ebfac78..549f036 100644
>> --- a/arch/arm/kernel/setup.c
>> +++ b/arch/arm/kernel/setup.c
>> @@ -800,6 +800,14 @@ static int __init customize_machine(void)
>> }
>> arch_initcall(customize_machine);
>>
>> +static int __init init_machine_late(void)
>> +{
>> + if (machine_desc->init_late)
>> + machine_desc->init_late();
>> + return 0;
>> +}
>> +late_initcall(init_machine_late);
>> +
>> #ifdef CONFIG_KEXEC
>> static inline unsigned long long get_total_mem(void)
>> {
>> diff --git a/arch/arm/mach-imx/mach-imx6q.c b/arch/arm/mach-imx/mach-imx6q.c
>> index da6c1d9..0e3640f 100644
>> --- a/arch/arm/mach-imx/mach-imx6q.c
>> +++ b/arch/arm/mach-imx/mach-imx6q.c
>> @@ -142,6 +142,7 @@ DT_MACHINE_START(IMX6Q, "Freescale i.MX6 Quad (Device Tree)")
>> .handle_irq = imx6q_handle_irq,
>> .timer = &imx6q_timer,
>> .init_machine = imx6q_init_machine,
>> + .init_late = imx6q_init_late,
>> .dt_compat = imx6q_dt_compat,
>> .restart = imx6q_restart,
>> MACHINE_END
>>
>> _______________________________________________
>> linux-arm-kernel mailing list
>> linux-arm-kernel@...ts.infradead.org
>> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
>>
>
> --
> Pengutronix e.K. | |
> Industrial Linux Solutions | http://www.pengutronix.de/ |
> Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
> Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists