lkml.org 
[lkml]   [2020]   [May]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v3 15/25] clk: bcm: rpi: Pass the clocks data to the firmware function
    Date
    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
    Reviewed-by: Stephen Boyd <sboyd@kernel.org>
    Acked-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
    Signed-off-by: Maxime Ripard <maxime@cerno.tech>
    ---
    drivers/clk/bcm/clk-raspberrypi.c | 29 ++++++++++++++---------------
    1 file changed, 14 insertions(+), 15 deletions(-)

    diff --git a/drivers/clk/bcm/clk-raspberrypi.c b/drivers/clk/bcm/clk-raspberrypi.c
    index 97ac04604b0a..3fce49a65a79 100644
    --- a/drivers/clk/bcm/clk-raspberrypi.c
    +++ b/drivers/clk/bcm/clk-raspberrypi.c
    @@ -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);
    --
    git-series 0.9.1
    \
     
     \ /
      Last update: 2020-05-27 17:47    [W:4.108 / U:0.304 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site