From patchwork Mon Apr 20 13:06:28 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 47351 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f200.google.com (mail-wi0-f200.google.com [209.85.212.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 97D8D2121F for ; Mon, 20 Apr 2015 13:06:45 +0000 (UTC) Received: by wicmx19 with SMTP id mx19sf10642821wic.3 for ; Mon, 20 Apr 2015 06:06:44 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:sender:precedence:list-id:x-original-sender :x-original-authentication-results:mailing-list:list-post:list-help :list-archive:list-unsubscribe; bh=qhwJ1S/BiuwJwF4qR+DoaFTYkaY/PYqJ23zcSx56XmA=; b=C3lTSHJSFIfjKKiDmB+uz3KuId113PhKG/Qq2Lj3keRK6LuTJCiHGBGctZNinXnjNm gmrtA6urmVy9y++LgYl/UpaRHAm+1cJllNsR2UTasRi3eY/BTVArwa5g4eveA5jiAQRq /agKvKaGokUmC9hkCRsTJbsinGWrZYKUjqbzwGvK25qBc9mHAzb2CkeM2ayHyb3Kf3Qf 0K58tdUBv7WNbM0RiAfBLvg1GIqrdyxIanLaQ/7/jhtynzSSk5DeVr4dRO3boCo3DhOz w8TAu7YReB3lhtEzNvSkzQhVM3iqUxjdgGXW2FBNq3wlzBAPcF2QY5q5Lvv7S9QBhb+O bM7g== X-Gm-Message-State: ALoCoQnXMwGopSNTlQdUE000zDDxlMU7bsAb7Yp8Y2balcJ+Sle2yNughyKSFLi/olqZvCM9bED+ X-Received: by 10.112.93.203 with SMTP id cw11mr7022153lbb.0.1429535204897; Mon, 20 Apr 2015 06:06:44 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.87.204 with SMTP id ba12ls826007lab.41.gmail; Mon, 20 Apr 2015 06:06:44 -0700 (PDT) X-Received: by 10.112.129.132 with SMTP id nw4mr15865520lbb.122.1429535204606; Mon, 20 Apr 2015 06:06:44 -0700 (PDT) Received: from mail-lb0-f172.google.com (mail-lb0-f172.google.com. [209.85.217.172]) by mx.google.com with ESMTPS id kk6si11784250lbc.72.2015.04.20.06.06.44 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 20 Apr 2015 06:06:44 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.172 as permitted sender) client-ip=209.85.217.172; Received: by lbbzk7 with SMTP id zk7so130016754lbb.0 for ; Mon, 20 Apr 2015 06:06:44 -0700 (PDT) X-Received: by 10.152.23.70 with SMTP id k6mr15229913laf.76.1429535204529; Mon, 20 Apr 2015 06:06:44 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.67.65 with SMTP id l1csp9698lbt; Mon, 20 Apr 2015 06:06:43 -0700 (PDT) X-Received: by 10.66.179.81 with SMTP id de17mr27950674pac.59.1429535202807; Mon, 20 Apr 2015 06:06:42 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id kw15si28194174pab.203.2015.04.20.06.06.41; Mon, 20 Apr 2015 06:06:42 -0700 (PDT) Received-SPF: none (google.com: linux-kernel-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755058AbbDTNGh (ORCPT + 26 others); Mon, 20 Apr 2015 09:06:37 -0400 Received: from mail-lb0-f182.google.com ([209.85.217.182]:34120 "EHLO mail-lb0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752965AbbDTNGf (ORCPT ); Mon, 20 Apr 2015 09:06:35 -0400 Received: by lbcga7 with SMTP id ga7so130086725lbc.1 for ; Mon, 20 Apr 2015 06:06:34 -0700 (PDT) X-Received: by 10.153.7.133 with SMTP id dc5mr15538053lad.17.1429535194466; Mon, 20 Apr 2015 06:06:34 -0700 (PDT) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id g19sm4310248lbh.13.2015.04.20.06.06.32 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 20 Apr 2015 06:06:33 -0700 (PDT) From: Linus Walleij To: linux-arm-kernel@lists.infradead.org, Mike Turquette , Stephen Boyd , linux-kernel@vger.kernel.org Cc: Linus Walleij , Ulf Hansson Subject: [PATCH] clk: ux500: ape[ate|trace]clk are scaleable Date: Mon, 20 Apr 2015 15:06:28 +0200 Message-Id: <1429535188-4327-1-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 1.9.3 Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: linus.walleij@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.172 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , The APEATCLK and APETRACECLK are actually scaleable so register them as scaleable clocks. Cc: Ulf Hansson Signed-off-by: Linus Walleij Acked-by: Ulf Hansson --- drivers/clk/ux500/u8500_clk.c | 7 ++++--- drivers/clk/ux500/u8500_of_clk.c | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/clk/ux500/u8500_clk.c b/drivers/clk/ux500/u8500_clk.c index 80069c370a47..4626b97b7d83 100644 --- a/drivers/clk/ux500/u8500_clk.c +++ b/drivers/clk/ux500/u8500_clk.c @@ -116,11 +116,12 @@ void u8500_clk_init(u32 clkrst1_base, u32 clkrst2_base, u32 clkrst3_base, clk_register_clkdev(clk, NULL, "hdmi"); clk_register_clkdev(clk, "hdmi", "mcde"); - clk = clk_reg_prcmu_gate("apeatclk", NULL, PRCMU_APEATCLK, CLK_IS_ROOT); + clk = clk_reg_prcmu_scalable("apeatclk", NULL, PRCMU_APEATCLK, 0, + CLK_IS_ROOT|CLK_SET_RATE_GATE); clk_register_clkdev(clk, NULL, "apeat"); - clk = clk_reg_prcmu_gate("apetraceclk", NULL, PRCMU_APETRACECLK, - CLK_IS_ROOT); + clk = clk_reg_prcmu_scalable("apetraceclk", NULL, PRCMU_APETRACECLK, 0, + CLK_IS_ROOT|CLK_SET_RATE_GATE); clk_register_clkdev(clk, NULL, "apetrace"); clk = clk_reg_prcmu_gate("mcdeclk", NULL, PRCMU_MCDECLK, CLK_IS_ROOT); diff --git a/drivers/clk/ux500/u8500_of_clk.c b/drivers/clk/ux500/u8500_of_clk.c index 7b55ef89baa5..e319ef912dc6 100644 --- a/drivers/clk/ux500/u8500_of_clk.c +++ b/drivers/clk/ux500/u8500_of_clk.c @@ -166,8 +166,8 @@ void u8500_of_clk_init(u32 clkrst1_base, u32 clkrst2_base, u32 clkrst3_base, clk = clk_reg_prcmu_gate("apeatclk", NULL, PRCMU_APEATCLK, CLK_IS_ROOT); prcmu_clk[PRCMU_APEATCLK] = clk; - clk = clk_reg_prcmu_gate("apetraceclk", NULL, PRCMU_APETRACECLK, - CLK_IS_ROOT); + clk = clk_reg_prcmu_scalable("apetraceclk", NULL, PRCMU_APETRACECLK, 0, + CLK_IS_ROOT|CLK_SET_RATE_GATE); prcmu_clk[PRCMU_APETRACECLK] = clk; clk = clk_reg_prcmu_gate("mcdeclk", NULL, PRCMU_MCDECLK, CLK_IS_ROOT);