From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756875AbbLBV2B (ORCPT ); Wed, 2 Dec 2015 16:28:01 -0500 Received: from mout.kundenserver.de ([212.227.126.130]:56176 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756073AbbLBV1x (ORCPT ); Wed, 2 Dec 2015 16:27:53 -0500 From: Arnd Bergmann To: linux-arm-kernel@lists.infradead.org Cc: Andrew Lunn , Russell King , Jason Cooper , linux-kernel@vger.kernel.org, Gregory Clement , Sebastian Hesselbarth , Arnd Bergmann Subject: [PATCH 1/7] ARM: orion: move watchdog setup to mach-orion5x Date: Wed, 2 Dec 2015 22:27:03 +0100 Message-Id: <1449091629-2155735-2-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.1.0.rc2 In-Reply-To: <1449091629-2155735-1-git-send-email-arnd@arndb.de> References: <1449091629-2155735-1-git-send-email-arnd@arndb.de> X-Provags-ID: V03:K0:1LRman4CRCtomm99TiJ57hCS9DGijyMBuVcXCGF23HpsrJrFHpN JPrWbwBd4/psSv0DZgb4hI+0FIcEG21lx6O8U+1hB85LtBU0S56/6VoOMatifuIOz0X+X34 se00mP6LkUf/wcDQGHSCSc/6x/JSH9Qgq7Rky8pMc4MXQYtsLa2C2cOMry8+WJw52gnxwwJ GpTbddNDzasEwALJgR/MA== X-UI-Out-Filterresults: notjunk:1;V01:K0:IyNXKOg6VLc=:rIRKIE4KlmeS97Zl2tBrob g/x8dnospPQwJ0VInFrrj+6tT51E/aX5AA5qwPqYCsE/ZuDv14FWHyX01/gWDtr25j7wXqMkB fXUDxQe8O0hRrRSKne2+c5J8A7sSHPTcwH1U2NfGkPCJ+TIIw2FcloQeH5m5zaeM+8ErEAitc HwDQ1KgT/b2E1oHpGqYGLwCMUbfdqdjDcG10TCj8qYp9PWuC3ovREP7tsax7jLZYq0qbI16DF 80pkjzxyGkgtXLcHHEd5XxuIYCjCaijBYIa+3ORtqezdIpXxoCkbtm6GY7RTzafU39eOyv+jX Lpl22u8mC800IDPHl5OYV/iGNjoujbbPJucRdUEnx0j0NvwQKDIqvsYvpygXpoOYnPW18IdiB zDLAMbo169YZxCcRBKUj9v9gYTK6ukb0JBtQQZWHJatWsx9P1R/RZfZKwi44DxpDe4ksJ3YQD FelN9249UNGNbKI1mju1WyzOhDaaLjdnGNuXPTFUZfgMrcjjHu/QE5d3nCfI1qencVxAOm4Tl KIWsjULOkQ0MY6FQKdvlEqiRX4kz5WvovTVW6wN1lmlGthsUOnFqa6PXtNOwfpBdI3s49HXzR UjtbZfO1xMXG4Idjvf9DB8oRkLyxgw/jR+MQypUaBmqHWnOLONiWG/ABP12t8BC5hkzus/83I 8Uf7Yj/kO+iy9jpXZ2E/18UZsf0N2K4bG3Whj6LKNUBLGrG+GufQpGcsaQuViRuFpu4s= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 move it out of the common code into orion5x and dove. At the moment, dove does not use the watchdog, so I'm marking the function as __maybe_unused for the moment. The compiler will be able to compile out the device definition this way, and we can easily add it later. Signed-off-by: Arnd Bergmann Acked-by: Andrew Lunn --- arch/arm/mach-dove/common.c | 17 +++++++++++++++++ arch/arm/mach-orion5x/common.c | 14 +++++++++++++- arch/arm/plat-orion/common.c | 21 --------------------- arch/arm/plat-orion/include/plat/common.h | 2 -- 4 files changed, 30 insertions(+), 24 deletions(-) diff --git a/arch/arm/mach-dove/common.c b/arch/arm/mach-dove/common.c index 0d1a89298ece..25a682fd444f 100644 --- a/arch/arm/mach-dove/common.c +++ b/arch/arm/mach-dove/common.c @@ -375,6 +375,23 @@ void __init dove_setup_cpu_wins(void) DOVE_SCRATCHPAD_SIZE); } +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 __maybe_unused orion_wdt_init(void) +{ + platform_device_register(&orion_wdt_device); +} + void __init dove_init(void) { pr_info("Dove 88AP510 SoC, TCLK = %d MHz.\n", 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 #include #include -#include #include /* 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