From patchwork Wed Mar 6 00:22:33 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 2222561 Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 76F613FCF2 for ; Wed, 6 Mar 2013 00:16:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752733Ab3CFAQq (ORCPT ); Tue, 5 Mar 2013 19:16:46 -0500 Received: from mail-pb0-f53.google.com ([209.85.160.53]:51605 "EHLO mail-pb0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752561Ab3CFAQp (ORCPT ); Tue, 5 Mar 2013 19:16:45 -0500 Received: by mail-pb0-f53.google.com with SMTP id un1so5157513pbc.26 for ; Tue, 05 Mar 2013 16:16:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:date:message-id:in-reply-to:references :subject; bh=rUiZz8n07KGY9Ehonf66CR8nHsRVvyISeBaRKFSYn6E=; b=Q+U0qTx/n9+ur1VJz9ImqLXo2Vv4bDOhOt1RoEfQ7EhGjIpWOEVSnno6uYuaeByu31 Rj3AZXu2HeAyhgNPWd1hoNsLoc63xhwabTNV3uw/Sy79Xn/IvUon3uXFP7opTnUiIYd+ Wn4sPSnxTBm4iniUka3SuGxDhML08g2UMuFLV5OJFdvipS9iKC53vOX4QbTg+EPawT5Y fLrZVIxP23JD3W+TgC+4Pp3tibGB0Eb7pdtrAmkJCxdHN5SIZsTsBHEvwh4eCiZm82y3 GwsGAp1aZ4YqRQc7ZshlhKqkP17XE7JTL3Dcbr+bcihN0yjh1HinQRgnJUbehKw7t5Iq JSvA== X-Received: by 10.68.234.100 with SMTP id ud4mr40680369pbc.8.1362529005296; Tue, 05 Mar 2013 16:16:45 -0800 (PST) Received: from [127.0.0.1] (FL1-122-135-132-124.tky.mesh.ad.jp. [122.135.132.124]) by mx.google.com with ESMTPS id gf6sm28740676pbc.24.2013.03.05.16.16.42 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 05 Mar 2013 16:16:44 -0800 (PST) From: Magnus Damm To: linux-sh@vger.kernel.org Cc: Magnus Damm , horms@verge.net.au, linux-arm-kernel@lists.infradead.org Date: Wed, 06 Mar 2013 09:22:33 +0900 Message-Id: <20130306002233.5430.86.sendpatchset@w520> In-Reply-To: <20130306002214.5430.43766.sendpatchset@w520> References: <20130306002214.5430.43766.sendpatchset@w520> Subject: [PATCH 02/04] ARM: shmobile: Add EMEV2 specific timer_init Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org From: Magnus Damm Add a emev2_timer_init() function to the EMEV2 setup code. This is preparation work for EMEV2 TWD support. To allow registration of the TWD driver from the ->timer_init() callback the init code for EMEV2 clocks is from ->init_machine() to ->init_time(). This affects EMEV2 clock init order on the KZM9D board but leaves the generic EMEV2 DT case as-is due to no setup code for clocks in the DT case. Signed-off-by: Magnus Damm --- arch/arm/mach-shmobile/board-kzm9d.c | 2 +- arch/arm/mach-shmobile/include/mach/emev2.h | 1 + arch/arm/mach-shmobile/setup-emev2.c | 8 ++++++-- 3 files changed, 8 insertions(+), 3 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html --- 0001/arch/arm/mach-shmobile/board-kzm9d.c +++ work/arch/arm/mach-shmobile/board-kzm9d.c 2013-03-05 18:31:45.000000000 +0900 @@ -90,6 +90,6 @@ DT_MACHINE_START(KZM9D_DT, "kzm9d") .init_irq = emev2_init_irq, .init_machine = kzm9d_add_standard_devices, .init_late = shmobile_init_late, - .init_time = shmobile_timer_init, + .init_time = emev2_timer_init, .dt_compat = kzm9d_boards_compat_dt, MACHINE_END --- 0001/arch/arm/mach-shmobile/include/mach/emev2.h +++ work/arch/arm/mach-shmobile/include/mach/emev2.h 2013-03-05 18:31:45.000000000 +0900 @@ -5,6 +5,7 @@ extern void emev2_map_io(void); extern void emev2_init_irq(void); extern void emev2_add_early_devices(void); extern void emev2_add_standard_devices(void); +extern void emev2_timer_init(void); extern void emev2_clock_init(void); extern void emev2_set_boot_vector(unsigned long value); --- 0004/arch/arm/mach-shmobile/setup-emev2.c +++ work/arch/arm/mach-shmobile/setup-emev2.c 2013-03-05 18:34:09.000000000 +0900 @@ -395,8 +395,6 @@ static struct platform_device *emev2_lat void __init emev2_add_standard_devices(void) { - emev2_clock_init(); - platform_add_devices(emev2_early_devices, ARRAY_SIZE(emev2_early_devices)); @@ -404,6 +402,12 @@ void __init emev2_add_standard_devices(v ARRAY_SIZE(emev2_late_devices)); } +void __init emev2_timer_init(void) +{ + emev2_clock_init(); + shmobile_timer_init(); +} + static void __init emev2_init_delay(void) { shmobile_setup_delay(533, 1, 3); /* Cortex-A9 @ 533MHz */