From: Arnd Bergmann <arnd@arndb.de> To: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org, Jason Cooper <jason@lakedaemon.net>, Andrew Lunn <andrew@lunn.ch>, Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>, Gregory Clement <gregory.clement@free-electrons.com>, Russell King <linux@arm.linux.org.uk>, Arnd Bergmann <arnd@arndb.de> Subject: [PATCH 1/5] ARM: orion: move watchdog setup to mach-orion5x Date: Wed, 25 Nov 2015 16:49:13 +0100 [thread overview] Message-ID: <1448466557-435335-2-git-send-email-arnd@arndb.de> (raw) In-Reply-To: <1448466557-435335-1-git-send-email-arnd@arndb.de> The watchdog device node is created in plat-orion/common.c but depends on the bridge address that is platform specific, so as a preparation for orion multiplatform support, we should move it out of the common code into orion5x. The other two users of plat-orion currently do not support the watchdog device, so this is not a problem. Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- arch/arm/mach-orion5x/common.c | 14 +++++++++++++- arch/arm/plat-orion/common.c | 21 --------------------- arch/arm/plat-orion/include/plat/common.h | 2 -- 3 files changed, 13 insertions(+), 24 deletions(-) diff --git a/arch/arm/mach-orion5x/common.c b/arch/arm/mach-orion5x/common.c index 6bbb7b55c6d1..2b7889e3b7bc 100644 --- a/arch/arm/mach-orion5x/common.c +++ b/arch/arm/mach-orion5x/common.c @@ -184,9 +184,21 @@ static void __init orion5x_crypto_init(void) /***************************************************************************** * Watchdog ****************************************************************************/ +static struct resource orion_wdt_resource[] = { + DEFINE_RES_MEM(TIMER_PHYS_BASE, 0x04), + DEFINE_RES_MEM(RSTOUTn_MASK_PHYS, 0x04), +}; + +static struct platform_device orion_wdt_device = { + .name = "orion_wdt", + .id = -1, + .num_resources = ARRAY_SIZE(orion_wdt_resource), + .resource = orion_wdt_resource, +}; + static void __init orion5x_wdt_init(void) { - orion_wdt_init(); + platform_device_register(&orion_wdt_device); } diff --git a/arch/arm/plat-orion/common.c b/arch/arm/plat-orion/common.c index 8861c367d061..78c8bf4043c0 100644 --- a/arch/arm/plat-orion/common.c +++ b/arch/arm/plat-orion/common.c @@ -21,7 +21,6 @@ #include <net/dsa.h> #include <linux/platform_data/dma-mv_xor.h> #include <linux/platform_data/usb-ehci-orion.h> -#include <mach/bridge-regs.h> #include <plat/common.h> /* Create a clkdev entry for a given device/clk */ @@ -589,26 +588,6 @@ void __init orion_spi_1_init(unsigned long mapbase) } /***************************************************************************** - * Watchdog - ****************************************************************************/ -static struct resource orion_wdt_resource[] = { - DEFINE_RES_MEM(TIMER_PHYS_BASE, 0x04), - DEFINE_RES_MEM(RSTOUTn_MASK_PHYS, 0x04), -}; - -static struct platform_device orion_wdt_device = { - .name = "orion_wdt", - .id = -1, - .num_resources = ARRAY_SIZE(orion_wdt_resource), - .resource = orion_wdt_resource, -}; - -void __init orion_wdt_init(void) -{ - platform_device_register(&orion_wdt_device); -} - -/***************************************************************************** * XOR ****************************************************************************/ static u64 orion_xor_dmamask = DMA_BIT_MASK(32); diff --git a/arch/arm/plat-orion/include/plat/common.h b/arch/arm/plat-orion/include/plat/common.h index d9a24f605a2b..9e6d76ad48a9 100644 --- a/arch/arm/plat-orion/include/plat/common.h +++ b/arch/arm/plat-orion/include/plat/common.h @@ -75,8 +75,6 @@ void __init orion_spi_init(unsigned long mapbase); void __init orion_spi_1_init(unsigned long mapbase); -void __init orion_wdt_init(void); - void __init orion_xor0_init(unsigned long mapbase_low, unsigned long mapbase_high, unsigned long irq_0, -- 2.1.0.rc2
WARNING: multiple messages have this Message-ID (diff)
From: arnd@arndb.de (Arnd Bergmann) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 1/5] ARM: orion: move watchdog setup to mach-orion5x Date: Wed, 25 Nov 2015 16:49:13 +0100 [thread overview] Message-ID: <1448466557-435335-2-git-send-email-arnd@arndb.de> (raw) In-Reply-To: <1448466557-435335-1-git-send-email-arnd@arndb.de> The watchdog device node is created in plat-orion/common.c but depends on the bridge address that is platform specific, so as a preparation for orion multiplatform support, we should move it out of the common code into orion5x. The other two users of plat-orion currently do not support the watchdog device, so this is not a problem. Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- arch/arm/mach-orion5x/common.c | 14 +++++++++++++- arch/arm/plat-orion/common.c | 21 --------------------- arch/arm/plat-orion/include/plat/common.h | 2 -- 3 files changed, 13 insertions(+), 24 deletions(-) diff --git a/arch/arm/mach-orion5x/common.c b/arch/arm/mach-orion5x/common.c index 6bbb7b55c6d1..2b7889e3b7bc 100644 --- a/arch/arm/mach-orion5x/common.c +++ b/arch/arm/mach-orion5x/common.c @@ -184,9 +184,21 @@ static void __init orion5x_crypto_init(void) /***************************************************************************** * Watchdog ****************************************************************************/ +static struct resource orion_wdt_resource[] = { + DEFINE_RES_MEM(TIMER_PHYS_BASE, 0x04), + DEFINE_RES_MEM(RSTOUTn_MASK_PHYS, 0x04), +}; + +static struct platform_device orion_wdt_device = { + .name = "orion_wdt", + .id = -1, + .num_resources = ARRAY_SIZE(orion_wdt_resource), + .resource = orion_wdt_resource, +}; + static void __init orion5x_wdt_init(void) { - orion_wdt_init(); + platform_device_register(&orion_wdt_device); } diff --git a/arch/arm/plat-orion/common.c b/arch/arm/plat-orion/common.c index 8861c367d061..78c8bf4043c0 100644 --- a/arch/arm/plat-orion/common.c +++ b/arch/arm/plat-orion/common.c @@ -21,7 +21,6 @@ #include <net/dsa.h> #include <linux/platform_data/dma-mv_xor.h> #include <linux/platform_data/usb-ehci-orion.h> -#include <mach/bridge-regs.h> #include <plat/common.h> /* Create a clkdev entry for a given device/clk */ @@ -589,26 +588,6 @@ void __init orion_spi_1_init(unsigned long mapbase) } /***************************************************************************** - * Watchdog - ****************************************************************************/ -static struct resource orion_wdt_resource[] = { - DEFINE_RES_MEM(TIMER_PHYS_BASE, 0x04), - DEFINE_RES_MEM(RSTOUTn_MASK_PHYS, 0x04), -}; - -static struct platform_device orion_wdt_device = { - .name = "orion_wdt", - .id = -1, - .num_resources = ARRAY_SIZE(orion_wdt_resource), - .resource = orion_wdt_resource, -}; - -void __init orion_wdt_init(void) -{ - platform_device_register(&orion_wdt_device); -} - -/***************************************************************************** * XOR ****************************************************************************/ static u64 orion_xor_dmamask = DMA_BIT_MASK(32); diff --git a/arch/arm/plat-orion/include/plat/common.h b/arch/arm/plat-orion/include/plat/common.h index d9a24f605a2b..9e6d76ad48a9 100644 --- a/arch/arm/plat-orion/include/plat/common.h +++ b/arch/arm/plat-orion/include/plat/common.h @@ -75,8 +75,6 @@ void __init orion_spi_init(unsigned long mapbase); void __init orion_spi_1_init(unsigned long mapbase); -void __init orion_wdt_init(void); - void __init orion_xor0_init(unsigned long mapbase_low, unsigned long mapbase_high, unsigned long irq_0, -- 2.1.0.rc2
next prev parent reply other threads:[~2015-11-25 15:50 UTC|newest] Thread overview: 107+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-11-25 15:49 [PATCH 0/5] ARM: orion5x/dove/mv78xx0 multiplatform Arnd Bergmann 2015-11-25 15:49 ` Arnd Bergmann 2015-11-25 15:49 ` Arnd Bergmann [this message] 2015-11-25 15:49 ` [PATCH 1/5] ARM: orion: move watchdog setup to mach-orion5x Arnd Bergmann 2015-11-25 15:49 ` [PATCH 2/5] ARM: orion: always use MULTI_IRQ_HANDLER Arnd Bergmann 2015-11-25 15:49 ` Arnd Bergmann 2015-11-25 15:49 ` [PATCH 3/5] ARM: orion: use SPARSE_IRQ everywhere Arnd Bergmann 2015-11-25 15:49 ` Arnd Bergmann 2015-11-25 15:49 ` [PATCH 4/5] ARM: orion: clean up mach/*.h headers Arnd Bergmann 2015-11-25 15:49 ` Arnd Bergmann 2015-11-25 15:49 ` [PATCH 5/5] ARM: orion: multiplatform support Arnd Bergmann 2015-11-25 15:49 ` Arnd Bergmann 2015-11-25 16:09 ` [PATCH 0/5] ARM: orion5x/dove/mv78xx0 multiplatform Andrew Lunn 2015-11-25 16:09 ` Andrew Lunn 2015-11-25 17:34 ` Gregory CLEMENT 2015-11-25 17:34 ` Gregory CLEMENT 2015-11-25 17:44 ` Andrew Lunn 2015-11-25 17:44 ` Andrew Lunn 2015-11-25 19:58 ` Arnd Bergmann 2015-11-25 19:58 ` Arnd Bergmann 2015-11-26 14:50 ` Jason Cooper 2015-11-26 14:50 ` Jason Cooper 2015-11-25 18:37 ` Russell King - ARM Linux 2015-11-25 18:37 ` Russell King - ARM Linux 2015-11-25 19:16 ` Andrew Lunn 2015-11-25 19:16 ` Andrew Lunn 2015-11-25 19:29 ` Russell King - ARM Linux 2015-11-25 19:29 ` Russell King - ARM Linux 2015-11-25 23:19 ` Russell King - ARM Linux 2015-11-25 23:19 ` Russell King - ARM Linux 2015-11-25 20:05 ` Arnd Bergmann 2015-11-25 20:05 ` Arnd Bergmann 2015-11-25 22:47 ` Russell King - ARM Linux 2015-11-25 22:47 ` Russell King - ARM Linux 2015-11-25 20:14 ` Andrew Lunn 2015-11-25 20:14 ` Andrew Lunn 2015-11-30 13:37 ` Gregory CLEMENT 2015-11-30 13:37 ` Gregory CLEMENT 2015-11-30 13:43 ` Gregory CLEMENT 2015-12-01 17:22 ` Detlef Vollmann 2015-12-02 11:08 ` Gregory CLEMENT 2015-12-02 14:55 ` Andrew Lunn 2015-12-02 14:55 ` Andrew Lunn 2015-12-10 12:56 ` Detlef Vollmann 2015-12-10 13:18 ` Arnd Bergmann 2015-12-10 13:18 ` Arnd Bergmann 2015-12-10 13:43 ` Arnd Bergmann 2015-12-10 13:43 ` Arnd Bergmann 2015-12-10 19:03 ` Detlef Vollmann 2015-12-10 20:59 ` Arnd Bergmann 2015-12-10 20:59 ` Arnd Bergmann 2015-12-10 21:14 ` Detlef Vollmann 2015-12-10 21:29 ` Arnd Bergmann 2015-12-10 21:29 ` Arnd Bergmann 2015-12-10 22:00 ` Detlef Vollmann 2015-12-10 23:10 ` Arnd Bergmann 2015-12-10 23:10 ` Arnd Bergmann 2015-12-11 13:36 ` Jason Cooper 2015-12-11 13:36 ` Jason Cooper 2015-12-11 14:46 ` Arnd Bergmann 2015-12-11 14:46 ` Arnd Bergmann 2015-12-11 14:55 ` Jason Cooper 2015-12-11 14:55 ` Jason Cooper 2015-12-11 22:41 ` Detlef Vollmann 2015-12-11 18:27 ` Josh Triplett 2015-12-11 18:27 ` Josh Triplett 2015-12-11 18:46 ` Jason Cooper 2015-12-11 18:46 ` Jason Cooper 2015-12-11 19:08 ` Josh Triplett 2015-12-11 19:08 ` Josh Triplett 2015-12-11 19:14 ` Jason Cooper 2015-12-11 19:14 ` Jason Cooper [not found] ` <5669808F.2050909@vollmann.ch> 2015-12-11 21:33 ` Arnd Bergmann 2015-12-11 21:33 ` Arnd Bergmann 2015-12-11 23:18 ` Detlef Vollmann 2015-12-01 22:51 ` Andrew Lunn 2015-12-01 22:51 ` Andrew Lunn 2015-12-01 22:55 ` Arnd Bergmann 2015-12-01 22:55 ` Arnd Bergmann 2015-12-02 11:03 ` Gregory CLEMENT 2015-12-02 11:03 ` Gregory CLEMENT 2015-12-02 12:33 ` Russell King - ARM Linux 2015-12-02 12:33 ` Russell King - ARM Linux 2015-12-02 15:49 ` Arnd Bergmann 2015-12-02 15:49 ` Arnd Bergmann 2015-12-02 19:28 ` Russell King - ARM Linux 2015-12-02 19:28 ` Russell King - ARM Linux 2015-12-02 19:37 ` Russell King - ARM Linux 2015-12-02 19:37 ` Russell King - ARM Linux 2015-12-02 19:54 ` Arnd Bergmann 2015-12-02 19:54 ` Arnd Bergmann 2015-12-02 19:51 ` Arnd Bergmann 2015-12-02 19:51 ` Arnd Bergmann 2015-12-02 20:22 ` Russell King - ARM Linux 2015-12-02 20:22 ` Russell King - ARM Linux 2015-12-02 20:38 ` Andrew Lunn 2015-12-02 20:38 ` Andrew Lunn 2015-12-02 21:03 ` Russell King - ARM Linux 2015-12-02 21:03 ` Russell King - ARM Linux 2015-12-02 21:15 ` Arnd Bergmann 2015-12-02 21:15 ` Arnd Bergmann 2015-12-02 23:59 ` Andrew Lunn 2015-12-02 23:59 ` Andrew Lunn -- strict thread matches above, loose matches on Subject: below -- 2015-03-02 20:36 [PATCH 0/5] ARM: orion5k/mv78xx0/dove multiplatform support Arnd Bergmann 2015-03-02 20:36 ` [PATCH 1/5] ARM: orion: move watchdog setup to mach-orion5x Arnd Bergmann 2015-03-02 21:33 ` Andrew Lunn 2015-03-02 21:49 ` Arnd Bergmann 2015-03-02 23:18 ` Russell King - ARM Linux
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=1448466557-435335-2-git-send-email-arnd@arndb.de \ --to=arnd@arndb.de \ --cc=andrew@lunn.ch \ --cc=gregory.clement@free-electrons.com \ --cc=jason@lakedaemon.net \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux@arm.linux.org.uk \ --cc=sebastian.hesselbarth@gmail.com \ /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: linkBe 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.