From: Russell King - ARM Linux <linux@arm.linux.org.uk>
To: linux-arm-kernel@lists.infradead.org,
devicetree-discuss@lists.ozlabs.org, linux-mmc@vger.kernel.org,
linux-omap@vger.kernel.org, linux-samsung-soc@vger.kernel.org,
STEricsson <STEricsson_nomadik_linux@list.st.com>
Cc: Alessandro Rubini <rubini@unipv.it>,
Linus Walleij <linus.walleij@stericsson.com>
Subject: [PATCH 29/31] ARM: amba: nomadik: use common amba device initializers
Date: Fri, 20 Jan 2012 09:32:11 +0000 [thread overview]
Message-ID: <E1RoApP-0005GE-D8@rmk-PC.arm.linux.org.uk> (raw)
In-Reply-To: <20120120092207.GD1068@n2100.arm.linux.org.uk>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---
arch/arm/mach-nomadik/board-nhk8815.c | 17 ++++-------------
arch/arm/mach-nomadik/cpu-8815.c | 9 ++-------
2 files changed, 6 insertions(+), 20 deletions(-)
diff --git a/arch/arm/mach-nomadik/board-nhk8815.c b/arch/arm/mach-nomadik/board-nhk8815.c
index 721e51c..f6f74ad 100644
--- a/arch/arm/mach-nomadik/board-nhk8815.c
+++ b/arch/arm/mach-nomadik/board-nhk8815.c
@@ -185,20 +185,11 @@ static void __init nhk8815_onenand_init(void)
#endif
}
-#define __MEM_4K_RESOURCE(x) \
- .res = {.start = (x), .end = (x) + SZ_4K - 1, .flags = IORESOURCE_MEM}
+static AMBA_APB_DEVICE(uart0, "uart0", 0, NOMADIK_UART0_BASE,
+ { IRQ_UART0 }, NULL);
-static struct amba_device uart0_device = {
- .dev = { .init_name = "uart0" },
- __MEM_4K_RESOURCE(NOMADIK_UART0_BASE),
- .irq = {IRQ_UART0},
-};
-
-static struct amba_device uart1_device = {
- .dev = { .init_name = "uart1" },
- __MEM_4K_RESOURCE(NOMADIK_UART1_BASE),
- .irq = {IRQ_UART1},
-};
+static AMBA_APB_DEVICE(uart1, "uart1", 0, NOMADIK_UART1_BASE,
+ { IRQ_UART1 }, NULL);
static struct amba_device *amba_devs[] __initdata = {
&uart0_device,
diff --git a/arch/arm/mach-nomadik/cpu-8815.c b/arch/arm/mach-nomadik/cpu-8815.c
index 65df7b4..27f43a4 100644
--- a/arch/arm/mach-nomadik/cpu-8815.c
+++ b/arch/arm/mach-nomadik/cpu-8815.c
@@ -97,12 +97,7 @@ static struct platform_device cpu8815_platform_gpio[] = {
GPIO_DEVICE(3),
};
-static struct amba_device cpu8815_amba_rng = {
- .dev = {
- .init_name = "rng",
- },
- __MEM_4K_RESOURCE(NOMADIK_RNG_BASE),
-};
+static AMBA_APB_DEVICE(cpu8815_amba_rng, "rng", 0, NOMADIK_RNG_BASE, { }, NULL);
static struct platform_device *platform_devs[] __initdata = {
cpu8815_platform_gpio + 0,
@@ -112,7 +107,7 @@ static struct platform_device *platform_devs[] __initdata = {
};
static struct amba_device *amba_devs[] __initdata = {
- &cpu8815_amba_rng
+ &cpu8815_amba_rng_device
};
static int __init cpu8815_init(void)
--
1.7.4.4
next prev parent reply other threads:[~2012-01-20 9:32 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
[not found] ` <20120120092207.GD1068-l+eeeJia6m9vn6HldHNs0ANdhmdF6hFW@public.gmane.org>
2012-01-20 9:27 ` [PATCH 16/31] ARM: amba: u300: " 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
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 ` Russell King - ARM Linux [this message]
2012-01-23 19:02 ` [PATCH 29/31] ARM: amba: nomadik: " 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
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
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=E1RoApP-0005GE-D8@rmk-PC.arm.linux.org.uk \
--to=linux@arm.linux.org.uk \
--cc=STEricsson_nomadik_linux@list.st.com \
--cc=devicetree-discuss@lists.ozlabs.org \
--cc=linus.walleij@stericsson.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-mmc@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=linux-samsung-soc@vger.kernel.org \
--cc=rubini@unipv.it \
/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).