Commit 2180cdf4 authored by Stephen Boyd's avatar Stephen Boyd
Browse files

Merge tag 'meson-clk-4.18-2' of https://github.com/BayLibre/clk-meson into clk-meson 

Pull Second round of update for meson clocks from Jerome Brunet:

 - Add critical flag to meson8b's fdiv2 as temporary fixup for the ethernet.
 - Clean up license headers with SPDX
 - Add round closest support to mpll driver.

* tag 'meson-clk-4.18-2' of https://github.com/BayLibre/clk-meson:
  clk: meson: axg: let mpll clocks round closest
  clk: meson: mpll: add round closest support
  clk: meson: meson8b: mark fclk_div2 gate clocks as CLK_IS_CRITICAL
  clk: meson: use SPDX license identifiers consistently
parents 37ffe9ac de1ca2d0

drivers/clk/meson/axg.c

+4 −0
Original line number Diff line number Diff line
@@ -461,6 +461,7 @@ static struct clk_regmap axg_mpll0_div = { 
			.width	 = 1,

		},

		.lock = &meson_clk_lock,

		.flags = CLK_MESON_MPLL_ROUND_CLOSEST,

	},

	.hw.init = &(struct clk_init_data){

		.name = "mpll0_div",
@@ -507,6 +508,7 @@ static struct clk_regmap axg_mpll1_div = { 
			.width	 = 1,

		},

		.lock = &meson_clk_lock,

		.flags = CLK_MESON_MPLL_ROUND_CLOSEST,

	},

	.hw.init = &(struct clk_init_data){

		.name = "mpll1_div",
@@ -553,6 +555,7 @@ static struct clk_regmap axg_mpll2_div = { 
			.width	 = 1,

		},

		.lock = &meson_clk_lock,

		.flags = CLK_MESON_MPLL_ROUND_CLOSEST,

	},

	.hw.init = &(struct clk_init_data){

		.name = "mpll2_div",
@@ -599,6 +602,7 @@ static struct clk_regmap axg_mpll3_div = { 
			.width	 = 1,

		},

		.lock = &meson_clk_lock,

		.flags = CLK_MESON_MPLL_ROUND_CLOSEST,

	},

	.hw.init = &(struct clk_init_data){

		.name = "mpll3_div",

drivers/clk/meson/clk-audio-divider.c

+1 −12
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

 * Copyright (c) 2017 AmLogic, Inc.

 * Author: Jerome Brunet <jbrunet@baylibre.com>

 *

 * This program is free software; you can redistribute it and/or modify it

 * under the terms and conditions of the GNU General Public License,

 * version 2, as published by the Free Software Foundation.

 *

 * This program is distributed in the hope it will be useful, but WITHOUT

 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

 * more details.

 *

 * You should have received a copy of the GNU General Public License along with

 * this program.  If not, see <http://www.gnu.org/licenses/>.

 */



/*

drivers/clk/meson/clk-mpll.c

+20 −56
Original line number Diff line number Diff line 
// SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause)

/*

 * This file is provided under a dual BSD/GPLv2 license.  When using or

 * redistributing this file, you may do so under either license.

 *

 * GPL LICENSE SUMMARY

 *

 * Copyright (c) 2016 AmLogic, Inc.

 * Author: Michael Turquette <mturquette@baylibre.com>

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of version 2 of the GNU General Public License as

 * published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful, but

 * WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

 * General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, write to the Free Software

 * Foundation, Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.

 * The full GNU General Public License is included in this distribution

 * in the file called COPYING

 *

 * BSD LICENSE

 *

 * Copyright (c) 2016 AmLogic, Inc.

 * Author: Michael Turquette <mturquette@baylibre.com>

 *

 * Redistribution and use in source and binary forms, with or without

 * modification, are permitted provided that the following conditions

 * are met:

 *

 *   * Redistributions of source code must retain the above copyright

 *     notice, this list of conditions and the following disclaimer.

 *   * Redistributions in binary form must reproduce the above copyright

 *     notice, this list of conditions and the following disclaimer in

 *     the documentation and/or other materials provided with the

 *     distribution.

 *   * Neither the name of Intel Corporation nor the names of its

 *     contributors may be used to endorse or promote products derived

 *     from this software without specific prior written permission.

 *

 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS

 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT

 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT

 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT

 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,

 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY

 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE

 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 */



/*
@@ -89,10 +39,23 @@ static long rate_from_params(unsigned long parent_rate, 
static void params_from_rate(unsigned long requested_rate,

			     unsigned long parent_rate,

			     unsigned int *sdm,

			     unsigned int *n2)

			     unsigned int *n2,

			     u8 flags)

{

	uint64_t div = parent_rate;

	unsigned long rem = do_div(div, requested_rate);

	uint64_t frac = do_div(div, requested_rate);



	frac *= SDM_DEN;



	if (flags & CLK_MESON_MPLL_ROUND_CLOSEST)

		*sdm = DIV_ROUND_CLOSEST_ULL(frac, requested_rate);

	else

		*sdm = DIV_ROUND_UP_ULL(frac, requested_rate);



	if (*sdm == SDM_DEN) {

		*sdm = 0;

		div += 1;

	}



	if (div < N2_MIN) {

		*n2 = N2_MIN;
@@ -102,7 +65,6 @@ static void params_from_rate(unsigned long requested_rate, 
		*sdm = SDM_DEN - 1;

	} else {

		*n2 = div;

		*sdm = DIV_ROUND_UP_ULL((u64)rem * SDM_DEN, requested_rate);

	}

}
@@ -125,9 +87,11 @@ static long mpll_round_rate(struct clk_hw *hw, 
			    unsigned long rate,

			    unsigned long *parent_rate)

{

	struct clk_regmap *clk = to_clk_regmap(hw);

	struct meson_clk_mpll_data *mpll = meson_clk_mpll_data(clk);

	unsigned int sdm, n2;



	params_from_rate(rate, *parent_rate, &sdm, &n2);

	params_from_rate(rate, *parent_rate, &sdm, &n2, mpll->flags);

	return rate_from_params(*parent_rate, sdm, n2);

}
@@ -140,7 +104,7 @@ static int mpll_set_rate(struct clk_hw *hw, 
	unsigned int sdm, n2;

	unsigned long flags = 0;



	params_from_rate(rate, parent_rate, &sdm, &n2);

	params_from_rate(rate, parent_rate, &sdm, &n2, mpll->flags);



	if (mpll->lock)

		spin_lock_irqsave(mpll->lock, flags);

drivers/clk/meson/clk-pll.c

+1 −12
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

 * Copyright (c) 2015 Endless Mobile, Inc.

 * Author: Carlo Caione <carlo@endlessm.com>

 *

 * Copyright (c) 2018 Baylibre, SAS.

 * Author: Jerome Brunet <jbrunet@baylibre.com>

 *

 * This program is free software; you can redistribute it and/or modify it

 * under the terms and conditions of the GNU General Public License,

 * version 2, as published by the Free Software Foundation.

 *

 * This program is distributed in the hope it will be useful, but WITHOUT

 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

 * more details.

 *

 * You should have received a copy of the GNU General Public License along with

 * this program.  If not, see <http://www.gnu.org/licenses/>.

 */



/*

drivers/clk/meson/clk-regmap.c

+4 −2
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

// Copyright (c) 2018 BayLibre, SAS.

// Author: Jerome Brunet <jbrunet@baylibre.com>

/*

 * Copyright (c) 2018 BayLibre, SAS.

 * Author: Jerome Brunet <jbrunet@baylibre.com>

 */



#include "clk-regmap.h"

CRA Git | Maintained and supported by SUSTech CRA and CCSE