From patchwork Fri Apr 26 08:14:52 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Baltieri X-Patchwork-Id: 2491331 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) by patchwork2.kernel.org (Postfix) with ESMTP id B5EEEDF230 for ; Fri, 26 Apr 2013 08:16:51 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UVdom-000098-Iy; Fri, 26 Apr 2013 08:15:45 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UVdoG-0004j1-Lf; Fri, 26 Apr 2013 08:15:12 +0000 Received: from mail-bk0-x232.google.com ([2a00:1450:4008:c01::232]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UVdoD-0004id-V1 for linux-arm-kernel@lists.infradead.org; Fri, 26 Apr 2013 08:15:10 +0000 Received: by mail-bk0-f50.google.com with SMTP id ik5so1613044bkc.9 for ; Fri, 26 Apr 2013 01:15:07 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer :x-gm-message-state; bh=FvyNRhG9jXY7ctaCB0DSTQWeC6eCSsg6SpRqNLOqDCE=; b=AchkQFG5snfqPr7exC/rUMsb99zNUR7ML6P6pJt8AJUIleyK0BfUtsCmXwO9YSPn42 jmJB3QCI2mZfFATzwsaS0gWpnSjZklnqbKCa6kSKbYGc9wcfqYumkURzHw8qsVNtKk7e 2K9kQrWpecPMNQuptpOyhpV25+jErqhVQDrGlqUE+M5hJcWTa0r1m+k2Fy9xNuL0F1YF jxKkb9rRerTr8n6LvEKVepT+yp9VcnU6+ojVRioy2HfdCo6Ta2AqozXuq+tEPN6EWTyv cFCueqekvRoAY1cqQcGX8YVlp+CwFfor4Oa9qhnlOoH/jYjjcORjOuT7s5pnr+9xB3Gu AbYw== X-Received: by 10.205.46.193 with SMTP id up1mr17841381bkb.65.1366964107351; Fri, 26 Apr 2013 01:15:07 -0700 (PDT) Received: from localhost ([2a01:2003:1:1f50:8e70:5aff:feac:ad8]) by mx.google.com with ESMTPSA id tl1sm2691866bkb.7.2013.04.26.01.15.01 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 26 Apr 2013 01:15:06 -0700 (PDT) From: Fabio Baltieri To: Mike Turquette Subject: [PATCH] clk: ux500: abx500-clk: rename ux500 audio codec aliases Date: Fri, 26 Apr 2013 10:14:52 +0200 Message-Id: <1366964092-7672-1-git-send-email-fabio.baltieri@linaro.org> X-Mailer: git-send-email 1.8.1.3 X-Gm-Message-State: ALoCoQnkp6X+icfqBLbauOcoxZJJqiTs3ptsvD5r7j234EoUPGqcbGxauhr8iIukcoz7vCr7LE/f X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130426_041510_123678_4B2454B8 X-CRM114-Status: UNSURE ( 7.76 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Ulf Hansson , Fabio Baltieri , Linus Walleij , linux-kernel@vger.kernel.org, Lee Jones , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Change soc-audio related clk_register_clkdev() device names to reflect the ones actually used in current snd-soc-mop500 and ab8500-codec drivers. Cc: Ulf Hansson Signed-off-by: Fabio Baltieri --- drivers/clk/ux500/abx500-clk.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/clk/ux500/abx500-clk.c b/drivers/clk/ux500/abx500-clk.c index a0fca00..e7bd62c 100644 --- a/drivers/clk/ux500/abx500-clk.c +++ b/drivers/clk/ux500/abx500-clk.c @@ -45,7 +45,7 @@ static int ab8500_reg_clks(struct device *dev) CLK_IS_ROOT); clk_register_clkdev(clk, "sysclk", "ab8500-usb.0"); clk_register_clkdev(clk, "sysclk", "ab-iddet.0"); - clk_register_clkdev(clk, "sysclk", "ab85xx-codec.0"); + clk_register_clkdev(clk, "sysclk", "snd-soc-mop500.0"); clk_register_clkdev(clk, "sysclk", "shrm_bus"); /* ab8500_sysclk2 */ @@ -70,19 +70,19 @@ static int ab8500_reg_clks(struct device *dev) AB8500_SYSULPCLKCTRL1, AB8500_SYSULPCLKCTRL1_ULPCLKREQ, AB8500_SYSULPCLKCTRL1_ULPCLKREQ, 38400000, 9000, CLK_IS_ROOT); - clk_register_clkdev(clk, "ulpclk", "ab85xx-codec.0"); + clk_register_clkdev(clk, "ulpclk", "snd-soc-mop500.0"); /* ab8500_intclk */ clk = clk_reg_sysctrl_set_parent(dev , "intclk", intclk_parents, 2, intclk_reg_sel, intclk_reg_mask, intclk_reg_bits, 0); - clk_register_clkdev(clk, "intclk", "ab85xx-codec.0"); + clk_register_clkdev(clk, "intclk", "snd-soc-mop500.0"); clk_register_clkdev(clk, NULL, "ab8500-pwm.1"); /* ab8500_audioclk */ clk = clk_reg_sysctrl_gate(dev , "audioclk", "intclk", AB8500_SYSULPCLKCTRL1, AB8500_SYSULPCLKCTRL1_AUDIOCLKENA, AB8500_SYSULPCLKCTRL1_AUDIOCLKENA, 0, 0); - clk_register_clkdev(clk, "audioclk", "ab85xx-codec.0"); + clk_register_clkdev(clk, "audioclk", "ab8500-codec.0"); return 0; }