Commit 81df0151 authored by Maxime Ripard's avatar Maxime Ripard Committed by Stephen Boyd
Browse files

clk: bcm: rpi: Pass the clocks data to the firmware function 



The raspberry_clock_property only takes the clock ID as an argument, but
now that we have a clock data structure it makes more sense to just pass
that structure instead.

Cc: Michael Turquette <mturquette@baylibre.com>
Cc: Stephen Boyd <sboyd@kernel.org>
Cc: linux-clk@vger.kernel.org
Acked-by: default avatarNicolas Saenz Julienne <nsaenzjulienne@suse.de>
Reviewed-by: default avatarStephen Boyd <sboyd@kernel.org>
Tested-by: default avatarNicolas Saenz Julienne <nsaenzjulienne@suse.de>
Signed-off-by: default avatarMaxime Ripard <maxime@cerno.tech>
Link: https://lore.kernel.org/r/d7a3b4df3ca23feb6e0d9c7ae2d232bfb913f926.1592210452.git-series.maxime@cerno.tech


Signed-off-by: default avatarStephen Boyd <sboyd@kernel.org>
parent 8a1f3ebc

drivers/clk/bcm/clk-raspberrypi.c

+14 −15
Original line number Diff line number Diff line
@@ -65,11 +65,12 @@ struct raspberrypi_firmware_prop { 
	__le32 disable_turbo;

} __packed;



static int raspberrypi_clock_property(struct rpi_firmware *firmware, u32 tag,

				      u32 clk, u32 *val)

static int raspberrypi_clock_property(struct rpi_firmware *firmware,

				      const struct raspberrypi_clk_data *data,

				      u32 tag, u32 *val)

{

	struct raspberrypi_firmware_prop msg = {

		.id = cpu_to_le32(clk),

		.id = cpu_to_le32(data->id),

		.val = cpu_to_le32(*val),

		.disable_turbo = cpu_to_le32(1),

	};
@@ -92,9 +93,8 @@ static int raspberrypi_fw_pll_is_on(struct clk_hw *hw) 
	u32 val = 0;

	int ret;



	ret = raspberrypi_clock_property(rpi->firmware,

					 RPI_FIRMWARE_GET_CLOCK_STATE,

					 data->id, &val);

	ret = raspberrypi_clock_property(rpi->firmware, data,

					 RPI_FIRMWARE_GET_CLOCK_STATE, &val);

	if (ret)

		return 0;
@@ -111,9 +111,8 @@ static unsigned long raspberrypi_fw_pll_get_rate(struct clk_hw *hw, 
	u32 val = 0;

	int ret;



	ret = raspberrypi_clock_property(rpi->firmware,

					 RPI_FIRMWARE_GET_CLOCK_RATE,

					 data->id, &val);

	ret = raspberrypi_clock_property(rpi->firmware, data,

					 RPI_FIRMWARE_GET_CLOCK_RATE, &val);

	if (ret)

		return ret;
@@ -129,9 +128,9 @@ static int raspberrypi_fw_pll_set_rate(struct clk_hw *hw, unsigned long rate, 
	u32 new_rate = rate / RPI_FIRMWARE_PLLB_ARM_DIV_RATE;

	int ret;



	ret = raspberrypi_clock_property(rpi->firmware,

	ret = raspberrypi_clock_property(rpi->firmware, data,

					 RPI_FIRMWARE_SET_CLOCK_RATE,

					 data->id, &new_rate);

					 &new_rate);

	if (ret)

		dev_err_ratelimited(rpi->dev, "Failed to change %s frequency: %d",

				    clk_hw_get_name(hw), ret);
@@ -194,18 +193,18 @@ static int raspberrypi_register_pllb(struct raspberrypi_clk *rpi) 
	init.flags = CLK_GET_RATE_NOCACHE | CLK_IGNORE_UNUSED;



	/* Get min & max rates set by the firmware */

	ret = raspberrypi_clock_property(rpi->firmware,

	ret = raspberrypi_clock_property(rpi->firmware, data,

					 RPI_FIRMWARE_GET_MIN_CLOCK_RATE,

					 data->id, &min_rate);

					 &min_rate);

	if (ret) {

		dev_err(rpi->dev, "Failed to get %s min freq: %d\n",

			init.name, ret);

		return ret;

	}



	ret = raspberrypi_clock_property(rpi->firmware,

	ret = raspberrypi_clock_property(rpi->firmware, data,

					 RPI_FIRMWARE_GET_MAX_CLOCK_RATE,

					 data->id, &max_rate);

					 &max_rate);

	if (ret) {

		dev_err(rpi->dev, "Failed to get %s max freq: %d\n",

			init.name, ret);

CRA Git | Maintained and supported by SUSTech CRA and CCSE