From: Kukjin Kim <kgene.kim-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org>
To: 'Russell King - ARM Linux'
<linux-lFZ/pmaqli7XmaaqVzeoHQ@public.gmane.org>,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org,
devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org,
linux-mmc-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
linux-omap-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
linux-samsung-soc-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
'STEricsson'
<STEricsson_nomadik_linux-nkJGhpqTU55BDgjK7y7TUQ@public.gmane.org>
Subject: RE: [PATCH 31/31] ARM: amba: samsung: use common amba device initializers
Date: Sat, 21 Jan 2012 09:45:23 +0900 [thread overview]
Message-ID: <010201ccd7d5$f5ceabf0$e16c03d0$%kim@samsung.com> (raw)
In-Reply-To: <E1RoAq3-0005GM-LI-eh5Bv4kxaXIANfyc6IWni62ZND6+EDdj@public.gmane.org>
Russell King wrote:
>
> Signed-off-by: Russell King <rmk+kernel-lFZ/pmaqli7XmaaqVzeoHQ@public.gmane.org>
Acked-by: Kukjin Kim <kgene.kim-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org>
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <kgene.kim-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
> ---
> arch/arm/mach-exynos/dma.c | 38 ++++++--------------------------------
> arch/arm/mach-s5p64x0/dma.c | 22 +++++-----------------
> arch/arm/mach-s5pc100/dma.c | 38 ++++++--------------------------------
> arch/arm/mach-s5pv210/dma.c | 38 ++++++--------------------------------
> 4 files changed, 23 insertions(+), 113 deletions(-)
>
> diff --git a/arch/arm/mach-exynos/dma.c b/arch/arm/mach-exynos/dma.c
> index 8d681bf..91370de 100644
> --- a/arch/arm/mach-exynos/dma.c
> +++ b/arch/arm/mach-exynos/dma.c
> @@ -74,21 +74,8 @@ struct dma_pl330_platdata exynos4_pdma0_pdata = {
> .peri_id = pdma0_peri,
> };
>
> -struct amba_device exynos4_device_pdma0 = {
> - .dev = {
> - .init_name = "dma-pl330.0",
> - .dma_mask = &dma_dmamask,
> - .coherent_dma_mask = DMA_BIT_MASK(32),
> - .platform_data = &exynos4_pdma0_pdata,
> - },
> - .res = {
> - .start = EXYNOS4_PA_PDMA0,
> - .end = EXYNOS4_PA_PDMA0 + SZ_4K,
> - .flags = IORESOURCE_MEM,
> - },
> - .irq = {IRQ_PDMA0},
> - .periphid = 0x00041330,
> -};
> +AMBA_AHB_DEVICE(exynos4_pdma0, "dma-pl330.0", 0x00041330, EXYNOS4_PA_PDMA0,
> + {IRQ_PDMA0}, &exynos4_pdma0_pdata);
>
> u8 pdma1_peri[] = {
> DMACH_PCM0_RX,
> @@ -123,21 +110,8 @@ struct dma_pl330_platdata exynos4_pdma1_pdata = {
> .peri_id = pdma1_peri,
> };
>
> -struct amba_device exynos4_device_pdma1 = {
> - .dev = {
> - .init_name = "dma-pl330.1",
> - .dma_mask = &dma_dmamask,
> - .coherent_dma_mask = DMA_BIT_MASK(32),
> - .platform_data = &exynos4_pdma1_pdata,
> - },
> - .res = {
> - .start = EXYNOS4_PA_PDMA1,
> - .end = EXYNOS4_PA_PDMA1 + SZ_4K,
> - .flags = IORESOURCE_MEM,
> - },
> - .irq = {IRQ_PDMA1},
> - .periphid = 0x00041330,
> -};
> +AMBA_AHB_DEVICE(exynos4_pdma1, "dma-pl330.1", 0x00041330, EXYNOS4_PA_PDMA1,
> + {IRQ_PDMA1}, &exynos4_pdma1_pdata);
>
> static int __init exynos4_dma_init(void)
> {
> @@ -146,11 +120,11 @@ static int __init exynos4_dma_init(void)
>
> dma_cap_set(DMA_SLAVE, exynos4_pdma0_pdata.cap_mask);
> dma_cap_set(DMA_CYCLIC, exynos4_pdma0_pdata.cap_mask);
> - amba_device_register(&exynos4_device_pdma0, &iomem_resource);
> + amba_device_register(&exynos4_pdma0_device, &iomem_resource);
>
> dma_cap_set(DMA_SLAVE, exynos4_pdma1_pdata.cap_mask);
> dma_cap_set(DMA_CYCLIC, exynos4_pdma1_pdata.cap_mask);
> - amba_device_register(&exynos4_device_pdma1, &iomem_resource);
> + amba_device_register(&exynos4_pdma1_device, &iomem_resource);
>
> return 0;
> }
> diff --git a/arch/arm/mach-s5p64x0/dma.c b/arch/arm/mach-s5p64x0/dma.c
> index 99049aa..f7f68ad 100644
> --- a/arch/arm/mach-s5p64x0/dma.c
> +++ b/arch/arm/mach-s5p64x0/dma.c
> @@ -108,34 +108,22 @@ struct dma_pl330_platdata s5p6450_pdma_pdata = {
> .peri_id = s5p6450_pdma_peri,
> };
>
> -struct amba_device s5p64x0_device_pdma = {
> - .dev = {
> - .init_name = "dma-pl330",
> - .dma_mask = &dma_dmamask,
> - .coherent_dma_mask = DMA_BIT_MASK(32),
> - },
> - .res = {
> - .start = S5P64X0_PA_PDMA,
> - .end = S5P64X0_PA_PDMA + SZ_4K,
> - .flags = IORESOURCE_MEM,
> - },
> - .irq = {IRQ_DMA0},
> - .periphid = 0x00041330,
> -};
> +AMBA_AHB_DEVICE(s5p64x0_pdma, "dma-pl330", 0x00041330, S5P64X0_PA_PDMA,
> + {IRQ_DMA0}, NULL);
>
> static int __init s5p64x0_dma_init(void)
> {
> if (soc_is_s5p6450()) {
> dma_cap_set(DMA_SLAVE, s5p6450_pdma_pdata.cap_mask);
> dma_cap_set(DMA_CYCLIC, s5p6450_pdma_pdata.cap_mask);
> - s5p64x0_device_pdma.dev.platform_data = &s5p6450_pdma_pdata;
> + s5p64x0_pdma_device.dev.platform_data = &s5p6450_pdma_pdata;
> } else {
> dma_cap_set(DMA_SLAVE, s5p6440_pdma_pdata.cap_mask);
> dma_cap_set(DMA_CYCLIC, s5p6440_pdma_pdata.cap_mask);
> - s5p64x0_device_pdma.dev.platform_data = &s5p6440_pdma_pdata;
> + s5p64x0_pdma_device.dev.platform_data = &s5p6440_pdma_pdata;
> }
>
> - amba_device_register(&s5p64x0_device_pdma, &iomem_resource);
> + amba_device_register(&s5p64x0_pdma_device, &iomem_resource);
>
> return 0;
> }
> diff --git a/arch/arm/mach-s5pc100/dma.c b/arch/arm/mach-s5pc100/dma.c
> index ac08d7e..96b1ab3 100644
> --- a/arch/arm/mach-s5pc100/dma.c
> +++ b/arch/arm/mach-s5pc100/dma.c
> @@ -73,21 +73,8 @@ struct dma_pl330_platdata s5pc100_pdma0_pdata = {
> .peri_id = pdma0_peri,
> };
>
> -struct amba_device s5pc100_device_pdma0 = {
> - .dev = {
> - .init_name = "dma-pl330.0",
> - .dma_mask = &dma_dmamask,
> - .coherent_dma_mask = DMA_BIT_MASK(32),
> - .platform_data = &s5pc100_pdma0_pdata,
> - },
> - .res = {
> - .start = S5PC100_PA_PDMA0,
> - .end = S5PC100_PA_PDMA0 + SZ_4K,
> - .flags = IORESOURCE_MEM,
> - },
> - .irq = {IRQ_PDMA0},
> - .periphid = 0x00041330,
> -};
> +AMBA_AHB_DEVICE(s5pc100_pdma0, "dma-pl330.0", 0x00041330, S5PC100_PA_PDMA0,
> + {IRQ_PDMA0}, &s5pc100_pdma0_pdata);
>
> u8 pdma1_peri[] = {
> DMACH_UART0_RX,
> @@ -127,31 +114,18 @@ struct dma_pl330_platdata s5pc100_pdma1_pdata = {
> .peri_id = pdma1_peri,
> };
>
> -struct amba_device s5pc100_device_pdma1 = {
> - .dev = {
> - .init_name = "dma-pl330.1",
> - .dma_mask = &dma_dmamask,
> - .coherent_dma_mask = DMA_BIT_MASK(32),
> - .platform_data = &s5pc100_pdma1_pdata,
> - },
> - .res = {
> - .start = S5PC100_PA_PDMA1,
> - .end = S5PC100_PA_PDMA1 + SZ_4K,
> - .flags = IORESOURCE_MEM,
> - },
> - .irq = {IRQ_PDMA1},
> - .periphid = 0x00041330,
> -};
> +AMBA_AHB_DEVICE(s5pc100_pdma1, "dma-pl330.1", 0x00041330, S5PC100_PA_PDMA1,
> + {IRQ_PDMA1}, &s5pc100_pdma1_pdata);
>
> static int __init s5pc100_dma_init(void)
> {
> dma_cap_set(DMA_SLAVE, s5pc100_pdma0_pdata.cap_mask);
> dma_cap_set(DMA_CYCLIC, s5pc100_pdma0_pdata.cap_mask);
> - amba_device_register(&s5pc100_device_pdma0, &iomem_resource);
> + amba_device_register(&s5pc100_pdma0_device, &iomem_resource);
>
> dma_cap_set(DMA_SLAVE, s5pc100_pdma1_pdata.cap_mask);
> dma_cap_set(DMA_CYCLIC, s5pc100_pdma1_pdata.cap_mask);
> - amba_device_register(&s5pc100_device_pdma1, &iomem_resource);
> + amba_device_register(&s5pc100_pdma1_device, &iomem_resource);
>
> return 0;
> }
> diff --git a/arch/arm/mach-s5pv210/dma.c b/arch/arm/mach-s5pv210/dma.c
> index 8602fa5..f6885d2 100644
> --- a/arch/arm/mach-s5pv210/dma.c
> +++ b/arch/arm/mach-s5pv210/dma.c
> @@ -71,21 +71,8 @@ struct dma_pl330_platdata s5pv210_pdma0_pdata = {
> .peri_id = pdma0_peri,
> };
>
> -struct amba_device s5pv210_device_pdma0 = {
> - .dev = {
> - .init_name = "dma-pl330.0",
> - .dma_mask = &dma_dmamask,
> - .coherent_dma_mask = DMA_BIT_MASK(32),
> - .platform_data = &s5pv210_pdma0_pdata,
> - },
> - .res = {
> - .start = S5PV210_PA_PDMA0,
> - .end = S5PV210_PA_PDMA0 + SZ_4K,
> - .flags = IORESOURCE_MEM,
> - },
> - .irq = {IRQ_PDMA0},
> - .periphid = 0x00041330,
> -};
> +AMBA_AHB_DEVICE(s5pv210_pdma0, "dma-pl330.0", 0x00041330, S5PV210_PA_PDMA0,
> + {IRQ_PDMA0}, &s5pv210_pdma0_pdata);
>
> u8 pdma1_peri[] = {
> DMACH_UART0_RX,
> @@ -127,31 +114,18 @@ struct dma_pl330_platdata s5pv210_pdma1_pdata = {
> .peri_id = pdma1_peri,
> };
>
> -struct amba_device s5pv210_device_pdma1 = {
> - .dev = {
> - .init_name = "dma-pl330.1",
> - .dma_mask = &dma_dmamask,
> - .coherent_dma_mask = DMA_BIT_MASK(32),
> - .platform_data = &s5pv210_pdma1_pdata,
> - },
> - .res = {
> - .start = S5PV210_PA_PDMA1,
> - .end = S5PV210_PA_PDMA1 + SZ_4K,
> - .flags = IORESOURCE_MEM,
> - },
> - .irq = {IRQ_PDMA1},
> - .periphid = 0x00041330,
> -};
> +AMBA_AHB_DEVICE(s5pv210_pdma1, "dma-pl330.1", 0x00041330, S5PV210_PA_PDMA1,
> + {IRQ_PDMA1}, &s5pv210_pdma1_pdata);
>
> static int __init s5pv210_dma_init(void)
> {
> dma_cap_set(DMA_SLAVE, s5pv210_pdma0_pdata.cap_mask);
> dma_cap_set(DMA_CYCLIC, s5pv210_pdma0_pdata.cap_mask);
> - amba_device_register(&s5pv210_device_pdma0, &iomem_resource);
> + amba_device_register(&s5pv210_pdma0_device, &iomem_resource);
>
> dma_cap_set(DMA_SLAVE, s5pv210_pdma1_pdata.cap_mask);
> dma_cap_set(DMA_CYCLIC, s5pv210_pdma1_pdata.cap_mask);
> - amba_device_register(&s5pv210_device_pdma1, &iomem_resource);
> + amba_device_register(&s5pv210_pdma1_device, &iomem_resource);
>
> return 0;
> }
> --
> 1.7.4.4
next prev parent reply other threads:[~2012-01-21 0:45 UTC|newest]
Thread overview: 69+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-20 9:22 [PATCH 00/31] Clean up amba/primecell bus support Russell King - ARM Linux
2012-01-20 9:22 ` [PATCH 01/31] ARM: amba: add amba_device allocation/add/put functions Russell King - ARM Linux
2012-01-20 9:23 ` [PATCH 02/31] ARM: amba: of: convert to use amba_device_alloc Russell King - ARM Linux
2012-01-20 13:58 ` Rob Herring
2012-01-20 9:23 ` [PATCH 03/31] ARM: amba: ux500: " Russell King - ARM Linux
2012-01-21 16:21 ` Srinidhi KASAGAR
2012-01-23 19:03 ` Linus Walleij
2012-01-20 9:23 ` [PATCH 04/31] ARM: amba: integrator: " Russell King - ARM Linux
2012-01-20 9:24 ` [PATCH 05/31] ARM: amba: mxs: " Russell King - ARM Linux
2012-01-20 12:25 ` Shawn Guo
2012-01-20 12:39 ` Russell King - ARM Linux
2012-01-20 9:24 ` [PATCH 06/31] ARM: amba: make irq 0 invalid Russell King - ARM Linux
2012-01-20 9:24 ` [PATCH 07/31] ARM: amba: ux500: get rid of NO_IRQ Russell King - ARM Linux
2012-01-21 16:19 ` Srinidhi KASAGAR
[not found] ` <E1RoAiE-0005Eh-7i-eh5Bv4kxaXIANfyc6IWni62ZND6+EDdj@public.gmane.org>
2012-01-23 19:04 ` Linus Walleij
2012-01-20 9:25 ` [PATCH 08/31] ARM: amba: get rid of NO_IRQ initializers Russell King - ARM Linux
2012-01-20 9:25 ` [PATCH 09/31] ARM: amba: samsung: " Russell King - ARM Linux
2012-01-21 0:28 ` Kukjin Kim
2012-01-20 9:25 ` [PATCH 10/31] ARM: amba: integrator/realview/versatile/vexpress: " Russell King - ARM Linux
2012-01-20 9:26 ` [PATCH 11/31] ARM: amba: lpc32xx: " Russell King - ARM Linux
2012-01-20 9:26 ` [PATCH 12/31] ARM: amba: mxs: " Russell King - ARM Linux
2012-01-20 12:27 ` Shawn Guo
2012-01-20 9:26 ` [PATCH 13/31] ARM: amba: nomadik: " Russell King - ARM Linux
2012-01-23 19:02 ` Linus Walleij
2012-01-20 9:27 ` [PATCH 14/31] ARM: amba: netx: " Russell King - ARM Linux
2012-01-20 9:27 ` [PATCH 15/31] ARM: amba: spear: " Russell King - ARM Linux
2012-01-20 9:30 ` Viresh Kumar
2012-01-20 9:28 ` [PATCH 18/31] ARM: amba: provide common initializers for static amba devices Russell King - ARM Linux
2012-01-20 17:58 ` H Hartley Sweeten
2012-01-20 9:28 ` [PATCH 19/31] ARM: amba: vexpress: get rid of private platform amba_device initializer Russell King - ARM Linux
2012-01-24 14:27 ` Will Deacon
2012-01-20 9:29 ` [PATCH 20/31] ARM: amba: versatile: " Russell King - ARM Linux
2012-01-24 15:06 ` Will Deacon
2012-01-20 9:29 ` [PATCH 21/31] ARM: amba: realview: " Russell King - ARM Linux
2012-01-24 16:00 ` Will Deacon
[not found] ` <20120124160044.GM19798-MRww78TxoiP5vMa5CHWGZ34zcgK1vI+I0E9HWUfgJXw@public.gmane.org>
2012-01-24 16:23 ` Russell King - ARM Linux
2012-01-24 17:26 ` Will Deacon
2012-01-24 21:23 ` Linus Walleij
2012-01-24 21:45 ` Russell King - ARM Linux
2012-01-25 9:58 ` Will Deacon
2012-01-25 10:22 ` Russell King - ARM Linux
2012-01-25 10:39 ` Will Deacon
2012-01-25 11:06 ` Russell King - ARM Linux
2012-01-26 17:25 ` Russell King - ARM Linux
[not found] ` <20120126172527.GA12731-l+eeeJia6m9vn6HldHNs0ANdhmdF6hFW@public.gmane.org>
2012-01-26 17:37 ` Will Deacon
2012-01-26 17:41 ` Russell King - ARM Linux
2012-01-20 9:29 ` [PATCH 22/31] ARM: amba: integrator: use common amba device initializers Russell King - ARM Linux
2012-01-24 16:13 ` Will Deacon
2012-01-20 9:30 ` [PATCH 23/31] ARM: amba: omap2: " Russell King - ARM Linux
2012-01-20 14:37 ` Tony Lindgren
2012-01-20 9:30 ` [PATCH 25/31] ARM: amba: bcmring: " Russell King - ARM Linux
2012-01-20 9:31 ` [PATCH 26/31] ARM: amba: netx: " Russell King - ARM Linux
2012-01-20 9:31 ` [PATCH 27/31] ARM: amba: lpc32xx: " Russell King - ARM Linux
2012-01-20 9:31 ` [PATCH 28/31] ARM: amba: u300: " Russell King - ARM Linux
2012-01-23 19:05 ` Linus Walleij
2012-01-20 9:32 ` [PATCH 29/31] ARM: amba: nomadik: " Russell King - ARM Linux
2012-01-23 19:02 ` Linus Walleij
2012-01-20 9:32 ` [PATCH 30/31] ARM: amba: spear: " Russell King - ARM Linux
2012-01-20 9:38 ` Viresh Kumar
2012-01-20 9:32 ` [PATCH 31/31] ARM: amba: samsung: " Russell King - ARM Linux
[not found] ` <E1RoAq3-0005GM-LI-eh5Bv4kxaXIANfyc6IWni62ZND6+EDdj@public.gmane.org>
2012-01-21 0:45 ` Kukjin Kim [this message]
2012-01-20 22:33 ` [PATCH 13/31] ARM: amba: nomadik: get rid of NO_IRQ initializers Alessandro Rubini
2012-01-20 22:33 ` [PATCH 29/31] ARM: amba: nomadik: use common amba device initializers Alessandro Rubini
[not found] ` <20120120092207.GD1068-l+eeeJia6m9vn6HldHNs0ANdhmdF6hFW@public.gmane.org>
2012-01-20 9:27 ` [PATCH 16/31] ARM: amba: u300: get rid of NO_IRQ initializers Russell King - ARM Linux
2012-01-23 19:04 ` Linus Walleij
2012-01-20 9:28 ` [PATCH 17/31] ARM: amba: make use of -1 IRQs warn Russell King - ARM Linux
2012-01-20 9:30 ` [PATCH 24/31] ARM: amba: ep93xx: use common amba device initializers Russell King - ARM Linux
2012-01-20 16:56 ` H Hartley Sweeten
2012-01-21 0:59 ` [PATCH 00/31] Clean up amba/primecell bus support Kukjin Kim
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='010201ccd7d5$f5ceabf0$e16c03d0$%kim@samsung.com' \
--to=kgene.kim-sze3o3uu22jbdgjk7y7tuq@public.gmane.org \
--cc=STEricsson_nomadik_linux-nkJGhpqTU55BDgjK7y7TUQ@public.gmane.org \
--cc=devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org \
--cc=linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \
--cc=linux-lFZ/pmaqli7XmaaqVzeoHQ@public.gmane.org \
--cc=linux-mmc-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=linux-omap-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=linux-samsung-soc-u79uwXL29TY76Z2rM5mHXA@public.gmane.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).