by Maxime Ripard

[permalink] [raw]

Subject: Re: [PATCH 5/8] ARM: at91/clocksource: remove !DT PIT initializations

Hi,

On Tue, Dec 02, 2014 at 06:27:25PM +0100, Nicolas Ferre wrote:
> From: Arnd Bergmann <[email protected]>
>
> As AT91 !DT code is now removed, cleanup the PIT clocksource driver.
>
> Signed-off-by: Arnd Bergmann <[email protected]>
> [[email protected]: split patch]
> Signed-off-by: Nicolas Ferre <[email protected]>
> Cc: Maxime Ripard <[email protected]>
> Cc: Boris BREZILLON <[email protected]>
> Cc: Daniel Lezcano <[email protected]>
> ---
> arch/arm/mach-at91/generic.h | 2 --
> drivers/clocksource/timer-atmel-pit.c | 32 --------------------------------
> 2 files changed, 34 deletions(-)
>
> diff --git a/arch/arm/mach-at91/generic.h b/arch/arm/mach-at91/generic.h
> index 8527e8bd675f..d53324210adf 100644
> --- a/arch/arm/mach-at91/generic.h
> +++ b/arch/arm/mach-at91/generic.h
> @@ -31,8 +31,6 @@ extern void __init at91_sysirq_mask_rtt(u32 rtt_base);
>
> /* Timer */
> extern void at91rm9200_timer_init(void);
> -extern void at91sam926x_ioremap_pit(u32 addr);
> -extern void at91sam926x_pit_init(int irq);
>
> /* idle */
> extern void at91sam9_idle(void);
> diff --git a/drivers/clocksource/timer-atmel-pit.c b/drivers/clocksource/timer-atmel-pit.c
> index d5289098b3df..b5b4d4585c9a 100644
> --- a/drivers/clocksource/timer-atmel-pit.c
> +++ b/drivers/clocksource/timer-atmel-pit.c
> @@ -262,35 +262,3 @@ static void __init at91sam926x_pit_dt_init(struct device_node *node)
> }
> CLOCKSOURCE_OF_DECLARE(at91sam926x_pit, "atmel,at91sam9260-pit",
> at91sam926x_pit_dt_init);
> -
> -static void __iomem *pit_base_addr;
> -
> -void __init at91sam926x_pit_init(int irq)
> -{
> - struct pit_data *data;
> -
> - data = kzalloc(sizeof(*data), GFP_KERNEL);
> - if (!data)
> - panic(pr_fmt("Unable to allocate memory\n"));
> -
> - data->base = pit_base_addr;
> -
> - data->mck = clk_get(NULL, "mck");
> - if (IS_ERR(data->mck))
> - panic(pr_fmt("Unable to get mck clk\n"));
> -
> - data->irq = irq;
> -
> - at91sam926x_pit_common_init(data);
> -}
> -
> -void __init at91sam926x_ioremap_pit(u32 addr)
> -{
> - if (of_have_populated_dt())
> - return;
> -
> - pit_base_addr = ioremap(addr, 16);
> -
> - if (!pit_base_addr)
> - panic(pr_fmt("Impossible to ioremap PIT\n"));
> -}

This can be a bit more cleaned up, by merging
at91sam926x_pit_common_init and at91sam926x_pit_dt_init, but you have

Acked-by: Maxime Ripard <[email protected]>

Maxime

--
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

Attachments:

(No filename) (2.50 kB)
signature.asc (819.00 B)
Digital signature Download all attachments

2014-12-03 16:32:01

by Nicolas Ferre

[permalink] [raw]

Subject: Re: [PATCH 5/8] ARM: at91/clocksource: remove !DT PIT initializations

Le 02/12/2014 18:27, Nicolas Ferre a ?crit :
> From: Arnd Bergmann <[email protected]>
>
> As AT91 !DT code is now removed, cleanup the PIT clocksource driver.
>
> Signed-off-by: Arnd Bergmann <[email protected]>
> [[email protected]: split patch]
> Signed-off-by: Nicolas Ferre <[email protected]>
> Cc: Maxime Ripard <[email protected]>
> Cc: Boris BREZILLON <[email protected]>
> Cc: Daniel Lezcano <[email protected]>

Hi Daniel,

I plan to take this patch with me in a "cleanup" series and send it to
arm-soc soon. Do you think you can add your Acked-by tag?

I verified and there is no modification between Linus' tree and
linux-next: it should not conflict with anything queued on your side.

Bye,

> ---
> arch/arm/mach-at91/generic.h | 2 --
> drivers/clocksource/timer-atmel-pit.c | 32 --------------------------------
> 2 files changed, 34 deletions(-)
>
> diff --git a/arch/arm/mach-at91/generic.h b/arch/arm/mach-at91/generic.h
> index 8527e8bd675f..d53324210adf 100644
> --- a/arch/arm/mach-at91/generic.h
> +++ b/arch/arm/mach-at91/generic.h
> @@ -31,8 +31,6 @@ extern void __init at91_sysirq_mask_rtt(u32 rtt_base);
>
> /* Timer */
> extern void at91rm9200_timer_init(void);
> -extern void at91sam926x_ioremap_pit(u32 addr);
> -extern void at91sam926x_pit_init(int irq);
>
> /* idle */
> extern void at91sam9_idle(void);
> diff --git a/drivers/clocksource/timer-atmel-pit.c b/drivers/clocksource/timer-atmel-pit.c
> index d5289098b3df..b5b4d4585c9a 100644
> --- a/drivers/clocksource/timer-atmel-pit.c
> +++ b/drivers/clocksource/timer-atmel-pit.c
> @@ -262,35 +262,3 @@ static void __init at91sam926x_pit_dt_init(struct device_node *node)
> }
> CLOCKSOURCE_OF_DECLARE(at91sam926x_pit, "atmel,at91sam9260-pit",
> at91sam926x_pit_dt_init);
> -
> -static void __iomem *pit_base_addr;
> -
> -void __init at91sam926x_pit_init(int irq)
> -{
> - struct pit_data *data;
> -
> - data = kzalloc(sizeof(*data), GFP_KERNEL);
> - if (!data)
> - panic(pr_fmt("Unable to allocate memory\n"));
> -
> - data->base = pit_base_addr;
> -
> - data->mck = clk_get(NULL, "mck");
> - if (IS_ERR(data->mck))
> - panic(pr_fmt("Unable to get mck clk\n"));
> -
> - data->irq = irq;
> -
> - at91sam926x_pit_common_init(data);
> -}
> -
> -void __init at91sam926x_ioremap_pit(u32 addr)
> -{
> - if (of_have_populated_dt())
> - return;
> -
> - pit_base_addr = ioremap(addr, 16);
> -
> - if (!pit_base_addr)
> - panic(pr_fmt("Impossible to ioremap PIT\n"));
> -}
>

--
Nicolas Ferre