From patchwork Wed Dec 17 09:42:34 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 5505921 X-Patchwork-Delegate: horms@verge.net.au Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 691F79F30B for ; Wed, 17 Dec 2014 09:39:53 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 89440209EA for ; Wed, 17 Dec 2014 09:39:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9788C209CF for ; Wed, 17 Dec 2014 09:39:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751841AbaLQJjv (ORCPT ); Wed, 17 Dec 2014 04:39:51 -0500 Received: from mail-pa0-f45.google.com ([209.85.220.45]:37014 "EHLO mail-pa0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750995AbaLQJju (ORCPT ); Wed, 17 Dec 2014 04:39:50 -0500 Received: by mail-pa0-f45.google.com with SMTP id lf10so15420518pab.18 for ; Wed, 17 Dec 2014 01:39:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:date:message-id:in-reply-to:references:subject; bh=1wdDlRZ0dxlS6Ij2DDy3WmAHhOOEGz9VP+aV+DC54oc=; b=IZ/Up1xvpO0DkdQ/SxfWWrJ7sEVWReDRr/nXqXEtWqRsQ6xIuFpIegLafnV8v1gozF N0ZvDq+En1Z/l3VFbDkHfK0DHj8xlbj+gNhPN+Oo8rK/VTCaGZv6u4u9SMNMAF+OS3+t cECeZvzgqY4MbSajjVuQceAO/16crZu+Fj94k/Xjouel1tteQYGHFfBqHqpVlBOG1j7T 8j2CPfKVaIJsfayuPzxakzV2XDDKqv7vYXiUlYjWwRXOwxbHvY19IqPINFxF7amlmqhu e4QGsLgP85UBZj+S7EiBRfZPLKgw1l4musLGeK6rx7ZJ1rHG2d3ST/7Psy8O+CnnyR6E hEEg== X-Received: by 10.66.224.201 with SMTP id re9mr10453095pac.138.1418809189607; Wed, 17 Dec 2014 01:39:49 -0800 (PST) Received: from [127.0.0.1] (s214090.ppp.asahi-net.or.jp. [220.157.214.90]) by mx.google.com with ESMTPSA id hx9sm3371976pad.38.2014.12.17.01.39.46 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 17 Dec 2014 01:39:48 -0800 (PST) From: Magnus Damm To: linux-sh@vger.kernel.org Cc: ulrich.hecht+renesas@gmail.com, Magnus Damm , horms@verge.net.au, geert+renesas@glider.be Date: Wed, 17 Dec 2014 18:42:34 +0900 Message-Id: <20141217094234.7039.79623.sendpatchset@w520> In-Reply-To: <20141217094204.7039.45337.sendpatchset@w520> References: <20141217094204.7039.45337.sendpatchset@w520> Subject: [PATCH v2 03/05] ARM: shmobile: sh73a0: Add Multiplatform support Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Magnus Damm Enable sh73a0 Multiplatform support for the generic sh73a0 machine vector. No board support is enabled, and the board code for KZM9G DT Reference is left by itself. Signed-off-by: Magnus Damm --- arch/arm/mach-shmobile/Kconfig | 5 +++++ arch/arm/mach-shmobile/Makefile | 4 ++-- arch/arm/mach-shmobile/setup-sh73a0.c | 5 ++++- arch/arm/mach-shmobile/smp-sh73a0.c | 2 +- 4 files changed, 12 insertions(+), 4 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/Kconfig +++ work/arch/arm/mach-shmobile/Kconfig 2014-12-16 19:11:36.000000000 +0900 @@ -52,6 +52,11 @@ config ARCH_R7S72100 bool "RZ/A1H (R7S72100)" select SYS_SUPPORTS_SH_MTU2 +config ARCH_SH73A0 + bool "SH-Mobile AG5 (R8A73A00)" + select ARCH_RMOBILE + select RENESAS_INTC_IRQPIN + config ARCH_R8A7740 bool "R-Mobile A1 (R8A77400)" select ARCH_RMOBILE --- 0001/arch/arm/mach-shmobile/Makefile +++ work/arch/arm/mach-shmobile/Makefile 2014-12-16 19:12:19.000000000 +0900 @@ -7,7 +7,7 @@ obj-y := timer.o console.o # CPU objects obj-$(CONFIG_ARCH_SH7372) += setup-sh7372.o intc-sh7372.o pm-sh7372.o -obj-$(CONFIG_ARCH_SH73A0) += setup-sh73a0.o intc-sh73a0.o pm-sh73a0.o +obj-$(CONFIG_ARCH_SH73A0) += setup-sh73a0.o pm-sh73a0.o obj-$(CONFIG_ARCH_R8A73A4) += setup-r8a73a4.o obj-$(CONFIG_ARCH_R8A7740) += setup-r8a7740.o pm-r8a7740.o obj-$(CONFIG_ARCH_R8A7778) += setup-r8a7778.o @@ -65,7 +65,7 @@ obj-$(CONFIG_MACH_BOCKW) += board-bockw. obj-$(CONFIG_MACH_BOCKW_REFERENCE) += board-bockw-reference.o obj-$(CONFIG_MACH_MARZEN) += board-marzen.o obj-$(CONFIG_MACH_ARMADILLO800EVA) += board-armadillo800eva.o -obj-$(CONFIG_MACH_KZM9G) += board-kzm9g.o +obj-$(CONFIG_MACH_KZM9G) += board-kzm9g.o intc-sh73a0.o obj-$(CONFIG_MACH_KZM9G_REFERENCE) += board-kzm9g-reference.o endif --- 0011/arch/arm/mach-shmobile/setup-sh73a0.c +++ work/arch/arm/mach-shmobile/setup-sh73a0.c 2014-12-16 19:13:33.000000000 +0900 @@ -764,7 +764,9 @@ void __init __weak sh73a0_register_twd(v void __init sh73a0_earlytimer_init(void) { shmobile_init_delay(); +#ifndef CONFIG_COMMON_CLK sh73a0_clock_init(); +#endif shmobile_earlytimer_init(); sh73a0_register_twd(); } @@ -780,9 +782,10 @@ void __init sh73a0_add_early_devices(voi void __init sh73a0_add_standard_devices_dt(void) { +#ifndef CONFIG_COMMON_CLK /* clocks are setup late during boot in the case of DT */ sh73a0_clock_init(); - +#endif of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); } --- 0001/arch/arm/mach-shmobile/smp-sh73a0.c +++ work/arch/arm/mach-shmobile/smp-sh73a0.c 2014-12-16 19:15:10.000000000 +0900 @@ -33,7 +33,7 @@ #define SH73A0_SCU_BASE 0xf0000000 -#ifdef CONFIG_HAVE_ARM_TWD +#if defined(CONFIG_HAVE_ARM_TWD) && !defined(CONFIG_ARCH_MULTIPLATFORM) static DEFINE_TWD_LOCAL_TIMER(twd_local_timer, SH73A0_SCU_BASE + 0x600, 29); void __init sh73a0_register_twd(void) {