From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932358AbbAOWAI (ORCPT ); Thu, 15 Jan 2015 17:00:08 -0500 Received: from down.free-electrons.com ([37.187.137.238]:57609 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932332AbbAOWAC (ORCPT ); Thu, 15 Jan 2015 17:00:02 -0500 From: Alexandre Belloni To: Nicolas Ferre Cc: Jean-Christophe Plagniol-Villard , Arnd Bergmann , Boris Brezillon , Bo Shen , Wenyou Yang , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Alexandre Belloni Subject: [PATCH 12/17] ARM: at91: rework initialization for rm9200 based boards Date: Thu, 15 Jan 2015 22:58:15 +0100 Message-Id: <1421359100-8930-13-git-send-email-alexandre.belloni@free-electrons.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1421359100-8930-1-git-send-email-alexandre.belloni@free-electrons.com> References: <1421359100-8930-1-git-send-email-alexandre.belloni@free-electrons.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Remove useless .map_io and .init_early by moving at91_dt_initialize() to rm9200_dt_device_init(). Signed-off-by: Alexandre Belloni --- arch/arm/mach-at91/at91rm9200.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/arch/arm/mach-at91/at91rm9200.c b/arch/arm/mach-at91/at91rm9200.c index a3c0dd612d77..6992cc9ce902 100644 --- a/arch/arm/mach-at91/at91rm9200.c +++ b/arch/arm/mach-at91/at91rm9200.c @@ -8,21 +8,12 @@ * * Licensed under GPLv2 or later. */ -#include -#include -#include -#include #include -#include #include #include -#include -#include -#include +#include #include -#include -#include #include #include @@ -30,7 +21,6 @@ #include "generic.h" - static void at91rm9200_restart(enum reboot_mode reboot_mode, const char *cmd) { /* @@ -51,6 +41,7 @@ static void __init rm9200_dt_device_init(void) arm_pm_idle = at91rm9200_idle; arm_pm_restart = at91rm9200_restart; at91_rm9200_pm_init(); + at91_dt_initialize(); of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); } @@ -62,8 +53,6 @@ static const char *at91rm9200_dt_board_compat[] __initdata = { DT_MACHINE_START(at91rm9200_dt, "Atmel AT91RM9200 (Device Tree)") .init_time = at91rm9200_dt_timer_init, - .map_io = at91_map_io, - .init_early = at91_dt_initialize, .init_machine = rm9200_dt_device_init, .dt_compat = at91rm9200_dt_board_compat, MACHINE_END -- 2.1.0