From patchwork Tue May 6 14:23:52 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulrich Hecht X-Patchwork-Id: 4122181 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.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id A5895BFF02 for ; Tue, 6 May 2014 14:23:46 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B4B94201FB for ; Tue, 6 May 2014 14:23:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CA51220212 for ; Tue, 6 May 2014 14:23:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756765AbaEFOXl (ORCPT ); Tue, 6 May 2014 10:23:41 -0400 Received: from mail-ee0-f53.google.com ([74.125.83.53]:61593 "EHLO mail-ee0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752540AbaEFOXk (ORCPT ); Tue, 6 May 2014 10:23:40 -0400 Received: by mail-ee0-f53.google.com with SMTP id c13so775527eek.40 for ; Tue, 06 May 2014 07:23:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=xRp64VQgIp6rRg7yubETo/yYHNHoVhZ6uITRVrwqS18=; b=SFpNEEHX0FmfDIm6BUodaUvirDdwfXkymL8kb3jlSUMiKroSdXJ0r7JZw76mG7qUnS AVDxTKvWm4jVUBZo4yTqGz7SF029PEHcj7qSqwIMKqt4/XDyfTB/6VsGPA6soHd8cxCq kdusfZkFceGfHEObOLPJ0H4z2Z6OATpC9MZrD7c8eVai2Cx3p3Y01plRweIpCoXMXAeT 8hukVzf0DZ1qn8XeF20D9nLhDhh2tRj+/C+EDPy/6lqXScCXz2xZSoL+brHZR8GO+htR 2qN8aaLbbUqtHqmonyBses05ModxTNLO10xpwQ5zhqo5VpT9D122ln0cbjAYQWIeWtY8 fexw== X-Received: by 10.14.104.132 with SMTP id i4mr10190400eeg.77.1399386219643; Tue, 06 May 2014 07:23:39 -0700 (PDT) Received: from groucho.site (tsn85-159-236-209.dyn.nltelcom.net. [85.159.236.209]) by mx.google.com with ESMTPSA id m44sm12615505eeh.14.2014.05.06.07.23.38 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 May 2014 07:23:39 -0700 (PDT) X-Google-Original-From: Ulrich Hecht From: Ulrich Hecht To: linux-sh@vger.kernel.org, laurent.pinchart@ideasonboard.com, horms@verge.net.au Cc: magnus.damm@gmail.com, Ulrich Hecht Subject: [PATCH 5/6] ARM: shmobile: sh73a0: common clock framework board support Date: Tue, 6 May 2014 16:23:52 +0200 Message-Id: <1399386233-11928-6-git-send-email-ulrich.hecht+renesas@gmail.com> X-Mailer: git-send-email 1.8.4.5 In-Reply-To: <1399386233-11928-1-git-send-email-ulrich.hecht+renesas@gmail.com> References: <1399386233-11928-1-git-send-email-ulrich.hecht+renesas@gmail.com> 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.3 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,URI_HEX 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 Adds support for the common clock framework to the KZM9G reference board and SH73A0 SoC setup code. Signed-off-by: Ulrich Hecht --- arch/arm/mach-shmobile/board-kzm9g-reference.c | 25 +++++++++++++++++++++++++ arch/arm/mach-shmobile/setup-sh73a0.c | 5 ++++- 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-shmobile/board-kzm9g-reference.c b/arch/arm/mach-shmobile/board-kzm9g-reference.c index 598e324..2ca37b8 100644 --- a/arch/arm/mach-shmobile/board-kzm9g-reference.c +++ b/arch/arm/mach-shmobile/board-kzm9g-reference.c @@ -26,13 +26,38 @@ #include #include #include +#include #include #include #include #include +#ifdef CONFIG_COMMON_CLK +static const struct clk_name clk_names[] __initconst = { + { "cmt1", NULL, "sh_cmt.10" }, + { "scifa0", NULL, "sh-sci.0" }, + { "scifa1", NULL, "sh-sci.1" }, + { "scifa2", NULL, "sh-sci.2" }, + { "scifa3", NULL, "sh-sci.3" }, + { "scifa4", NULL, "sh-sci.4" }, + { "scifa5", NULL, "sh-sci.5" }, + { "scifa6", NULL, "sh-sci.6" }, + { "scifa7", NULL, "sh-sci.7" }, + { "scifb", NULL, "sh-sci.8" }, + { "sdhi0", NULL, "ee100000.sd" }, + { "sdhi1", NULL, "ee120000.sd" }, + { "sdhi2", NULL, "ee140000.sd" }, + { "mmcif0", NULL, "e6bd0000.mmc" }, + { "iic0", NULL, "e6820000.i2c" }, + { "iic3", NULL, "e6826000.i2c" }, +}; +#endif + static void __init kzm_init(void) { +#ifdef CONFIG_COMMON_CLK + shmobile_clk_workaround(clk_names, ARRAY_SIZE(clk_names), false); +#endif sh73a0_add_standard_devices_dt(); #ifdef CONFIG_CACHE_L2X0 diff --git a/arch/arm/mach-shmobile/setup-sh73a0.c b/arch/arm/mach-shmobile/setup-sh73a0.c index f74ab53..12a007a 100644 --- a/arch/arm/mach-shmobile/setup-sh73a0.c +++ b/arch/arm/mach-shmobile/setup-sh73a0.c @@ -796,7 +796,9 @@ void __init __weak sh73a0_register_twd(void) { } void __init sh73a0_earlytimer_init(void) { sh73a0_init_delay(); +#ifndef CONFIG_COMMON_CLK sh73a0_clock_init(); +#endif shmobile_earlytimer_init(); sh73a0_register_twd(); } @@ -819,8 +821,9 @@ void __init sh73a0_add_standard_devices_dt(void) struct platform_device_info devinfo = { .name = "cpufreq-cpu0", .id = -1, }; /* clocks are setup late during boot in the case of DT */ +#ifndef CONFIG_COMMON_CLK sh73a0_clock_init(); - +#endif platform_add_devices(sh73a0_devices_dt, ARRAY_SIZE(sh73a0_devices_dt)); of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);