From patchwork Tue Nov 19 09:05:10 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 3200481 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 145BEC045B for ; Tue, 19 Nov 2013 09:05:19 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7309A20328 for ; Tue, 19 Nov 2013 09:05:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 523622031C for ; Tue, 19 Nov 2013 09:05:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751396Ab3KSJFM (ORCPT ); Tue, 19 Nov 2013 04:05:12 -0500 Received: from mail-pd0-f175.google.com ([209.85.192.175]:56900 "EHLO mail-pd0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751386Ab3KSJFL (ORCPT ); Tue, 19 Nov 2013 04:05:11 -0500 Received: by mail-pd0-f175.google.com with SMTP id w10so5692741pde.34 for ; Tue, 19 Nov 2013 01:05:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:sender:message-id:to:cc:in-reply-to:references:from:subject :mime-version:content-type; bh=lqrRCf1iJFZmzKaFb5VRFH6BWxWSXv4JpSUhW9LbpQc=; b=LL4XVh/3eC/a3srRhMuSilxDKqYHq0xCS5QHjiAygxhkccDVt/MdctCrYMMVlm08c7 t3IHRfs6v4D4gRfXQP5AZGriC8gpds68YhLsFXd80CqlrlKOmgDJZUmlqNqCxBh3hAAn LBtkpVo6C0y3IW05hRfy9s5GklffnjRRSR0uFwCl2pDZAB2ijMzGqsRjbvgaMrSIDKRo JasAxGrlfjHLY10s0U59F4ig9M9REgaQl/FbVeb6zs4oQiGe58zKKp1SNuqkXx2udOQe /nDbwB9BR97PpMeJiCklk8RtXaMYOIhsXKV8hUizs62E2YPbApQUAExMS9JkZrbP3082 CW9A== X-Received: by 10.66.161.38 with SMTP id xp6mr6840625pab.145.1384851910983; Tue, 19 Nov 2013 01:05:10 -0800 (PST) Received: from morimoto-Dell-XPS420.gmail.com (49.14.32.202.bf.2iij.net. [202.32.14.49]) by mx.google.com with ESMTPSA id fb3sm28952699pbc.29.2013.11.19.01.05.08 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 19 Nov 2013 01:05:10 -0800 (PST) Date: Tue, 19 Nov 2013 01:05:10 -0800 (PST) Message-ID: <874n78ep8d.wl%kuninori.morimoto.gx@renesas.com> To: Simon Cc: Magnus , linux-sh@vger.kernel.org, Kuninori Morimoto In-Reply-To: <87a9h0epb4.wl%kuninori.morimoto.gx@renesas.com> References: <87a9h0epb4.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 4/6] ARM: shmobile: r7s72100: tidyup clock table order MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00,DKIM_SIGNED, 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 SuperH lookups clock is using CLKDEV_CON/DEV/ICK_ID() macro for a long term. But in these days, the ICK clock is defined in random place. This patch arranges it. Signed-off-by: Kuninori Morimoto --- arch/arm/mach-shmobile/clock-r7s72100.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-shmobile/clock-r7s72100.c b/arch/arm/mach-shmobile/clock-r7s72100.c index 1c9d261..0814a50 100644 --- a/arch/arm/mach-shmobile/clock-r7s72100.c +++ b/arch/arm/mach-shmobile/clock-r7s72100.c @@ -170,6 +170,9 @@ static struct clk_lookup lookups[] = { CLKDEV_CON_ID("cpu_clk", &div4_clks[DIV4_I]), /* MSTP clocks */ + CLKDEV_CON_ID("mtu2_fck", &mstp_clks[MSTP33]), + + /* ICK */ CLKDEV_ICK_ID("sci_fck", "sh-sci.0", &mstp_clks[MSTP47]), CLKDEV_ICK_ID("sci_fck", "sh-sci.1", &mstp_clks[MSTP46]), CLKDEV_ICK_ID("sci_fck", "sh-sci.2", &mstp_clks[MSTP45]), @@ -178,7 +181,6 @@ static struct clk_lookup lookups[] = { CLKDEV_ICK_ID("sci_fck", "sh-sci.5", &mstp_clks[MSTP42]), CLKDEV_ICK_ID("sci_fck", "sh-sci.6", &mstp_clks[MSTP41]), CLKDEV_ICK_ID("sci_fck", "sh-sci.7", &mstp_clks[MSTP40]), - CLKDEV_CON_ID("mtu2_fck", &mstp_clks[MSTP33]), }; void __init r7s72100_clock_init(void)