From: nicolas.ferre@atmel.com (Nicolas Ferre)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v4 01/17] ARM: at91: move at91_pmc.h to include/linux/clk/at91_pmc.h
Date: Wed, 16 Oct 2013 17:29:55 +0200 [thread overview]
Message-ID: <525EB0F3.6050707@atmel.com> (raw)
In-Reply-To: <1381477081-6041-2-git-send-email-b.brezillon@overkiz.com>
On 11/10/2013 09:37, Boris BREZILLON :
> This patch moves at91_pmc.h header from machine specific directory
> (arch/arm/mach-at91/include/mach/at91_pmc.h) to clk include directory
> (include/linux/clk/at91_pmc.h).
> We need this to avoid reference to machine specific headers in clk
> drivers.
>
> Signed-off-by: Boris BREZILLON <b.brezillon@overkiz.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
> ---
> arch/arm/mach-at91/at91rm9200.c | 2 +-
> arch/arm/mach-at91/at91sam9260.c | 2 +-
> arch/arm/mach-at91/at91sam9261.c | 2 +-
> arch/arm/mach-at91/at91sam9263.c | 2 +-
> arch/arm/mach-at91/at91sam9g45.c | 2 +-
> arch/arm/mach-at91/at91sam9n12.c | 2 +-
> arch/arm/mach-at91/at91sam9rl.c | 2 +-
> arch/arm/mach-at91/at91sam9x5.c | 2 +-
> arch/arm/mach-at91/clock.c | 2 +-
> arch/arm/mach-at91/pm.c | 2 +-
> arch/arm/mach-at91/pm_slowclock.S | 2 +-
> arch/arm/mach-at91/sama5d3.c | 2 +-
> arch/arm/mach-at91/setup.c | 2 +-
> drivers/usb/gadget/atmel_usba_udc.c | 2 +-
> .../include/mach => include/linux/clk}/at91_pmc.h | 2 +-
> 15 files changed, 15 insertions(+), 15 deletions(-)
> rename {arch/arm/mach-at91/include/mach => include/linux/clk}/at91_pmc.h (99%)
>
> diff --git a/arch/arm/mach-at91/at91rm9200.c b/arch/arm/mach-at91/at91rm9200.c
> index 4aad93d..102dac6 100644
> --- a/arch/arm/mach-at91/at91rm9200.c
> +++ b/arch/arm/mach-at91/at91rm9200.c
> @@ -12,13 +12,13 @@
>
> #include <linux/module.h>
> #include <linux/reboot.h>
> +#include <linux/clk/at91_pmc.h>
>
> #include <asm/irq.h>
> #include <asm/mach/arch.h>
> #include <asm/mach/map.h>
> #include <asm/system_misc.h>
> #include <mach/at91rm9200.h>
> -#include <mach/at91_pmc.h>
> #include <mach/at91_st.h>
> #include <mach/cpu.h>
>
> diff --git a/arch/arm/mach-at91/at91sam9260.c b/arch/arm/mach-at91/at91sam9260.c
> index 5de6074..16d7817 100644
> --- a/arch/arm/mach-at91/at91sam9260.c
> +++ b/arch/arm/mach-at91/at91sam9260.c
> @@ -11,6 +11,7 @@
> */
>
> #include <linux/module.h>
> +#include <linux/clk/at91_pmc.h>
>
> #include <asm/proc-fns.h>
> #include <asm/irq.h>
> @@ -20,7 +21,6 @@
> #include <mach/cpu.h>
> #include <mach/at91_dbgu.h>
> #include <mach/at91sam9260.h>
> -#include <mach/at91_pmc.h>
>
> #include "at91_aic.h"
> #include "at91_rstc.h"
> diff --git a/arch/arm/mach-at91/at91sam9261.c b/arch/arm/mach-at91/at91sam9261.c
> index 0e07932..c8f5958 100644
> --- a/arch/arm/mach-at91/at91sam9261.c
> +++ b/arch/arm/mach-at91/at91sam9261.c
> @@ -11,6 +11,7 @@
> */
>
> #include <linux/module.h>
> +#include <linux/clk/at91_pmc.h>
>
> #include <asm/proc-fns.h>
> #include <asm/irq.h>
> @@ -19,7 +20,6 @@
> #include <asm/system_misc.h>
> #include <mach/cpu.h>
> #include <mach/at91sam9261.h>
> -#include <mach/at91_pmc.h>
>
> #include "at91_aic.h"
> #include "at91_rstc.h"
> diff --git a/arch/arm/mach-at91/at91sam9263.c b/arch/arm/mach-at91/at91sam9263.c
> index 6ce7d18..cd8ad95 100644
> --- a/arch/arm/mach-at91/at91sam9263.c
> +++ b/arch/arm/mach-at91/at91sam9263.c
> @@ -11,6 +11,7 @@
> */
>
> #include <linux/module.h>
> +#include <linux/clk/at91_pmc.h>
>
> #include <asm/proc-fns.h>
> #include <asm/irq.h>
> @@ -18,7 +19,6 @@
> #include <asm/mach/map.h>
> #include <asm/system_misc.h>
> #include <mach/at91sam9263.h>
> -#include <mach/at91_pmc.h>
>
> #include "at91_aic.h"
> #include "at91_rstc.h"
> diff --git a/arch/arm/mach-at91/at91sam9g45.c b/arch/arm/mach-at91/at91sam9g45.c
> index 474ee04..9794b20 100644
> --- a/arch/arm/mach-at91/at91sam9g45.c
> +++ b/arch/arm/mach-at91/at91sam9g45.c
> @@ -12,13 +12,13 @@
>
> #include <linux/module.h>
> #include <linux/dma-mapping.h>
> +#include <linux/clk/at91_pmc.h>
>
> #include <asm/irq.h>
> #include <asm/mach/arch.h>
> #include <asm/mach/map.h>
> #include <asm/system_misc.h>
> #include <mach/at91sam9g45.h>
> -#include <mach/at91_pmc.h>
> #include <mach/cpu.h>
>
> #include "at91_aic.h"
> diff --git a/arch/arm/mach-at91/at91sam9n12.c b/arch/arm/mach-at91/at91sam9n12.c
> index c7d670d..5b83c66 100644
> --- a/arch/arm/mach-at91/at91sam9n12.c
> +++ b/arch/arm/mach-at91/at91sam9n12.c
> @@ -8,12 +8,12 @@
>
> #include <linux/module.h>
> #include <linux/dma-mapping.h>
> +#include <linux/clk/at91_pmc.h>
>
> #include <asm/irq.h>
> #include <asm/mach/arch.h>
> #include <asm/mach/map.h>
> #include <mach/at91sam9n12.h>
> -#include <mach/at91_pmc.h>
> #include <mach/cpu.h>
>
> #include "board.h"
> diff --git a/arch/arm/mach-at91/at91sam9rl.c b/arch/arm/mach-at91/at91sam9rl.c
> index d4ec0d9..947da95 100644
> --- a/arch/arm/mach-at91/at91sam9rl.c
> +++ b/arch/arm/mach-at91/at91sam9rl.c
> @@ -10,6 +10,7 @@
> */
>
> #include <linux/module.h>
> +#include <linux/clk/at91_pmc.h>
>
> #include <asm/proc-fns.h>
> #include <asm/irq.h>
> @@ -19,7 +20,6 @@
> #include <mach/cpu.h>
> #include <mach/at91_dbgu.h>
> #include <mach/at91sam9rl.h>
> -#include <mach/at91_pmc.h>
>
> #include "at91_aic.h"
> #include "at91_rstc.h"
> diff --git a/arch/arm/mach-at91/at91sam9x5.c b/arch/arm/mach-at91/at91sam9x5.c
> index 916e5a1..a930d73 100644
> --- a/arch/arm/mach-at91/at91sam9x5.c
> +++ b/arch/arm/mach-at91/at91sam9x5.c
> @@ -8,12 +8,12 @@
>
> #include <linux/module.h>
> #include <linux/dma-mapping.h>
> +#include <linux/clk/at91_pmc.h>
>
> #include <asm/irq.h>
> #include <asm/mach/arch.h>
> #include <asm/mach/map.h>
> #include <mach/at91sam9x5.h>
> -#include <mach/at91_pmc.h>
> #include <mach/cpu.h>
>
> #include "board.h"
> diff --git a/arch/arm/mach-at91/clock.c b/arch/arm/mach-at91/clock.c
> index 6b2630a..5f02aea 100644
> --- a/arch/arm/mach-at91/clock.c
> +++ b/arch/arm/mach-at91/clock.c
> @@ -24,9 +24,9 @@
> #include <linux/clk.h>
> #include <linux/io.h>
> #include <linux/of_address.h>
> +#include <linux/clk/at91_pmc.h>
>
> #include <mach/hardware.h>
> -#include <mach/at91_pmc.h>
> #include <mach/cpu.h>
>
> #include <asm/proc-fns.h>
> diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c
> index 15afb5d..692cacd 100644
> --- a/arch/arm/mach-at91/pm.c
> +++ b/arch/arm/mach-at91/pm.c
> @@ -19,13 +19,13 @@
> #include <linux/module.h>
> #include <linux/platform_device.h>
> #include <linux/io.h>
> +#include <linux/clk/at91_pmc.h>
>
> #include <asm/irq.h>
> #include <linux/atomic.h>
> #include <asm/mach/time.h>
> #include <asm/mach/irq.h>
>
> -#include <mach/at91_pmc.h>
> #include <mach/cpu.h>
>
> #include "at91_aic.h"
> diff --git a/arch/arm/mach-at91/pm_slowclock.S b/arch/arm/mach-at91/pm_slowclock.S
> index 098c28d..2001877 100644
> --- a/arch/arm/mach-at91/pm_slowclock.S
> +++ b/arch/arm/mach-at91/pm_slowclock.S
> @@ -13,8 +13,8 @@
> */
>
> #include <linux/linkage.h>
> +#include <linux/clk/at91_pmc.h>
> #include <mach/hardware.h>
> -#include <mach/at91_pmc.h>
> #include <mach/at91_ramc.h>
>
>
> diff --git a/arch/arm/mach-at91/sama5d3.c b/arch/arm/mach-at91/sama5d3.c
> index 4012797..0003949 100644
> --- a/arch/arm/mach-at91/sama5d3.c
> +++ b/arch/arm/mach-at91/sama5d3.c
> @@ -9,12 +9,12 @@
>
> #include <linux/module.h>
> #include <linux/dma-mapping.h>
> +#include <linux/clk/at91_pmc.h>
>
> #include <asm/irq.h>
> #include <asm/mach/arch.h>
> #include <asm/mach/map.h>
> #include <mach/sama5d3.h>
> -#include <mach/at91_pmc.h>
> #include <mach/cpu.h>
>
> #include "soc.h"
> diff --git a/arch/arm/mach-at91/setup.c b/arch/arm/mach-at91/setup.c
> index b17fbcf..41aa68b 100644
> --- a/arch/arm/mach-at91/setup.c
> +++ b/arch/arm/mach-at91/setup.c
> @@ -11,6 +11,7 @@
> #include <linux/pm.h>
> #include <linux/of_address.h>
> #include <linux/pinctrl/machine.h>
> +#include <linux/clk/at91_pmc.h>
>
> #include <asm/system_misc.h>
> #include <asm/mach/map.h>
> @@ -18,7 +19,6 @@
> #include <mach/hardware.h>
> #include <mach/cpu.h>
> #include <mach/at91_dbgu.h>
> -#include <mach/at91_pmc.h>
>
> #include "at91_shdwc.h"
> #include "soc.h"
> diff --git a/drivers/usb/gadget/atmel_usba_udc.c b/drivers/usb/gadget/atmel_usba_udc.c
> index 2cb52e0..9f71d9f 100644
> --- a/drivers/usb/gadget/atmel_usba_udc.c
> +++ b/drivers/usb/gadget/atmel_usba_udc.c
> @@ -326,7 +326,7 @@ static int vbus_is_present(struct usba_udc *udc)
>
> #if defined(CONFIG_ARCH_AT91SAM9RL)
>
> -#include <mach/at91_pmc.h>
> +#include <linux/clk/at91_pmc.h>
>
> static void toggle_bias(int is_on)
> {
> diff --git a/arch/arm/mach-at91/include/mach/at91_pmc.h b/include/linux/clk/at91_pmc.h
> similarity index 99%
> rename from arch/arm/mach-at91/include/mach/at91_pmc.h
> rename to include/linux/clk/at91_pmc.h
> index c604cc6..00c45b3 100644
> --- a/arch/arm/mach-at91/include/mach/at91_pmc.h
> +++ b/include/linux/clk/at91_pmc.h
> @@ -1,5 +1,5 @@
> /*
> - * arch/arm/mach-at91/include/mach/at91_pmc.h
> + * include/linux/clk/at91_pmc.h
> *
> * Copyright (C) 2005 Ivan Kokshaysky
> * Copyright (C) SAN People
>
--
Nicolas Ferre
WARNING: multiple messages have this Message-ID (diff)
From: Nicolas Ferre <nicolas.ferre@atmel.com>
To: Boris BREZILLON <b.brezillon@overkiz.com>,
Rob Herring <rob.herring@calxeda.com>,
Pawel Moll <pawel.moll@arm.com>,
Mark Rutland <mark.rutland@arm.com>,
Stephen Warren <swarren@wwwdotorg.org>,
Ian Campbell <ijc+devicetree@hellion.org.uk>,
Rob Landley <rob@landley.net>, Andrew Victor <linux@maxim.org.za>,
Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>,
Russell King <linux@arm.linux.org.uk>,
Mike Turquette <mturquette@linaro.org>,
Felipe Balbi <balbi@ti.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Grant Likely <grant.likely@linaro.org>,
Ludovic Desroches <ludovic.desroches@atmel.com>,
Josh Wu <josh.wu@atmel.com>,
Richard Genoud <richard.genoud@gmail.com>
Cc: devicetree@vger.kernel.org, linux-doc@vger.kernel.org,
linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org, linux-usb@vger.kernel.org
Subject: Re: [PATCH v4 01/17] ARM: at91: move at91_pmc.h to include/linux/clk/at91_pmc.h
Date: Wed, 16 Oct 2013 17:29:55 +0200 [thread overview]
Message-ID: <525EB0F3.6050707@atmel.com> (raw)
In-Reply-To: <1381477081-6041-2-git-send-email-b.brezillon@overkiz.com>
On 11/10/2013 09:37, Boris BREZILLON :
> This patch moves at91_pmc.h header from machine specific directory
> (arch/arm/mach-at91/include/mach/at91_pmc.h) to clk include directory
> (include/linux/clk/at91_pmc.h).
> We need this to avoid reference to machine specific headers in clk
> drivers.
>
> Signed-off-by: Boris BREZILLON <b.brezillon@overkiz.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
> ---
> arch/arm/mach-at91/at91rm9200.c | 2 +-
> arch/arm/mach-at91/at91sam9260.c | 2 +-
> arch/arm/mach-at91/at91sam9261.c | 2 +-
> arch/arm/mach-at91/at91sam9263.c | 2 +-
> arch/arm/mach-at91/at91sam9g45.c | 2 +-
> arch/arm/mach-at91/at91sam9n12.c | 2 +-
> arch/arm/mach-at91/at91sam9rl.c | 2 +-
> arch/arm/mach-at91/at91sam9x5.c | 2 +-
> arch/arm/mach-at91/clock.c | 2 +-
> arch/arm/mach-at91/pm.c | 2 +-
> arch/arm/mach-at91/pm_slowclock.S | 2 +-
> arch/arm/mach-at91/sama5d3.c | 2 +-
> arch/arm/mach-at91/setup.c | 2 +-
> drivers/usb/gadget/atmel_usba_udc.c | 2 +-
> .../include/mach => include/linux/clk}/at91_pmc.h | 2 +-
> 15 files changed, 15 insertions(+), 15 deletions(-)
> rename {arch/arm/mach-at91/include/mach => include/linux/clk}/at91_pmc.h (99%)
>
> diff --git a/arch/arm/mach-at91/at91rm9200.c b/arch/arm/mach-at91/at91rm9200.c
> index 4aad93d..102dac6 100644
> --- a/arch/arm/mach-at91/at91rm9200.c
> +++ b/arch/arm/mach-at91/at91rm9200.c
> @@ -12,13 +12,13 @@
>
> #include <linux/module.h>
> #include <linux/reboot.h>
> +#include <linux/clk/at91_pmc.h>
>
> #include <asm/irq.h>
> #include <asm/mach/arch.h>
> #include <asm/mach/map.h>
> #include <asm/system_misc.h>
> #include <mach/at91rm9200.h>
> -#include <mach/at91_pmc.h>
> #include <mach/at91_st.h>
> #include <mach/cpu.h>
>
> diff --git a/arch/arm/mach-at91/at91sam9260.c b/arch/arm/mach-at91/at91sam9260.c
> index 5de6074..16d7817 100644
> --- a/arch/arm/mach-at91/at91sam9260.c
> +++ b/arch/arm/mach-at91/at91sam9260.c
> @@ -11,6 +11,7 @@
> */
>
> #include <linux/module.h>
> +#include <linux/clk/at91_pmc.h>
>
> #include <asm/proc-fns.h>
> #include <asm/irq.h>
> @@ -20,7 +21,6 @@
> #include <mach/cpu.h>
> #include <mach/at91_dbgu.h>
> #include <mach/at91sam9260.h>
> -#include <mach/at91_pmc.h>
>
> #include "at91_aic.h"
> #include "at91_rstc.h"
> diff --git a/arch/arm/mach-at91/at91sam9261.c b/arch/arm/mach-at91/at91sam9261.c
> index 0e07932..c8f5958 100644
> --- a/arch/arm/mach-at91/at91sam9261.c
> +++ b/arch/arm/mach-at91/at91sam9261.c
> @@ -11,6 +11,7 @@
> */
>
> #include <linux/module.h>
> +#include <linux/clk/at91_pmc.h>
>
> #include <asm/proc-fns.h>
> #include <asm/irq.h>
> @@ -19,7 +20,6 @@
> #include <asm/system_misc.h>
> #include <mach/cpu.h>
> #include <mach/at91sam9261.h>
> -#include <mach/at91_pmc.h>
>
> #include "at91_aic.h"
> #include "at91_rstc.h"
> diff --git a/arch/arm/mach-at91/at91sam9263.c b/arch/arm/mach-at91/at91sam9263.c
> index 6ce7d18..cd8ad95 100644
> --- a/arch/arm/mach-at91/at91sam9263.c
> +++ b/arch/arm/mach-at91/at91sam9263.c
> @@ -11,6 +11,7 @@
> */
>
> #include <linux/module.h>
> +#include <linux/clk/at91_pmc.h>
>
> #include <asm/proc-fns.h>
> #include <asm/irq.h>
> @@ -18,7 +19,6 @@
> #include <asm/mach/map.h>
> #include <asm/system_misc.h>
> #include <mach/at91sam9263.h>
> -#include <mach/at91_pmc.h>
>
> #include "at91_aic.h"
> #include "at91_rstc.h"
> diff --git a/arch/arm/mach-at91/at91sam9g45.c b/arch/arm/mach-at91/at91sam9g45.c
> index 474ee04..9794b20 100644
> --- a/arch/arm/mach-at91/at91sam9g45.c
> +++ b/arch/arm/mach-at91/at91sam9g45.c
> @@ -12,13 +12,13 @@
>
> #include <linux/module.h>
> #include <linux/dma-mapping.h>
> +#include <linux/clk/at91_pmc.h>
>
> #include <asm/irq.h>
> #include <asm/mach/arch.h>
> #include <asm/mach/map.h>
> #include <asm/system_misc.h>
> #include <mach/at91sam9g45.h>
> -#include <mach/at91_pmc.h>
> #include <mach/cpu.h>
>
> #include "at91_aic.h"
> diff --git a/arch/arm/mach-at91/at91sam9n12.c b/arch/arm/mach-at91/at91sam9n12.c
> index c7d670d..5b83c66 100644
> --- a/arch/arm/mach-at91/at91sam9n12.c
> +++ b/arch/arm/mach-at91/at91sam9n12.c
> @@ -8,12 +8,12 @@
>
> #include <linux/module.h>
> #include <linux/dma-mapping.h>
> +#include <linux/clk/at91_pmc.h>
>
> #include <asm/irq.h>
> #include <asm/mach/arch.h>
> #include <asm/mach/map.h>
> #include <mach/at91sam9n12.h>
> -#include <mach/at91_pmc.h>
> #include <mach/cpu.h>
>
> #include "board.h"
> diff --git a/arch/arm/mach-at91/at91sam9rl.c b/arch/arm/mach-at91/at91sam9rl.c
> index d4ec0d9..947da95 100644
> --- a/arch/arm/mach-at91/at91sam9rl.c
> +++ b/arch/arm/mach-at91/at91sam9rl.c
> @@ -10,6 +10,7 @@
> */
>
> #include <linux/module.h>
> +#include <linux/clk/at91_pmc.h>
>
> #include <asm/proc-fns.h>
> #include <asm/irq.h>
> @@ -19,7 +20,6 @@
> #include <mach/cpu.h>
> #include <mach/at91_dbgu.h>
> #include <mach/at91sam9rl.h>
> -#include <mach/at91_pmc.h>
>
> #include "at91_aic.h"
> #include "at91_rstc.h"
> diff --git a/arch/arm/mach-at91/at91sam9x5.c b/arch/arm/mach-at91/at91sam9x5.c
> index 916e5a1..a930d73 100644
> --- a/arch/arm/mach-at91/at91sam9x5.c
> +++ b/arch/arm/mach-at91/at91sam9x5.c
> @@ -8,12 +8,12 @@
>
> #include <linux/module.h>
> #include <linux/dma-mapping.h>
> +#include <linux/clk/at91_pmc.h>
>
> #include <asm/irq.h>
> #include <asm/mach/arch.h>
> #include <asm/mach/map.h>
> #include <mach/at91sam9x5.h>
> -#include <mach/at91_pmc.h>
> #include <mach/cpu.h>
>
> #include "board.h"
> diff --git a/arch/arm/mach-at91/clock.c b/arch/arm/mach-at91/clock.c
> index 6b2630a..5f02aea 100644
> --- a/arch/arm/mach-at91/clock.c
> +++ b/arch/arm/mach-at91/clock.c
> @@ -24,9 +24,9 @@
> #include <linux/clk.h>
> #include <linux/io.h>
> #include <linux/of_address.h>
> +#include <linux/clk/at91_pmc.h>
>
> #include <mach/hardware.h>
> -#include <mach/at91_pmc.h>
> #include <mach/cpu.h>
>
> #include <asm/proc-fns.h>
> diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c
> index 15afb5d..692cacd 100644
> --- a/arch/arm/mach-at91/pm.c
> +++ b/arch/arm/mach-at91/pm.c
> @@ -19,13 +19,13 @@
> #include <linux/module.h>
> #include <linux/platform_device.h>
> #include <linux/io.h>
> +#include <linux/clk/at91_pmc.h>
>
> #include <asm/irq.h>
> #include <linux/atomic.h>
> #include <asm/mach/time.h>
> #include <asm/mach/irq.h>
>
> -#include <mach/at91_pmc.h>
> #include <mach/cpu.h>
>
> #include "at91_aic.h"
> diff --git a/arch/arm/mach-at91/pm_slowclock.S b/arch/arm/mach-at91/pm_slowclock.S
> index 098c28d..2001877 100644
> --- a/arch/arm/mach-at91/pm_slowclock.S
> +++ b/arch/arm/mach-at91/pm_slowclock.S
> @@ -13,8 +13,8 @@
> */
>
> #include <linux/linkage.h>
> +#include <linux/clk/at91_pmc.h>
> #include <mach/hardware.h>
> -#include <mach/at91_pmc.h>
> #include <mach/at91_ramc.h>
>
>
> diff --git a/arch/arm/mach-at91/sama5d3.c b/arch/arm/mach-at91/sama5d3.c
> index 4012797..0003949 100644
> --- a/arch/arm/mach-at91/sama5d3.c
> +++ b/arch/arm/mach-at91/sama5d3.c
> @@ -9,12 +9,12 @@
>
> #include <linux/module.h>
> #include <linux/dma-mapping.h>
> +#include <linux/clk/at91_pmc.h>
>
> #include <asm/irq.h>
> #include <asm/mach/arch.h>
> #include <asm/mach/map.h>
> #include <mach/sama5d3.h>
> -#include <mach/at91_pmc.h>
> #include <mach/cpu.h>
>
> #include "soc.h"
> diff --git a/arch/arm/mach-at91/setup.c b/arch/arm/mach-at91/setup.c
> index b17fbcf..41aa68b 100644
> --- a/arch/arm/mach-at91/setup.c
> +++ b/arch/arm/mach-at91/setup.c
> @@ -11,6 +11,7 @@
> #include <linux/pm.h>
> #include <linux/of_address.h>
> #include <linux/pinctrl/machine.h>
> +#include <linux/clk/at91_pmc.h>
>
> #include <asm/system_misc.h>
> #include <asm/mach/map.h>
> @@ -18,7 +19,6 @@
> #include <mach/hardware.h>
> #include <mach/cpu.h>
> #include <mach/at91_dbgu.h>
> -#include <mach/at91_pmc.h>
>
> #include "at91_shdwc.h"
> #include "soc.h"
> diff --git a/drivers/usb/gadget/atmel_usba_udc.c b/drivers/usb/gadget/atmel_usba_udc.c
> index 2cb52e0..9f71d9f 100644
> --- a/drivers/usb/gadget/atmel_usba_udc.c
> +++ b/drivers/usb/gadget/atmel_usba_udc.c
> @@ -326,7 +326,7 @@ static int vbus_is_present(struct usba_udc *udc)
>
> #if defined(CONFIG_ARCH_AT91SAM9RL)
>
> -#include <mach/at91_pmc.h>
> +#include <linux/clk/at91_pmc.h>
>
> static void toggle_bias(int is_on)
> {
> diff --git a/arch/arm/mach-at91/include/mach/at91_pmc.h b/include/linux/clk/at91_pmc.h
> similarity index 99%
> rename from arch/arm/mach-at91/include/mach/at91_pmc.h
> rename to include/linux/clk/at91_pmc.h
> index c604cc6..00c45b3 100644
> --- a/arch/arm/mach-at91/include/mach/at91_pmc.h
> +++ b/include/linux/clk/at91_pmc.h
> @@ -1,5 +1,5 @@
> /*
> - * arch/arm/mach-at91/include/mach/at91_pmc.h
> + * include/linux/clk/at91_pmc.h
> *
> * Copyright (C) 2005 Ivan Kokshaysky
> * Copyright (C) SAN People
>
--
Nicolas Ferre
WARNING: multiple messages have this Message-ID (diff)
From: Nicolas Ferre <nicolas.ferre@atmel.com>
To: Boris BREZILLON <b.brezillon@overkiz.com>,
Rob Herring <rob.herring@calxeda.com>,
Pawel Moll <pawel.moll@arm.com>,
Mark Rutland <mark.rutland@arm.com>,
Stephen Warren <swarren@wwwdotorg.org>,
Ian Campbell <ijc+devicetree@hellion.org.uk>,
Rob Landley <rob@landley.net>, Andrew Victor <linux@maxim.org.za>,
Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>,
Russell King <linux@arm.linux.org.uk>,
"Mike Turquette" <mturquette@linaro.org>,
Felipe Balbi <balbi@ti.com>,
"Greg Kroah-Hartman" <gregkh@linuxfoundation.org>,
Grant Likely <grant.likely@linaro.org>,
Ludovic Desroches <ludovic.desroches@atmel.com>,
Josh Wu <josh.wu@atmel.com>,
Richard Genoud <richard.genoud@gmail.com>
Cc: <devicetree@vger.kernel.org>, <linux-doc@vger.kernel.org>,
<linux-kernel@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>,
<linux-usb@vger.kernel.org>
Subject: Re: [PATCH v4 01/17] ARM: at91: move at91_pmc.h to include/linux/clk/at91_pmc.h
Date: Wed, 16 Oct 2013 17:29:55 +0200 [thread overview]
Message-ID: <525EB0F3.6050707@atmel.com> (raw)
In-Reply-To: <1381477081-6041-2-git-send-email-b.brezillon@overkiz.com>
On 11/10/2013 09:37, Boris BREZILLON :
> This patch moves at91_pmc.h header from machine specific directory
> (arch/arm/mach-at91/include/mach/at91_pmc.h) to clk include directory
> (include/linux/clk/at91_pmc.h).
> We need this to avoid reference to machine specific headers in clk
> drivers.
>
> Signed-off-by: Boris BREZILLON <b.brezillon@overkiz.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
> ---
> arch/arm/mach-at91/at91rm9200.c | 2 +-
> arch/arm/mach-at91/at91sam9260.c | 2 +-
> arch/arm/mach-at91/at91sam9261.c | 2 +-
> arch/arm/mach-at91/at91sam9263.c | 2 +-
> arch/arm/mach-at91/at91sam9g45.c | 2 +-
> arch/arm/mach-at91/at91sam9n12.c | 2 +-
> arch/arm/mach-at91/at91sam9rl.c | 2 +-
> arch/arm/mach-at91/at91sam9x5.c | 2 +-
> arch/arm/mach-at91/clock.c | 2 +-
> arch/arm/mach-at91/pm.c | 2 +-
> arch/arm/mach-at91/pm_slowclock.S | 2 +-
> arch/arm/mach-at91/sama5d3.c | 2 +-
> arch/arm/mach-at91/setup.c | 2 +-
> drivers/usb/gadget/atmel_usba_udc.c | 2 +-
> .../include/mach => include/linux/clk}/at91_pmc.h | 2 +-
> 15 files changed, 15 insertions(+), 15 deletions(-)
> rename {arch/arm/mach-at91/include/mach => include/linux/clk}/at91_pmc.h (99%)
>
> diff --git a/arch/arm/mach-at91/at91rm9200.c b/arch/arm/mach-at91/at91rm9200.c
> index 4aad93d..102dac6 100644
> --- a/arch/arm/mach-at91/at91rm9200.c
> +++ b/arch/arm/mach-at91/at91rm9200.c
> @@ -12,13 +12,13 @@
>
> #include <linux/module.h>
> #include <linux/reboot.h>
> +#include <linux/clk/at91_pmc.h>
>
> #include <asm/irq.h>
> #include <asm/mach/arch.h>
> #include <asm/mach/map.h>
> #include <asm/system_misc.h>
> #include <mach/at91rm9200.h>
> -#include <mach/at91_pmc.h>
> #include <mach/at91_st.h>
> #include <mach/cpu.h>
>
> diff --git a/arch/arm/mach-at91/at91sam9260.c b/arch/arm/mach-at91/at91sam9260.c
> index 5de6074..16d7817 100644
> --- a/arch/arm/mach-at91/at91sam9260.c
> +++ b/arch/arm/mach-at91/at91sam9260.c
> @@ -11,6 +11,7 @@
> */
>
> #include <linux/module.h>
> +#include <linux/clk/at91_pmc.h>
>
> #include <asm/proc-fns.h>
> #include <asm/irq.h>
> @@ -20,7 +21,6 @@
> #include <mach/cpu.h>
> #include <mach/at91_dbgu.h>
> #include <mach/at91sam9260.h>
> -#include <mach/at91_pmc.h>
>
> #include "at91_aic.h"
> #include "at91_rstc.h"
> diff --git a/arch/arm/mach-at91/at91sam9261.c b/arch/arm/mach-at91/at91sam9261.c
> index 0e07932..c8f5958 100644
> --- a/arch/arm/mach-at91/at91sam9261.c
> +++ b/arch/arm/mach-at91/at91sam9261.c
> @@ -11,6 +11,7 @@
> */
>
> #include <linux/module.h>
> +#include <linux/clk/at91_pmc.h>
>
> #include <asm/proc-fns.h>
> #include <asm/irq.h>
> @@ -19,7 +20,6 @@
> #include <asm/system_misc.h>
> #include <mach/cpu.h>
> #include <mach/at91sam9261.h>
> -#include <mach/at91_pmc.h>
>
> #include "at91_aic.h"
> #include "at91_rstc.h"
> diff --git a/arch/arm/mach-at91/at91sam9263.c b/arch/arm/mach-at91/at91sam9263.c
> index 6ce7d18..cd8ad95 100644
> --- a/arch/arm/mach-at91/at91sam9263.c
> +++ b/arch/arm/mach-at91/at91sam9263.c
> @@ -11,6 +11,7 @@
> */
>
> #include <linux/module.h>
> +#include <linux/clk/at91_pmc.h>
>
> #include <asm/proc-fns.h>
> #include <asm/irq.h>
> @@ -18,7 +19,6 @@
> #include <asm/mach/map.h>
> #include <asm/system_misc.h>
> #include <mach/at91sam9263.h>
> -#include <mach/at91_pmc.h>
>
> #include "at91_aic.h"
> #include "at91_rstc.h"
> diff --git a/arch/arm/mach-at91/at91sam9g45.c b/arch/arm/mach-at91/at91sam9g45.c
> index 474ee04..9794b20 100644
> --- a/arch/arm/mach-at91/at91sam9g45.c
> +++ b/arch/arm/mach-at91/at91sam9g45.c
> @@ -12,13 +12,13 @@
>
> #include <linux/module.h>
> #include <linux/dma-mapping.h>
> +#include <linux/clk/at91_pmc.h>
>
> #include <asm/irq.h>
> #include <asm/mach/arch.h>
> #include <asm/mach/map.h>
> #include <asm/system_misc.h>
> #include <mach/at91sam9g45.h>
> -#include <mach/at91_pmc.h>
> #include <mach/cpu.h>
>
> #include "at91_aic.h"
> diff --git a/arch/arm/mach-at91/at91sam9n12.c b/arch/arm/mach-at91/at91sam9n12.c
> index c7d670d..5b83c66 100644
> --- a/arch/arm/mach-at91/at91sam9n12.c
> +++ b/arch/arm/mach-at91/at91sam9n12.c
> @@ -8,12 +8,12 @@
>
> #include <linux/module.h>
> #include <linux/dma-mapping.h>
> +#include <linux/clk/at91_pmc.h>
>
> #include <asm/irq.h>
> #include <asm/mach/arch.h>
> #include <asm/mach/map.h>
> #include <mach/at91sam9n12.h>
> -#include <mach/at91_pmc.h>
> #include <mach/cpu.h>
>
> #include "board.h"
> diff --git a/arch/arm/mach-at91/at91sam9rl.c b/arch/arm/mach-at91/at91sam9rl.c
> index d4ec0d9..947da95 100644
> --- a/arch/arm/mach-at91/at91sam9rl.c
> +++ b/arch/arm/mach-at91/at91sam9rl.c
> @@ -10,6 +10,7 @@
> */
>
> #include <linux/module.h>
> +#include <linux/clk/at91_pmc.h>
>
> #include <asm/proc-fns.h>
> #include <asm/irq.h>
> @@ -19,7 +20,6 @@
> #include <mach/cpu.h>
> #include <mach/at91_dbgu.h>
> #include <mach/at91sam9rl.h>
> -#include <mach/at91_pmc.h>
>
> #include "at91_aic.h"
> #include "at91_rstc.h"
> diff --git a/arch/arm/mach-at91/at91sam9x5.c b/arch/arm/mach-at91/at91sam9x5.c
> index 916e5a1..a930d73 100644
> --- a/arch/arm/mach-at91/at91sam9x5.c
> +++ b/arch/arm/mach-at91/at91sam9x5.c
> @@ -8,12 +8,12 @@
>
> #include <linux/module.h>
> #include <linux/dma-mapping.h>
> +#include <linux/clk/at91_pmc.h>
>
> #include <asm/irq.h>
> #include <asm/mach/arch.h>
> #include <asm/mach/map.h>
> #include <mach/at91sam9x5.h>
> -#include <mach/at91_pmc.h>
> #include <mach/cpu.h>
>
> #include "board.h"
> diff --git a/arch/arm/mach-at91/clock.c b/arch/arm/mach-at91/clock.c
> index 6b2630a..5f02aea 100644
> --- a/arch/arm/mach-at91/clock.c
> +++ b/arch/arm/mach-at91/clock.c
> @@ -24,9 +24,9 @@
> #include <linux/clk.h>
> #include <linux/io.h>
> #include <linux/of_address.h>
> +#include <linux/clk/at91_pmc.h>
>
> #include <mach/hardware.h>
> -#include <mach/at91_pmc.h>
> #include <mach/cpu.h>
>
> #include <asm/proc-fns.h>
> diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c
> index 15afb5d..692cacd 100644
> --- a/arch/arm/mach-at91/pm.c
> +++ b/arch/arm/mach-at91/pm.c
> @@ -19,13 +19,13 @@
> #include <linux/module.h>
> #include <linux/platform_device.h>
> #include <linux/io.h>
> +#include <linux/clk/at91_pmc.h>
>
> #include <asm/irq.h>
> #include <linux/atomic.h>
> #include <asm/mach/time.h>
> #include <asm/mach/irq.h>
>
> -#include <mach/at91_pmc.h>
> #include <mach/cpu.h>
>
> #include "at91_aic.h"
> diff --git a/arch/arm/mach-at91/pm_slowclock.S b/arch/arm/mach-at91/pm_slowclock.S
> index 098c28d..2001877 100644
> --- a/arch/arm/mach-at91/pm_slowclock.S
> +++ b/arch/arm/mach-at91/pm_slowclock.S
> @@ -13,8 +13,8 @@
> */
>
> #include <linux/linkage.h>
> +#include <linux/clk/at91_pmc.h>
> #include <mach/hardware.h>
> -#include <mach/at91_pmc.h>
> #include <mach/at91_ramc.h>
>
>
> diff --git a/arch/arm/mach-at91/sama5d3.c b/arch/arm/mach-at91/sama5d3.c
> index 4012797..0003949 100644
> --- a/arch/arm/mach-at91/sama5d3.c
> +++ b/arch/arm/mach-at91/sama5d3.c
> @@ -9,12 +9,12 @@
>
> #include <linux/module.h>
> #include <linux/dma-mapping.h>
> +#include <linux/clk/at91_pmc.h>
>
> #include <asm/irq.h>
> #include <asm/mach/arch.h>
> #include <asm/mach/map.h>
> #include <mach/sama5d3.h>
> -#include <mach/at91_pmc.h>
> #include <mach/cpu.h>
>
> #include "soc.h"
> diff --git a/arch/arm/mach-at91/setup.c b/arch/arm/mach-at91/setup.c
> index b17fbcf..41aa68b 100644
> --- a/arch/arm/mach-at91/setup.c
> +++ b/arch/arm/mach-at91/setup.c
> @@ -11,6 +11,7 @@
> #include <linux/pm.h>
> #include <linux/of_address.h>
> #include <linux/pinctrl/machine.h>
> +#include <linux/clk/at91_pmc.h>
>
> #include <asm/system_misc.h>
> #include <asm/mach/map.h>
> @@ -18,7 +19,6 @@
> #include <mach/hardware.h>
> #include <mach/cpu.h>
> #include <mach/at91_dbgu.h>
> -#include <mach/at91_pmc.h>
>
> #include "at91_shdwc.h"
> #include "soc.h"
> diff --git a/drivers/usb/gadget/atmel_usba_udc.c b/drivers/usb/gadget/atmel_usba_udc.c
> index 2cb52e0..9f71d9f 100644
> --- a/drivers/usb/gadget/atmel_usba_udc.c
> +++ b/drivers/usb/gadget/atmel_usba_udc.c
> @@ -326,7 +326,7 @@ static int vbus_is_present(struct usba_udc *udc)
>
> #if defined(CONFIG_ARCH_AT91SAM9RL)
>
> -#include <mach/at91_pmc.h>
> +#include <linux/clk/at91_pmc.h>
>
> static void toggle_bias(int is_on)
> {
> diff --git a/arch/arm/mach-at91/include/mach/at91_pmc.h b/include/linux/clk/at91_pmc.h
> similarity index 99%
> rename from arch/arm/mach-at91/include/mach/at91_pmc.h
> rename to include/linux/clk/at91_pmc.h
> index c604cc6..00c45b3 100644
> --- a/arch/arm/mach-at91/include/mach/at91_pmc.h
> +++ b/include/linux/clk/at91_pmc.h
> @@ -1,5 +1,5 @@
> /*
> - * arch/arm/mach-at91/include/mach/at91_pmc.h
> + * include/linux/clk/at91_pmc.h
> *
> * Copyright (C) 2005 Ivan Kokshaysky
> * Copyright (C) SAN People
>
--
Nicolas Ferre
next prev parent reply other threads:[~2013-10-16 15:29 UTC|newest]
Thread overview: 103+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-11 7:37 [PATCH v4 00/17] ARM: at91: move to common clk framework Boris BREZILLON
2013-10-11 7:37 ` Boris BREZILLON
2013-10-11 7:37 ` Boris BREZILLON
2013-10-11 7:37 ` [PATCH v4 01/17] ARM: at91: move at91_pmc.h to include/linux/clk/at91_pmc.h Boris BREZILLON
2013-10-11 7:37 ` Boris BREZILLON
2013-10-11 16:05 ` Felipe Balbi
2013-10-11 16:05 ` Felipe Balbi
2013-10-11 16:05 ` Felipe Balbi
2013-10-16 15:29 ` Nicolas Ferre [this message]
2013-10-16 15:29 ` Nicolas Ferre
2013-10-16 15:29 ` Nicolas Ferre
2013-10-11 7:37 ` [PATCH v4 02/17] ARM: at91: add Kconfig options for common clk support Boris BREZILLON
2013-10-11 7:37 ` Boris BREZILLON
2013-10-16 15:33 ` Nicolas Ferre
2013-10-16 15:33 ` Nicolas Ferre
2013-10-16 15:33 ` Nicolas Ferre
2013-10-11 7:37 ` [PATCH v4 03/17] clk: at91: add PMC base support Boris BREZILLON
2013-10-11 7:37 ` Boris BREZILLON
2013-10-17 15:46 ` Nicolas Ferre
2013-10-17 15:46 ` Nicolas Ferre
2013-10-17 15:46 ` Nicolas Ferre
2013-10-11 8:41 ` [PATCH v4 04/17] clk: at91: add PMC macro file for dt definitions Boris BREZILLON
2013-10-11 8:41 ` Boris BREZILLON
2013-10-17 15:47 ` Nicolas Ferre
2013-10-17 15:47 ` Nicolas Ferre
2013-10-17 15:47 ` Nicolas Ferre
2013-10-11 8:44 ` [PATCH v4 05/17] clk: at91: add PMC main clock Boris BREZILLON
2013-10-11 8:44 ` Boris BREZILLON
2013-10-11 8:44 ` Boris BREZILLON
2013-10-17 15:58 ` Nicolas Ferre
2013-10-17 15:58 ` Nicolas Ferre
2013-10-17 15:58 ` Nicolas Ferre
2013-10-11 8:48 ` [PATCH v4 06/17] clk: at91: add PMC pll clocks Boris BREZILLON
2013-10-11 8:48 ` Boris BREZILLON
2013-10-11 8:48 ` Boris BREZILLON
2013-10-17 15:59 ` Nicolas Ferre
2013-10-17 15:59 ` Nicolas Ferre
2013-10-17 15:59 ` Nicolas Ferre
2013-10-11 8:51 ` [PATCH v4 07/17] clk: at91: add PMC master clock Boris BREZILLON
2013-10-11 8:51 ` Boris BREZILLON
2013-10-17 15:59 ` Nicolas Ferre
2013-10-17 15:59 ` Nicolas Ferre
2013-10-17 15:59 ` Nicolas Ferre
2013-10-11 9:41 ` [PATCH v4 08/17] clk: at91: add PMC system clocks Boris BREZILLON
2013-10-11 9:41 ` Boris BREZILLON
2013-10-11 9:41 ` Boris BREZILLON
2013-10-17 15:59 ` Nicolas Ferre
2013-10-17 15:59 ` Nicolas Ferre
2013-10-17 15:59 ` Nicolas Ferre
2013-10-11 9:44 ` [PATCH v4 09/17] clk: at91: add PMC peripheral clocks Boris BREZILLON
2013-10-11 9:44 ` Boris BREZILLON
2013-10-17 16:02 ` Nicolas Ferre
2013-10-17 16:02 ` Nicolas Ferre
2013-10-17 16:02 ` Nicolas Ferre
2013-10-11 9:53 ` [PATCH v4 10/17] clk: at91: add peripheral clk macros for peripheral clk dt bindings Boris BREZILLON
2013-10-11 9:53 ` Boris BREZILLON
2013-10-11 9:53 ` Boris BREZILLON
2013-10-17 16:03 ` Nicolas Ferre
2013-10-17 16:03 ` Nicolas Ferre
2013-10-17 16:03 ` Nicolas Ferre
2013-10-11 9:57 ` [PATCH v4 11/17] clk: at91: add PMC programmable clocks Boris BREZILLON
2013-10-11 9:57 ` Boris BREZILLON
2013-10-11 9:57 ` Boris BREZILLON
2013-10-17 16:08 ` Nicolas Ferre
2013-10-17 16:08 ` Nicolas Ferre
2013-10-17 16:08 ` Nicolas Ferre
2013-10-11 10:22 ` [PATCH v4 12/17] clk: at91: add PMC utmi clock Boris BREZILLON
2013-10-11 10:22 ` Boris BREZILLON
2013-10-17 16:10 ` Nicolas Ferre
2013-10-17 16:10 ` Nicolas Ferre
2013-10-17 16:10 ` Nicolas Ferre
2013-10-11 11:15 ` [PATCH v4 13/17] clk: at91: add PMC usb clock Boris BREZILLON
2013-10-11 11:15 ` Boris BREZILLON
2013-10-17 16:18 ` Nicolas Ferre
2013-10-17 16:18 ` Nicolas Ferre
2013-10-17 16:18 ` Nicolas Ferre
2013-10-11 11:27 ` [PATCH v4 14/17] clk: at91: add PMC smd clock Boris BREZILLON
2013-10-11 11:27 ` Boris BREZILLON
2013-10-17 16:27 ` Nicolas Ferre
2013-10-17 16:27 ` Nicolas Ferre
2013-10-17 16:27 ` Nicolas Ferre
2013-10-17 16:55 ` [PATCH v5 13/17] clk: at91: add PMC usb clock Boris BREZILLON
2013-10-17 16:55 ` Boris BREZILLON
2013-10-17 16:55 ` Boris BREZILLON
2013-10-18 7:53 ` Nicolas Ferre
2013-10-18 7:53 ` Nicolas Ferre
2013-10-18 7:53 ` Nicolas Ferre
2013-10-11 11:38 ` [PATCH v4 15/17] clk: at91: add PMC clk device tree binding doc Boris BREZILLON
2013-10-11 11:38 ` Boris BREZILLON
2013-10-17 16:37 ` Nicolas Ferre
2013-10-17 16:37 ` Nicolas Ferre
2013-10-17 16:37 ` Nicolas Ferre
2013-10-11 11:46 ` [PATCH v4 16/17] ARM: at91: move pit timer to common clk framework Boris BREZILLON
2013-10-11 11:46 ` Boris BREZILLON
2013-10-11 11:49 ` [PATCH v4 17/17] ARM: at91: add new compatible strings for pmc driver Boris BREZILLON
2013-10-11 11:49 ` Boris BREZILLON
2013-10-11 11:49 ` Boris BREZILLON
2013-10-18 8:18 ` [PATCH v4 00/17] ARM: at91: move to common clk framework Nicolas Ferre
2013-10-18 8:18 ` Nicolas Ferre
2013-10-18 8:18 ` Nicolas Ferre
2013-11-07 23:29 ` Mike Turquette
2013-11-07 23:29 ` Mike Turquette
2013-11-07 23:29 ` Mike Turquette
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=525EB0F3.6050707@atmel.com \
--to=nicolas.ferre@atmel.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.