Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754410Ab3JHFfj (ORCPT ); Tue, 8 Oct 2013 01:35:39 -0400 Received: from gw.cm.dream.jp ([59.157.128.2]:38514 "EHLO vsmtp02.cm.dti.ne.jp" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753803Ab3JHFfi (ORCPT ); Tue, 8 Oct 2013 01:35:38 -0400 Date: Tue, 8 Oct 2013 14:34:03 +0900 From: takasi-y@ops.dti.ne.jp To: SH-Linux Cc: Magnus Damm , ben.dooks@codethink.co.uk, Shinya Kuribayashi , Mike Turquette , Laurent Pinchart , devicetree@vger.kernel.org, Simon Horman , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 3/3] ARM: shmobile: kzm9d: Use common clock framework Message-Id: <20131008143403.c11f294c8a1701a2ab3bc5fd@ops.dti.ne.jp> In-Reply-To: <20131008143040.52f36df8edb7ab63224d8433@ops.dti.ne.jp> References: <20131008143040.52f36df8edb7ab63224d8433@ops.dti.ne.jp> X-Mailer: Sylpheed 3.4.0beta3 (GTK+ 2.24.17; x86_64-unknown-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1274 Lines: 40 Use common clock framework version of clock drivers/clk/shmobile/clk-emev2.c instead of sh-clkfwk version arch/arm/mach-shmobile/clock-emev2.c when it is configured as a part of multi-platform. Signed-off-by: Takashi Yoshii --- arch/arm/mach-shmobile/board-kzm9d-reference.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-shmobile/board-kzm9d-reference.c b/arch/arm/mach-shmobile/board-kzm9d-reference.c index 054d8d5..853003c 100644 --- a/arch/arm/mach-shmobile/board-kzm9d-reference.c +++ b/arch/arm/mach-shmobile/board-kzm9d-reference.c @@ -20,15 +20,14 @@ #include #include +#include #include #include #include static void __init kzm9d_add_standard_devices(void) { - if (!IS_ENABLED(CONFIG_COMMON_CLK)) - emev2_clock_init(); - + of_clk_init(NULL); of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); } -- 1.8.1.5 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/