From: will.deacon@arm.com (Will Deacon)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 02/51] ARM: mach-at91: use arm_arch_reset instead of arch_reset
Date: Fri, 28 Oct 2011 15:43:30 +0100 [thread overview]
Message-ID: <1319813059-8914-3-git-send-email-will.deacon@arm.com> (raw)
In-Reply-To: <1319813059-8914-1-git-send-email-will.deacon@arm.com>
This patch updates mach-at91 to use arm_arch_reset instead of
arch_reset.
Signed-off-by: Will Deacon <will.deacon@arm.com>
---
arch/arm/mach-at91/at91cap9.c | 5 +++--
arch/arm/mach-at91/at91rm9200.c | 5 +++--
arch/arm/mach-at91/at91sam9260.c | 3 ++-
arch/arm/mach-at91/at91sam9261.c | 3 ++-
arch/arm/mach-at91/at91sam9263.c | 3 ++-
arch/arm/mach-at91/at91sam9g45.c | 5 +++--
arch/arm/mach-at91/at91sam9rl.c | 3 ++-
arch/arm/mach-at91/generic.h | 3 +--
arch/arm/mach-at91/include/mach/system.h | 5 -----
9 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/arch/arm/mach-at91/at91cap9.c b/arch/arm/mach-at91/at91cap9.c
index bfc6844..d16da6a 100644
--- a/arch/arm/mach-at91/at91cap9.c
+++ b/arch/arm/mach-at91/at91cap9.c
@@ -16,6 +16,7 @@
#include <linux/pm.h>
#include <asm/irq.h>
+#include <asm/system.h>
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
@@ -311,7 +312,7 @@ static struct at91_gpio_bank at91cap9_gpio[] = {
}
};
-static void at91cap9_reset(void)
+static void at91cap9_reset(char mode, const char *cmd)
{
at91_sys_write(AT91_RSTC_CR, AT91_RSTC_KEY | AT91_RSTC_PROCRST | AT91_RSTC_PERRST);
}
@@ -333,7 +334,7 @@ static void __init at91cap9_map_io(void)
static void __init at91cap9_initialize(void)
{
- at91_arch_reset = at91cap9_reset;
+ arm_arch_reset = at91cap9_reset;
pm_power_off = at91cap9_poweroff;
at91_extern_irq = (1 << AT91CAP9_ID_IRQ0) | (1 << AT91CAP9_ID_IRQ1);
diff --git a/arch/arm/mach-at91/at91rm9200.c b/arch/arm/mach-at91/at91rm9200.c
index f73302d..4497e81 100644
--- a/arch/arm/mach-at91/at91rm9200.c
+++ b/arch/arm/mach-at91/at91rm9200.c
@@ -13,6 +13,7 @@
#include <linux/module.h>
#include <asm/irq.h>
+#include <asm/system.h>
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
#include <mach/at91rm9200.h>
@@ -286,7 +287,7 @@ static struct at91_gpio_bank at91rm9200_gpio[] = {
}
};
-static void at91rm9200_reset(void)
+static void at91rm9200_reset(char mode, const char *cmd)
{
/*
* Perform a hardware reset with the use of the Watchdog timer.
@@ -307,7 +308,7 @@ static void __init at91rm9200_map_io(void)
static void __init at91rm9200_initialize(void)
{
- at91_arch_reset = at91rm9200_reset;
+ arm_arch_reset = at91rm9200_reset;
at91_extern_irq = (1 << AT91RM9200_ID_IRQ0) | (1 << AT91RM9200_ID_IRQ1)
| (1 << AT91RM9200_ID_IRQ2) | (1 << AT91RM9200_ID_IRQ3)
| (1 << AT91RM9200_ID_IRQ4) | (1 << AT91RM9200_ID_IRQ5)
diff --git a/arch/arm/mach-at91/at91sam9260.c b/arch/arm/mach-at91/at91sam9260.c
index cb397be..2f5e4c1 100644
--- a/arch/arm/mach-at91/at91sam9260.c
+++ b/arch/arm/mach-at91/at91sam9260.c
@@ -14,6 +14,7 @@
#include <linux/pm.h>
#include <asm/irq.h>
+#include <asm/system.h>
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
#include <mach/cpu.h>
@@ -317,7 +318,7 @@ static void __init at91sam9260_map_io(void)
static void __init at91sam9260_initialize(void)
{
- at91_arch_reset = at91sam9_alt_reset;
+ arm_arch_reset = at91sam9_alt_reset;
pm_power_off = at91sam9260_poweroff;
at91_extern_irq = (1 << AT91SAM9260_ID_IRQ0) | (1 << AT91SAM9260_ID_IRQ1)
| (1 << AT91SAM9260_ID_IRQ2);
diff --git a/arch/arm/mach-at91/at91sam9261.c b/arch/arm/mach-at91/at91sam9261.c
index 6c8e3b5..b7b0625 100644
--- a/arch/arm/mach-at91/at91sam9261.c
+++ b/arch/arm/mach-at91/at91sam9261.c
@@ -14,6 +14,7 @@
#include <linux/pm.h>
#include <asm/irq.h>
+#include <asm/system.h>
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
#include <mach/cpu.h>
@@ -286,7 +287,7 @@ static void __init at91sam9261_map_io(void)
static void __init at91sam9261_initialize(void)
{
- at91_arch_reset = at91sam9_alt_reset;
+ arm_arch_reset = at91sam9_alt_reset;
pm_power_off = at91sam9261_poweroff;
at91_extern_irq = (1 << AT91SAM9261_ID_IRQ0) | (1 << AT91SAM9261_ID_IRQ1)
| (1 << AT91SAM9261_ID_IRQ2);
diff --git a/arch/arm/mach-at91/at91sam9263.c b/arch/arm/mach-at91/at91sam9263.c
index 044f3c9..42b7380 100644
--- a/arch/arm/mach-at91/at91sam9263.c
+++ b/arch/arm/mach-at91/at91sam9263.c
@@ -14,6 +14,7 @@
#include <linux/pm.h>
#include <asm/irq.h>
+#include <asm/system.h>
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
#include <mach/at91sam9263.h>
@@ -303,7 +304,7 @@ static void __init at91sam9263_map_io(void)
static void __init at91sam9263_initialize(void)
{
- at91_arch_reset = at91sam9_alt_reset;
+ arm_arch_reset = at91sam9_alt_reset;
pm_power_off = at91sam9263_poweroff;
at91_extern_irq = (1 << AT91SAM9263_ID_IRQ0) | (1 << AT91SAM9263_ID_IRQ1);
diff --git a/arch/arm/mach-at91/at91sam9g45.c b/arch/arm/mach-at91/at91sam9g45.c
index e04c5fb..d13929c 100644
--- a/arch/arm/mach-at91/at91sam9g45.c
+++ b/arch/arm/mach-at91/at91sam9g45.c
@@ -14,6 +14,7 @@
#include <linux/pm.h>
#include <asm/irq.h>
+#include <asm/system.h>
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
#include <mach/at91sam9g45.h>
@@ -301,7 +302,7 @@ static struct at91_gpio_bank at91sam9g45_gpio[] = {
}
};
-static void at91sam9g45_reset(void)
+static void at91sam9g45_reset(char mode, const char *cmd)
{
at91_sys_write(AT91_RSTC_CR, AT91_RSTC_KEY | AT91_RSTC_PROCRST | AT91_RSTC_PERRST);
}
@@ -323,7 +324,7 @@ static void __init at91sam9g45_map_io(void)
static void __init at91sam9g45_initialize(void)
{
- at91_arch_reset = at91sam9g45_reset;
+ arm_arch_reset = at91sam9g45_reset;
pm_power_off = at91sam9g45_poweroff;
at91_extern_irq = (1 << AT91SAM9G45_ID_IRQ0);
diff --git a/arch/arm/mach-at91/at91sam9rl.c b/arch/arm/mach-at91/at91sam9rl.c
index a238105..f556331 100644
--- a/arch/arm/mach-at91/at91sam9rl.c
+++ b/arch/arm/mach-at91/at91sam9rl.c
@@ -13,6 +13,7 @@
#include <linux/pm.h>
#include <asm/irq.h>
+#include <asm/system.h>
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
#include <mach/cpu.h>
@@ -292,7 +293,7 @@ static void __init at91sam9rl_map_io(void)
static void __init at91sam9rl_initialize(void)
{
- at91_arch_reset = at91sam9_alt_reset;
+ arm_arch_reset = at91sam9_alt_reset;
pm_power_off = at91sam9rl_poweroff;
at91_extern_irq = (1 << AT91SAM9RL_ID_IRQ0);
diff --git a/arch/arm/mach-at91/generic.h b/arch/arm/mach-at91/generic.h
index 938b34f..c15c9bb 100644
--- a/arch/arm/mach-at91/generic.h
+++ b/arch/arm/mach-at91/generic.h
@@ -57,7 +57,7 @@ extern void at91_irq_suspend(void);
extern void at91_irq_resume(void);
/* reset */
-extern void at91sam9_alt_reset(void);
+extern void at91sam9_alt_reset(char mode, const char *cmd);
/* GPIO */
#define AT91RM9200_PQFP 3 /* AT91RM9200 PQFP package has 3 banks */
@@ -71,5 +71,4 @@ struct at91_gpio_bank {
extern void __init at91_gpio_init(struct at91_gpio_bank *, int nr_banks);
extern void __init at91_gpio_irq_setup(void);
-extern void (*at91_arch_reset)(void);
extern int at91_extern_irq;
diff --git a/arch/arm/mach-at91/include/mach/system.h b/arch/arm/mach-at91/include/mach/system.h
index 36af14b..079eb12 100644
--- a/arch/arm/mach-at91/include/mach/system.h
+++ b/arch/arm/mach-at91/include/mach/system.h
@@ -47,13 +47,8 @@ static inline void arch_idle(void)
#endif
}
-void (*at91_arch_reset)(void);
-
static inline void arch_reset(char mode, const char *cmd)
{
- /* call the CPU-specific reset function */
- if (at91_arch_reset)
- (at91_arch_reset)();
}
#endif
--
1.7.4.1
next prev parent reply other threads:[~2011-10-28 14:43 UTC|newest]
Thread overview: 79+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-28 14:43 [PATCH 00/51] Remove inline arch_reset definitions from system.h Will Deacon
2011-10-28 14:43 ` [PATCH 01/51] ARM: reset: introduce arm_arch_reset function pointer Will Deacon
2011-10-28 21:38 ` Jean-Christophe PLAGNIOL-VILLARD
2011-10-29 13:59 ` Will Deacon
2011-10-29 10:21 ` Russell King - ARM Linux
2011-10-29 13:56 ` Will Deacon
2011-10-29 20:05 ` Russell King - ARM Linux
2011-10-30 21:07 ` Will Deacon
2011-10-31 12:06 ` Russell King - ARM Linux
2011-10-31 13:53 ` Will Deacon
2011-11-01 18:05 ` Will Deacon
2011-10-31 14:13 ` Russell King - ARM Linux
2011-10-31 14:26 ` Jamie Iles
2011-10-31 14:33 ` Russell King - ARM Linux
2011-10-31 14:33 ` Rabin Vincent
2011-10-31 14:39 ` Russell King - ARM Linux
2011-10-31 14:44 ` Rabin Vincent
2011-10-31 14:56 ` Russell King - ARM Linux
2011-10-31 14:37 ` Will Deacon
2011-10-31 22:15 ` Russell King - ARM Linux
2011-11-01 12:40 ` Will Deacon
2011-11-01 13:01 ` Russell King - ARM Linux
2011-10-31 22:43 ` Nicolas Pitre
2011-10-28 14:43 ` Will Deacon [this message]
2011-10-28 14:43 ` [PATCH 03/51] ARM: bcmring: use arm_arch_reset instead of arch_reset Will Deacon
2011-10-28 14:43 ` [PATCH 04/51] ARM: mach-clps711x: " Will Deacon
2011-10-28 14:43 ` [PATCH 05/51] ARM: cns3xxx: " Will Deacon
2011-10-28 14:43 ` [PATCH 06/51] ARM: mach-davinci: " Will Deacon
2011-10-28 14:43 ` [PATCH 07/51] ARM: mach-dove: " Will Deacon
2011-10-28 14:43 ` [PATCH 08/51] ARM: mach-ebsa110: " Will Deacon
2011-10-28 14:43 ` [PATCH 09/51] ARM: mach-ep93xx: " Will Deacon
2011-10-28 14:43 ` [PATCH 10/51] ARM: mach-footbridge: " Will Deacon
2011-10-28 14:43 ` [PATCH 11/51] ARM: mach-gemini: " Will Deacon
2011-10-28 14:43 ` [PATCH 12/51] ARM: mach-h720x: " Will Deacon
2011-10-28 14:43 ` [PATCH 13/51] ARM: mach-integrator: " Will Deacon
2011-10-28 14:43 ` [PATCH 14/51] ARM: mach-iop13xx: " Will Deacon
2011-10-28 14:43 ` [PATCH 15/51] ARM: mach-iop32x: " Will Deacon
2011-10-28 14:43 ` [PATCH 16/51] ARM: mach-iop33x: " Will Deacon
2011-10-28 14:43 ` [PATCH 17/51] ARM: OMAP: convert reset to use arm_arch_reset Will Deacon
2011-10-28 14:43 ` [PATCH 18/51] ARM: mach-ixp2000: use arm_arch_reset instead of arch_reset Will Deacon
2011-10-28 14:43 ` [PATCH 19/51] ARM: mach-ixp23xx: " Will Deacon
2011-10-28 14:43 ` [PATCH 20/51] ARM: mach-ixp4xx: " Will Deacon
2011-10-28 14:43 ` [PATCH 21/51] ARM: mach-kirkwood: " Will Deacon
2011-10-28 14:43 ` [PATCH 22/51] ARM: mach-ks8695: " Will Deacon
2011-10-28 14:43 ` [PATCH 23/51] ARM: mach-lpc32xx: " Will Deacon
2011-10-28 14:43 ` [PATCH 24/51] ARM: mach-mmp: " Will Deacon
2011-10-28 14:43 ` [PATCH 25/51] ARM: mach-mv78xx0: " Will Deacon
2011-10-28 14:43 ` [PATCH 26/51] ARM: mach-msm: " Will Deacon
2011-10-28 14:43 ` [PATCH 27/51] ARM: mach-mxs: " Will Deacon
2011-10-28 14:43 ` [PATCH 28/51] ARM: mach-netx: " Will Deacon
2011-10-28 14:43 ` [PATCH 29/51] ARM: mach-nomadik: " Will Deacon
2011-10-28 14:43 ` [PATCH 30/51] ARM: mach-nuc93x: " Will Deacon
2011-10-28 14:43 ` [PATCH 31/51] ARM: mach-orion5x: " Will Deacon
2011-10-28 14:44 ` [PATCH 32/51] ARM: mach-pnx4008: " Will Deacon
2011-10-28 14:44 ` [PATCH 33/51] ARM: mach-prima2: " Will Deacon
2011-10-29 9:41 ` Barry Song
2011-10-29 13:58 ` Will Deacon
2011-10-28 14:44 ` [PATCH 34/51] ARM: mach-pxa: " Will Deacon
2011-10-28 22:12 ` Marek Vasut
2011-10-28 14:44 ` [PATCH 35/51] ARM: mach-realview: " Will Deacon
2011-10-28 14:44 ` [PATCH 36/51] ARM: mach-rpc: " Will Deacon
2011-10-28 14:44 ` [PATCH 37/51] ARM: mach-s3c64xx: " Will Deacon
2011-10-28 14:44 ` [PATCH 38/51] ARM: mach-sa1100: " Will Deacon
2011-10-28 14:44 ` [PATCH 39/51] ARM: mach-shark: " Will Deacon
2011-10-28 14:44 ` [PATCH 40/51] ARM: mach-shmobile: " Will Deacon
2011-10-28 14:44 ` [PATCH 41/51] ARM: mach-tegra: " Will Deacon
2011-10-28 14:44 ` [PATCH 42/51] ARM: mach-u300: " Will Deacon
2011-10-28 19:37 ` Linus Walleij
2011-10-28 14:44 ` [PATCH 43/51] ARM: mach-versatile: " Will Deacon
2011-10-28 14:44 ` [PATCH 44/51] ARM: mach-vt8500: " Will Deacon
2011-10-28 14:44 ` [PATCH 45/51] ARM: mach-w90x900: " Will Deacon
2011-10-28 14:44 ` [PATCH 46/51] ARM: plat-spear: " Will Deacon
2011-10-28 14:44 ` [PATCH 47/51] ARM: plat-tcc: " Will Deacon
2011-10-28 14:44 ` [PATCH 48/51] ARM: plat-s5p: " Will Deacon
2011-10-28 14:44 ` [PATCH 49/51] ARM: plat-mxc: " Will Deacon
2011-10-28 14:44 ` [PATCH 50/51] ARM: plat-s3c24xx: " Will Deacon
2011-10-28 14:44 ` [PATCH 51/51] ARM: reset: remove empty arch_reset definitions Will Deacon
2011-10-28 22:08 ` [PATCH 00/51] Remove inline arch_reset definitions from system.h Deepak Saxena
2011-10-28 22:14 ` Deepak Saxena
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=1319813059-8914-3-git-send-email-will.deacon@arm.com \
--to=will.deacon@arm.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).