From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933363AbcBPV6L (ORCPT ); Tue, 16 Feb 2016 16:58:11 -0500 Received: from mail-pa0-f54.google.com ([209.85.220.54]:35426 "EHLO mail-pa0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932624AbcBPV6G convert rfc822-to-8bit (ORCPT ); Tue, 16 Feb 2016 16:58:06 -0500 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8BIT To: Eric Anholt , linux-clk@vger.kernel.org From: Michael Turquette In-Reply-To: <1455591838-22725-2-git-send-email-eric@anholt.net> Cc: linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, "Stephen Warren" , "Lee Jones" , "Stephen Boyd" , "Eric Anholt" References: <1455591838-22725-1-git-send-email-eric@anholt.net> <1455591838-22725-2-git-send-email-eric@anholt.net> Message-ID: <20160216214509.2278.72829@quark.deferred.io> User-Agent: alot/0.3.6 Subject: Re: [PATCH 2/2] clk: bcm2835: Reuse CLK_DIVIDER_MAX_AT_ZERO for recalc_rate() Date: Tue, 16 Feb 2016 13:45:09 -0800 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Quoting Eric Anholt (2016-02-15 19:03:58) > We were rolling this ourselves, but clk-divider can do it now. > > Signed-off-by: Eric Anholt Applied to clk-next. Regards, Mike > --- > drivers/clk/bcm/clk-bcm2835.c | 13 ++----------- > 1 file changed, 2 insertions(+), 11 deletions(-) > > diff --git a/drivers/clk/bcm/clk-bcm2835.c b/drivers/clk/bcm/clk-bcm2835.c > index 9f4df8f..353e438 100644 > --- a/drivers/clk/bcm/clk-bcm2835.c > +++ b/drivers/clk/bcm/clk-bcm2835.c > @@ -1060,16 +1060,7 @@ static long bcm2835_pll_divider_round_rate(struct clk_hw *hw, > static unsigned long bcm2835_pll_divider_get_rate(struct clk_hw *hw, > unsigned long parent_rate) > { > - struct bcm2835_pll_divider *divider = bcm2835_pll_divider_from_hw(hw); > - struct bcm2835_cprman *cprman = divider->cprman; > - const struct bcm2835_pll_divider_data *data = divider->data; > - u32 div = cprman_read(cprman, data->a2w_reg); > - > - div &= (1 << A2W_PLL_DIV_BITS) - 1; > - if (div == 0) > - div = 256; > - > - return parent_rate / div; > + return clk_divider_ops.recalc_rate(hw, parent_rate); > } > > static void bcm2835_pll_divider_off(struct clk_hw *hw) > @@ -1430,7 +1421,7 @@ bcm2835_register_pll_divider(struct bcm2835_cprman *cprman, > divider->div.reg = cprman->regs + data->a2w_reg; > divider->div.shift = A2W_PLL_DIV_SHIFT; > divider->div.width = A2W_PLL_DIV_BITS; > - divider->div.flags = 0; > + divider->div.flags = CLK_DIVIDER_MAX_AT_ZERO; > divider->div.lock = &cprman->regs_lock; > divider->div.hw.init = &init; > divider->div.table = NULL; > -- > 2.7.0 >