From patchwork Tue Jan 14 02:25:27 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 3483651 Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 1C1929F169 for ; Tue, 14 Jan 2014 02:25:36 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 53CD6200E6 for ; Tue, 14 Jan 2014 02:25:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4C77720172 for ; Tue, 14 Jan 2014 02:25:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752061AbaANCZb (ORCPT ); Mon, 13 Jan 2014 21:25:31 -0500 Received: from mail-pb0-f49.google.com ([209.85.160.49]:49478 "EHLO mail-pb0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752060AbaANCZ2 (ORCPT ); Mon, 13 Jan 2014 21:25:28 -0500 Received: by mail-pb0-f49.google.com with SMTP id jt11so8050742pbb.22 for ; Mon, 13 Jan 2014 18:25:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:message-id:to:cc:in-reply-to:references:from:subject :user-agent:mime-version:content-type; bh=cDhlNwSk372lcF1FJ7vXQh3CGGs6MSzMx2PRWTr579c=; b=YRb/i1yxrjOe/ilDAJ3ucFvBrE+uIeYVwO4/YiJNqf6hpEElAMBDbo1Qts/wZyfGW8 jT2FEV+HvX0OX7zu94YsHNcMFtWKMC7/vJ8RM40aWV3Tu0UeQAFod5PLcgJInqbdoQB9 A1XYtUqcq2EV/j4HTrWN1jKAdy2XPPB5W9bE5QD0Ug0DgiMcP7k25TOnGDsPDhEGGexv bdEYIGpll64smaNWd2BwPmrUhaIIbaeziLjlONlw2lvStAhRXhI4yWjHy3BFgAKxIaWW YSZMj085BiATqOgqWPFNOeUwrjzFEQwBtIQGywZiQZ1lQqgTxLFzN8tAy/mX2EN/ush6 3XOA== X-Received: by 10.66.163.36 with SMTP id yf4mr34127907pab.67.1389666327889; Mon, 13 Jan 2014 18:25:27 -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 oa3sm41442359pbb.15.2014.01.13.18.25.26 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 13 Jan 2014 18:25:27 -0800 (PST) Date: Mon, 13 Jan 2014 18:25:27 -0800 (PST) Message-ID: <87a9ezguzv.wl%kuninori.morimoto.gx@gmail.com> To: Simon , Laurent Cc: Morimoto , Magnus , Linux-SH In-Reply-To: <87bnzfgv15.wl%kuninori.morimoto.gx@gmail.com> References: <87bnzfgv15.wl%kuninori.morimoto.gx@gmail.com> From: Kuninori Morimoto Subject: [PATCH 1/4] ARM: shmobile: r8a7778: add audio clock in new style User-Agent: Wanderlust/2.14.0 Emacs/23.3 Mule/6.0 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=-6.9 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: Kuninori Morimoto Current audio clock doesn't have dependency to device/driver, but, it is not good design for DT support. To avoid branch merge conflict issue, it uses this load map, and this patch is 1) part. 1) add new style clock in platform 2) add new style clock method in driver 3) remove old tyle clock from platform Signed-off-by: Kuninori Morimoto --- arch/arm/mach-shmobile/clock-r8a7778.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm/mach-shmobile/clock-r8a7778.c b/arch/arm/mach-shmobile/clock-r8a7778.c index 9783945..2009a9b 100644 --- a/arch/arm/mach-shmobile/clock-r8a7778.c +++ b/arch/arm/mach-shmobile/clock-r8a7778.c @@ -221,6 +221,10 @@ static struct clk_lookup lookups[] = { CLKDEV_DEV_ID("fffc6000.spi", &mstp_clks[MSTP007]), /* HSPI2 */ CLKDEV_DEV_ID("rcar_sound", &mstp_clks[MSTP008]), /* SRU */ + CLKDEV_ICK_ID("clk_a", "rcar_sound", &audio_clk_a), + CLKDEV_ICK_ID("clk_b", "rcar_sound", &audio_clk_b), + CLKDEV_ICK_ID("clk_c", "rcar_sound", &audio_clk_c), + CLKDEV_ICK_ID("clk_i", "rcar_sound", &s1_clk), CLKDEV_ICK_ID("ssi.0", "rcar_sound", &mstp_clks[MSTP012]), CLKDEV_ICK_ID("ssi.1", "rcar_sound", &mstp_clks[MSTP011]), CLKDEV_ICK_ID("ssi.2", "rcar_sound", &mstp_clks[MSTP010]),