From patchwork Thu Nov 20 16:21:35 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulrich Hecht X-Patchwork-Id: 5349451 X-Patchwork-Delegate: horms@verge.net.au 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 D48B1C11AC for ; Thu, 20 Nov 2014 16:23:01 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E615F20251 for ; Thu, 20 Nov 2014 16:23:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 00C5B2021B for ; Thu, 20 Nov 2014 16:23:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757845AbaKTQW6 (ORCPT ); Thu, 20 Nov 2014 11:22:58 -0500 Received: from mail-wg0-f41.google.com ([74.125.82.41]:42892 "EHLO mail-wg0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757678AbaKTQVz (ORCPT ); Thu, 20 Nov 2014 11:21:55 -0500 Received: by mail-wg0-f41.google.com with SMTP id y19so4171356wgg.14 for ; Thu, 20 Nov 2014 08:21:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=LWEg9J7rEs0Zp7/BNzGZxUlipj+J/ys0+aMoY5iMuJ4=; b=j+eVlz4ze2/rtsjDbGc13Dfi/+fl6+elirx8IvwUsWqkMf7QHA/oMU1jrFP2zj8VwX uMq/A00qiOmw84nu1RC6pOEPVsKST2iGCw0w7bnw3YgtiKM6etKE7Znj9muCeJycSuLq Jrwl79Tr9OBe8TnXn/RXfFESEwt2wSlCkEFeGX022DsPEhJYNA/7W0gLpIwBl5GOUHyd cuhaQWyXKVRZkoechLfCOmYmNPzx0FNslJxTtIyYMXxDqwL0Bm3ptmMCP0Bx9Lu2cRkE utH10yboLvN16NmY0g+Nzq0MVwSNDve22wl5J887mhGP2tC+iO/AYsLTGNmVrXn2dvUM f5BA== X-Received: by 10.180.188.69 with SMTP id fy5mr17142411wic.57.1416500514665; Thu, 20 Nov 2014 08:21:54 -0800 (PST) Received: from groucho.site (ipbcc06129.dynamic.kabel-deutschland.de. [188.192.97.41]) by mx.google.com with ESMTPSA id gy4sm4731789wib.11.2014.11.20.08.21.52 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 20 Nov 2014 08:21:53 -0800 (PST) From: Ulrich Hecht To: mturquette@linaro.org, geert@linux-m68k.org Cc: horms@verge.net.au, linux-sh@vger.kernel.org, magnus.damm@gmail.com, laurent.pinchart+renesas@ideasonboard.com, Ulrich Hecht Subject: [PATCH v2 5/6] ARM: shmobile: ape6evm: disable legacy clock initialization Date: Thu, 20 Nov 2014 17:21:35 +0100 Message-Id: <1416500496-21024-6-git-send-email-ulrich.hecht+renesas@gmail.com> X-Mailer: git-send-email 1.8.4.5 In-Reply-To: <1416500496-21024-1-git-send-email-ulrich.hecht+renesas@gmail.com> References: <1416500496-21024-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.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 Disables r8a73a4_clock_init() if CCF is enabled. Signed-off-by: Ulrich Hecht --- arch/arm/mach-shmobile/board-ape6evm-reference.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-shmobile/board-ape6evm-reference.c b/arch/arm/mach-shmobile/board-ape6evm-reference.c index 3b68370..dd5bc63 100644 --- a/arch/arm/mach-shmobile/board-ape6evm-reference.c +++ b/arch/arm/mach-shmobile/board-ape6evm-reference.c @@ -29,7 +29,7 @@ static void __init ape6evm_add_standard_devices(void) { - +#ifndef CONFIG_COMMON_CLK struct clk *parent; struct clk *mp; @@ -43,6 +43,7 @@ static void __init ape6evm_add_standard_devices(void) clk_set_parent(mp, parent); clk_put(parent); clk_put(mp); +#endif of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); }