From: viresh.kumar@st.com (Viresh Kumar)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH V6 5/8] ST SPEAr3xx: Declare device structures after shirq code
Date: Tue, 1 Mar 2011 16:56:11 +0530 [thread overview]
Message-ID: <ace528081cf61ad4b0c539fbecad3a19db76ac84.1298977691.git.viresh.kumar@st.com> (raw)
In-Reply-To: <cover.1298977691.git.viresh.kumar@st.com>
Order of declarations should be: pmx_devs, shirq support, amba_devices,
plat_devices, routines. This patch moves gpio_device below shirq support.
Signed-off-by: Viresh Kumar <viresh.kumar@st.com>
---
arch/arm/mach-spear3xx/spear300.c | 40 ++++++++++++++++++------------------
arch/arm/mach-spear3xx/spear310.c | 4 +-
arch/arm/mach-spear3xx/spear320.c | 4 +-
3 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/arch/arm/mach-spear3xx/spear300.c b/arch/arm/mach-spear3xx/spear300.c
index 42dc29b..23d2a14 100644
--- a/arch/arm/mach-spear3xx/spear300.c
+++ b/arch/arm/mach-spear3xx/spear300.c
@@ -370,26 +370,6 @@ struct pmx_driver pmx_driver = {
.mux_reg = {.offset = PAD_MUX_CONFIG_REG, .mask = 0x00007fff},
};
-/* Add spear300 specific devices here */
-/* arm gpio1 device registration */
-static struct pl061_platform_data gpio1_plat_data = {
- .gpio_base = 8,
- .irq_base = SPEAR_GPIO1_INT_BASE,
-};
-
-struct amba_device gpio1_device = {
- .dev = {
- .init_name = "gpio1",
- .platform_data = &gpio1_plat_data,
- },
- .res = {
- .start = SPEAR300_GPIO_BASE,
- .end = SPEAR300_GPIO_BASE + SPEAR300_GPIO_SIZE - 1,
- .flags = IORESOURCE_MEM,
- },
- .irq = {VIRQ_GPIO1, NO_IRQ},
-};
-
/* spear3xx shared irq */
struct shirq_dev_config shirq_ras1_config[] = {
{
@@ -443,6 +423,26 @@ struct spear_shirq shirq_ras1 = {
},
};
+/* Add spear300 specific devices here */
+/* arm gpio1 device registration */
+static struct pl061_platform_data gpio1_plat_data = {
+ .gpio_base = 8,
+ .irq_base = SPEAR_GPIO1_INT_BASE,
+};
+
+struct amba_device gpio1_device = {
+ .dev = {
+ .init_name = "gpio1",
+ .platform_data = &gpio1_plat_data,
+ },
+ .res = {
+ .start = SPEAR300_GPIO_BASE,
+ .end = SPEAR300_GPIO_BASE + SPEAR300_GPIO_SIZE - 1,
+ .flags = IORESOURCE_MEM,
+ },
+ .irq = {VIRQ_GPIO1, NO_IRQ},
+};
+
/* spear300 routines */
void __init spear300_init(void)
{
diff --git a/arch/arm/mach-spear3xx/spear310.c b/arch/arm/mach-spear3xx/spear310.c
index 5bfab14..3a3d548 100644
--- a/arch/arm/mach-spear3xx/spear310.c
+++ b/arch/arm/mach-spear3xx/spear310.c
@@ -139,8 +139,6 @@ struct pmx_driver pmx_driver = {
.mux_reg = {.offset = PAD_MUX_CONFIG_REG, .mask = 0x00007fff},
};
-/* Add spear310 specific devices here */
-
/* spear3xx shared irq */
struct shirq_dev_config shirq_ras1_config[] = {
{
@@ -257,6 +255,8 @@ struct spear_shirq shirq_intrcomm_ras = {
},
};
+/* Add spear310 specific devices here */
+
/* spear310 routines */
void __init spear310_init(void)
{
diff --git a/arch/arm/mach-spear3xx/spear320.c b/arch/arm/mach-spear3xx/spear320.c
index 6dba628..8ba3ff2 100644
--- a/arch/arm/mach-spear3xx/spear320.c
+++ b/arch/arm/mach-spear3xx/spear320.c
@@ -384,8 +384,6 @@ struct pmx_driver pmx_driver = {
.mux_reg = {.offset = PAD_MUX_CONFIG_REG, .mask = 0x00007fff},
};
-/* Add spear320 specific devices here */
-
/* spear3xx shared irq */
struct shirq_dev_config shirq_ras1_config[] = {
{
@@ -510,6 +508,8 @@ struct spear_shirq shirq_intrcomm_ras = {
},
};
+/* Add spear320 specific devices here */
+
/* spear320 routines */
void __init spear320_init(void)
{
--
1.7.2.2
next prev parent reply other threads:[~2011-03-01 11:26 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-01 11:26 [PATCH V6 0/8] SPEAr3xx & SPEAr6xx Fixes Viresh Kumar
2011-03-01 11:26 ` [PATCH V6 1/8] ST SPEAr: Reordering #includes in .h & .c files Viresh Kumar
2011-03-01 11:26 ` [PATCH V6 2/8] ST SPEAr: Include mach/hardware.h instead of mach/spear.h Viresh Kumar
2011-03-01 11:26 ` [PATCH V6 3/8] ST SPEAr3xx: Rename sdio to sdhci Viresh Kumar
2011-03-01 11:26 ` [PATCH V6 4/8] ST SPEAr Clock Framework: Rename usbd clock and align apb_clk entry Viresh Kumar
2011-03-01 11:26 ` Viresh Kumar [this message]
2011-03-01 11:26 ` [PATCH V6 6/8] ST SPEAr: Replacing SIZE macro's with SZ_4K macros Viresh Kumar
2011-03-01 11:26 ` [PATCH V6 7/8] ST SPEAr: Remove unused *_SIZE macros from spear*.h files Viresh Kumar
2011-03-08 22:32 ` Russell King - ARM Linux
2011-03-09 3:43 ` viresh kumar
2011-03-01 11:26 ` [PATCH V6 8/8] ST SPEAr: Append UL to device address macros Viresh Kumar
2011-03-05 14:02 ` [PATCH V6 0/8] SPEAr3xx & SPEAr6xx Fixes Russell King - ARM Linux
2011-03-05 14:04 ` Russell King - ARM Linux
2011-03-05 14:08 ` Russell King - ARM Linux
2011-03-07 3:46 ` viresh kumar
2011-03-07 3:45 ` viresh kumar
2011-03-07 3:44 ` viresh kumar
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=ace528081cf61ad4b0c539fbecad3a19db76ac84.1298977691.git.viresh.kumar@st.com \
--to=viresh.kumar@st.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 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).