From patchwork Thu Dec 4 01:05:44 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Boyd X-Patchwork-Id: 5434711 Return-Path: X-Original-To: patchwork-linux-arm-msm@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 1DA98BEEA8 for ; Thu, 4 Dec 2014 01:05:49 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 56B8020328 for ; Thu, 4 Dec 2014 01:05:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7627C202B8 for ; Thu, 4 Dec 2014 01:05:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751322AbaLDBFq (ORCPT ); Wed, 3 Dec 2014 20:05:46 -0500 Received: from smtp.codeaurora.org ([198.145.11.231]:54826 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750840AbaLDBFp (ORCPT ); Wed, 3 Dec 2014 20:05:45 -0500 Received: from smtp.codeaurora.org (localhost [127.0.0.1]) by smtp.codeaurora.org (Postfix) with ESMTP id 62C2213FE99; Thu, 4 Dec 2014 01:05:45 +0000 (UTC) Received: by smtp.codeaurora.org (Postfix, from userid 486) id 525A313FEAF; Thu, 4 Dec 2014 01:05:45 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from [10.46.167.8] (i-global254.qualcomm.com [199.106.103.254]) (using TLSv1.2 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) (Authenticated sender: sboyd@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id C16D613FE99; Thu, 4 Dec 2014 01:05:44 +0000 (UTC) Message-ID: <547FB368.8020003@codeaurora.org> Date: Wed, 03 Dec 2014 17:05:44 -0800 From: Stephen Boyd User-Agent: Mozilla/5.0 (X11; Linux i686 on x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.3.0 MIME-Version: 1.0 To: Mike Turquette CC: Rajendra Nayak , linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Kenneth Westfield , Josh Cartwright , Kumar Gala Subject: Re: [PATCH v2 6/8] clk: qcom: Add IPQ806X LPASS clock controller (LCC) driver References: <1416965735-10583-1-git-send-email-sboyd@codeaurora.org> <1416965735-10583-7-git-send-email-sboyd@codeaurora.org> In-Reply-To: <1416965735-10583-7-git-send-email-sboyd@codeaurora.org> X-Virus-Scanned: ClamAV using ClamSMTP Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On 11/25/2014 05:35 PM, Stephen Boyd wrote: > + > +static struct clk_regmap_div mi2s_div_clk = { > + .reg = 0x48, > + .shift = 10, > + .width = 4, > + .clkr = { > + .hw.init = &(struct clk_init_data){ > + .name = "mi2s_div_clk", > + .parent_names = lcc_mi2s_parents, > + .num_parents = 1, > + .ops = &clk_regmap_div_ops, > + }, > + }, > +}; Oops this is wrong. Let's fold in this patch. diff --git a/drivers/clk/qcom/lcc-ipq806x.c b/drivers/clk/qcom/lcc-ipq806x.c index 80a1ecf2fe69..121ffde25dc3 100644 --- a/drivers/clk/qcom/lcc-ipq806x.c +++ b/drivers/clk/qcom/lcc-ipq806x.c @@ -188,7 +188,7 @@ static struct clk_branch mi2s_bit_div_clk = { .enable_mask = BIT(15), .hw.init = &(struct clk_init_data){ .name = "mi2s_bit_div_clk", - .parent_names = lcc_mi2s_parents, + .parent_names = (const char *[]){ "mi2s_div_clk" }, .num_parents = 1, .ops = &clk_branch_ops, .flags = CLK_SET_RATE_PARENT,