From patchwork Thu Jun 25 08:57:39 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 6672681 Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id EAD02C05AC for ; Thu, 25 Jun 2015 08:54:51 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0B18020528 for ; Thu, 25 Jun 2015 08:54:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 05F0020520 for ; Thu, 25 Jun 2015 08:54:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751540AbbFYIyt (ORCPT ); Thu, 25 Jun 2015 04:54:49 -0400 Received: from mail-pa0-f42.google.com ([209.85.220.42]:33304 "EHLO mail-pa0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751117AbbFYIys (ORCPT ); Thu, 25 Jun 2015 04:54:48 -0400 Received: by padev16 with SMTP id ev16so46169965pad.0 for ; Thu, 25 Jun 2015 01:54:48 -0700 (PDT) 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=kr2q6XObfQScTZ4Vjw8V6YCQUzrI4+oDjHH76z0l7zY=; b=UU98kIRdeX1nYrQTPR51cS/uUTGmdTJGSFDn0xuElB8FF25QGrlnE6h7F8i6kbBNk4 AMakIPoCfnuTuMnhA1+bGZI77GI6r602FN/UsDhcZPQgkgsdb56Q/KwnT4u7Ci33L5GU hSYWkkztR+B+qoXd0tjKRFzYb3p/HnR80KvZGBkTogj5aL/2mfSJhSno39Um9l2RAYGn EGTyrIr9ljauEvxbhOSlYROc3m7MfYcs3zAQAiwHxDU7duVda0uxHLMLdWX3WxC/Te7q Zu9muUQUZUNZwVUFwpWBLXkLmTJi7Xrf8niib+aXshI6uB5JAAXAb1KGWzEYgjL1eTfY UqjQ== X-Received: by 10.70.40.164 with SMTP id y4mr89012773pdk.25.1435222488396; Thu, 25 Jun 2015 01:54:48 -0700 (PDT) Received: from [127.0.0.1] (s214090.ppp.asahi-net.or.jp. [220.157.214.90]) by mx.google.com with ESMTPSA id tj8sm29442452pab.30.2015.06.25.01.54.44 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 25 Jun 2015 01:54:46 -0700 (PDT) From: Magnus Damm To: linux-sh@vger.kernel.org Cc: Magnus Damm , horms@verge.net.au, laurent.pinchart+renesas@ideasonboard.com, geert+renesas@glider.be Date: Thu, 25 Jun 2015 17:57:39 +0900 Message-Id: <20150625085739.24543.79535.sendpatchset@little-apple> In-Reply-To: <20150625085716.24543.84444.sendpatchset@little-apple> References: <20150625085716.24543.84444.sendpatchset@little-apple> Subject: [PATCH v2 02/06] ARM: shmobile: r8a7779: Generic CCF and timer 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=-8.2 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, 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 Add a r8a7779-specific callback to initialize CCF and clocksources. With this in place we are one step closer to be able to use r8a7779 without C board code. Also add a multiplatform wrapper to avoid breaking the r8a7779 marzen legacy case. Signed-off-by: Magnus Damm Acked-by: Geert Uytterhoeven --- Changes since V1: - Added multiplatform wrapper to build with legacy_defconfig arch/arm/mach-shmobile/setup-r8a7779.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) -- 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/setup-r8a7779.c +++ work/arch/arm/mach-shmobile/setup-r8a7779.c 2015-06-25 17:29:28.012366518 +0900 @@ -14,6 +14,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. */ +#include +#include #include #include #include @@ -756,6 +758,14 @@ u32 __init r8a7779_read_mode_pins(void) return mode; } +#ifdef CONFIG_ARCH_SHMOBILE_MULTI + +static void __init r8a7779_init_time(void) +{ + r8a7779_clocks_init(r8a7779_read_mode_pins()); + clocksource_of_init(); +} + static const char *r8a7779_compat_dt[] __initdata = { "renesas,r8a7779", NULL, @@ -764,8 +774,10 @@ static const char *r8a7779_compat_dt[] _ DT_MACHINE_START(R8A7779_DT, "Generic R8A7779 (Flattened Device Tree)") .map_io = r8a7779_map_io, .init_early = shmobile_init_delay, + .init_time = r8a7779_init_time, .init_irq = r8a7779_init_irq_dt, .init_late = shmobile_init_late, .dt_compat = r8a7779_compat_dt, MACHINE_END +#endif /* CONFIG_ARCH_SHMOBILE_MULTI */ #endif /* CONFIG_USE_OF */