From patchwork Tue Apr 22 11:46:52 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhangfei Gao X-Patchwork-Id: 28771 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qc0-f198.google.com (mail-qc0-f198.google.com [209.85.216.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id CB9B220341 for ; Tue, 22 Apr 2014 11:47:21 +0000 (UTC) Received: by mail-qc0-f198.google.com with SMTP id r5sf23448823qcx.9 for ; Tue, 22 Apr 2014 04:47:21 -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:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=XmAlHOYk6IvnDHpX5ZC8YLGwfsXW7kGpQSbh25ZFnwo=; b=Gok1Z7owt4Nb0AriIm3Pju0OWbHMxnKPmRYFqMLLeT4JvSWcTUAsZtKbLHtOmFmnZ3 8NXzaPQr1pRKnC+rHP1CUcmbzakrqMMQbOVgHTLFvyZM7ocDrrR0gkEllXtjeURwH3fn j7qRwqzZOjW8hQnn4mcxSdN5Ax6nUHepsmezA4POonXuJjh6Av4Q/LDwC58+DbCGflbg +LqJ9rKzl6Dgx+TPxO7JO+mup13xJSKWtlekuUl/AbgC6jest/h2KRDXev9aQPk9Yuhy 6rHhy5pKWOnfWYitw74kd7un/JcULswoX1TjOI9/p2z3xFvs/vVDOb2EZnP4NCVqh/bj j9/A== X-Gm-Message-State: ALoCoQmV83XcsUrpbdm1qaYia08Go+LPolYsD1H6gYR1CIvNMbGMFhzQXcl3BSHv7Ynv1EXj1CmT X-Received: by 10.236.32.236 with SMTP id o72mr18402632yha.42.1398167241501; Tue, 22 Apr 2014 04:47:21 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.88.229 with SMTP id t92ls58809qgd.9.gmail; Tue, 22 Apr 2014 04:47:21 -0700 (PDT) X-Received: by 10.58.74.38 with SMTP id q6mr38738040vev.7.1398167241339; Tue, 22 Apr 2014 04:47:21 -0700 (PDT) Received: from mail-ve0-f174.google.com (mail-ve0-f174.google.com [209.85.128.174]) by mx.google.com with ESMTPS id vb6si6843237vec.182.2014.04.22.04.47.21 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 22 Apr 2014 04:47:21 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.174 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.174; Received: by mail-ve0-f174.google.com with SMTP id oz11so9165547veb.5 for ; Tue, 22 Apr 2014 04:47:21 -0700 (PDT) X-Received: by 10.52.175.166 with SMTP id cb6mr30727748vdc.1.1398167241264; Tue, 22 Apr 2014 04:47:21 -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.220.221.72 with SMTP id ib8csp17848vcb; Tue, 22 Apr 2014 04:47:20 -0700 (PDT) X-Received: by 10.68.196.202 with SMTP id io10mr8639238pbc.149.1398167240382; Tue, 22 Apr 2014 04:47:20 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id wh4si22714613pbc.133.2014.04.22.04.47.19; Tue, 22 Apr 2014 04:47:19 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932250AbaDVLrQ (ORCPT + 9 others); Tue, 22 Apr 2014 07:47:16 -0400 Received: from mail-pd0-f177.google.com ([209.85.192.177]:48727 "EHLO mail-pd0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932231AbaDVLrK (ORCPT ); Tue, 22 Apr 2014 07:47:10 -0400 Received: by mail-pd0-f177.google.com with SMTP id y10so4762760pdj.22 for ; Tue, 22 Apr 2014 04:47:09 -0700 (PDT) X-Received: by 10.68.201.10 with SMTP id jw10mr43896369pbc.25.1398167229685; Tue, 22 Apr 2014 04:47:09 -0700 (PDT) Received: from localhost.localdomain ([124.73.85.69]) by mx.google.com with ESMTPSA id z3sm200996177pas.15.2014.04.22.04.47.05 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 22 Apr 2014 04:47:09 -0700 (PDT) From: Zhangfei Gao To: Mike Turquette , haojian.zhuang@linaro.org, haifeng.yan@linaro.org Cc: linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, Zhangfei Gao Subject: [PATCH 1/3] clk: hisi: use clk_register_mux_table in hisi_clk_register_mux Date: Tue, 22 Apr 2014 19:46:52 +0800 Message-Id: <1398167214-1604-2-git-send-email-zhangfei.gao@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1398167214-1604-1-git-send-email-zhangfei.gao@linaro.org> References: <1398167214-1604-1-git-send-email-zhangfei.gao@linaro.org> Sender: devicetree-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: devicetree@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: zhangfei.gao@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.174 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) 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: , Platform hix5hd2 use mux table, so use clk_register_mux_table instead Signed-off-by: Zhangfei Gao --- drivers/clk/hisilicon/clk.c | 13 ++++++++----- drivers/clk/hisilicon/clk.h | 1 + 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/drivers/clk/hisilicon/clk.c b/drivers/clk/hisilicon/clk.c index 276f672..2699388 100644 --- a/drivers/clk/hisilicon/clk.c +++ b/drivers/clk/hisilicon/clk.c @@ -127,11 +127,14 @@ void __init hisi_clk_register_mux(struct hisi_mux_clock *clks, int i; for (i = 0; i < nums; i++) { - clk = clk_register_mux(NULL, clks[i].name, clks[i].parent_names, - clks[i].num_parents, clks[i].flags, - base + clks[i].offset, clks[i].shift, - clks[i].width, clks[i].mux_flags, - &hisi_clk_lock); + u32 mask = BIT(clks[i].width) - 1; + + clk = clk_register_mux_table(NULL, clks[i].name, + clks[i].parent_names, + clks[i].num_parents, clks[i].flags, + base + clks[i].offset, clks[i].shift, + mask, clks[i].mux_flags, + clks[i].table, &hisi_clk_lock); if (IS_ERR(clk)) { pr_err("%s: failed to register clock %s\n", __func__, clks[i].name); diff --git a/drivers/clk/hisilicon/clk.h b/drivers/clk/hisilicon/clk.h index 43fa5da..bc39a6a 100644 --- a/drivers/clk/hisilicon/clk.h +++ b/drivers/clk/hisilicon/clk.h @@ -62,6 +62,7 @@ struct hisi_mux_clock { u8 shift; u8 width; u8 mux_flags; + u32 *table; const char *alias; };