Commit 8a1f3ebc authored by Maxime Ripard's avatar Maxime Ripard Committed by Stephen Boyd
Browse files

clk: bcm: rpi: Add clock id to data 



The driver has really only supported one clock so far and has hardcoded the
ID used in communications with the firmware in all the functions
implementing the clock framework hooks. Let's store that in the clock data
structure so that we can support more clocks later on.

Cc: Michael Turquette <mturquette@baylibre.com>
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/e23c37961b97b027e21efa3b818578970f88527a.1592210452.git-series.maxime@cerno.tech


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

drivers/clk/bcm/clk-raspberrypi.c

+9 −9
Original line number Diff line number Diff line
@@ -39,6 +39,9 @@ struct raspberrypi_clk { 


struct raspberrypi_clk_data {

	struct clk_hw hw;



	unsigned int id;



	struct raspberrypi_clk *rpi;

};
@@ -91,7 +94,7 @@ static int raspberrypi_fw_pll_is_on(struct clk_hw *hw) 


	ret = raspberrypi_clock_property(rpi->firmware,

					 RPI_FIRMWARE_GET_CLOCK_STATE,

					 RPI_FIRMWARE_ARM_CLK_ID, &val);

					 data->id, &val);

	if (ret)

		return 0;
@@ -110,8 +113,7 @@ static unsigned long raspberrypi_fw_pll_get_rate(struct clk_hw *hw, 


	ret = raspberrypi_clock_property(rpi->firmware,

					 RPI_FIRMWARE_GET_CLOCK_RATE,

					 RPI_FIRMWARE_ARM_CLK_ID,

					 &val);

					 data->id, &val);

	if (ret)

		return ret;
@@ -129,8 +131,7 @@ static int raspberrypi_fw_pll_set_rate(struct clk_hw *hw, unsigned long rate, 


	ret = raspberrypi_clock_property(rpi->firmware,

					 RPI_FIRMWARE_SET_CLOCK_RATE,

					 RPI_FIRMWARE_ARM_CLK_ID,

					 &new_rate);

					 data->id, &new_rate);

	if (ret)

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

				    clk_hw_get_name(hw), ret);
@@ -183,6 +184,7 @@ static int raspberrypi_register_pllb(struct raspberrypi_clk *rpi) 
	if (!data)

		return -ENOMEM;

	data->rpi = rpi;

	data->id = RPI_FIRMWARE_ARM_CLK_ID;



	/* All of the PLLs derive from the external oscillator. */

	init.parent_names = (const char *[]){ "osc" };
@@ -194,8 +196,7 @@ static int raspberrypi_register_pllb(struct raspberrypi_clk *rpi) 
	/* Get min & max rates set by the firmware */

	ret = raspberrypi_clock_property(rpi->firmware,

					 RPI_FIRMWARE_GET_MIN_CLOCK_RATE,

					 RPI_FIRMWARE_ARM_CLK_ID,

					 &min_rate);

					 data->id, &min_rate);

	if (ret) {

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

			init.name, ret);
@@ -204,8 +205,7 @@ static int raspberrypi_register_pllb(struct raspberrypi_clk *rpi) 


	ret = raspberrypi_clock_property(rpi->firmware,

					 RPI_FIRMWARE_GET_MAX_CLOCK_RATE,

					 RPI_FIRMWARE_ARM_CLK_ID,

					 &max_rate);

					 data->id, &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