Skip to content

Commit 7dad8a6

Browse files
mripardbebarino
authored andcommitted
clk: bcm: rpi: Give firmware clocks a name
We've registered the firmware clocks using their ID as name, but it's much more convenient to register them using their proper name. Since the firmware doesn't provide it, we have to duplicate it. Acked-by: Nicolas Saenz Julienne <[email protected]> Tested-by: Nicolas Saenz Julienne <[email protected]> Signed-off-by: Maxime Ripard <[email protected]> Link: https://lore.kernel.org/r/a52a5f5768cd33716cdd35237c6613f26ad75013.1592210452.git-series.maxime@cerno.tech Signed-off-by: Stephen Boyd <[email protected]>
1 parent 93d2725 commit 7dad8a6

File tree

1 file changed

+20
-1
lines changed

1 file changed

+20
-1
lines changed

drivers/clk/bcm/clk-raspberrypi.c

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,23 @@ enum rpi_firmware_clk_id {
3636
RPI_FIRMWARE_NUM_CLK_ID,
3737
};
3838

39+
static char *rpi_firmware_clk_names[] = {
40+
[RPI_FIRMWARE_EMMC_CLK_ID] = "emmc",
41+
[RPI_FIRMWARE_UART_CLK_ID] = "uart",
42+
[RPI_FIRMWARE_ARM_CLK_ID] = "arm",
43+
[RPI_FIRMWARE_CORE_CLK_ID] = "core",
44+
[RPI_FIRMWARE_V3D_CLK_ID] = "v3d",
45+
[RPI_FIRMWARE_H264_CLK_ID] = "h264",
46+
[RPI_FIRMWARE_ISP_CLK_ID] = "isp",
47+
[RPI_FIRMWARE_SDRAM_CLK_ID] = "sdram",
48+
[RPI_FIRMWARE_PIXEL_CLK_ID] = "pixel",
49+
[RPI_FIRMWARE_PWM_CLK_ID] = "pwm",
50+
[RPI_FIRMWARE_HEVC_CLK_ID] = "hevc",
51+
[RPI_FIRMWARE_EMMC2_CLK_ID] = "emmc2",
52+
[RPI_FIRMWARE_M2MC_CLK_ID] = "m2mc",
53+
[RPI_FIRMWARE_PIXEL_BVB_CLK_ID] = "pixel-bvb",
54+
};
55+
3956
#define RPI_FIRMWARE_STATE_ENABLE_BIT BIT(0)
4057
#define RPI_FIRMWARE_STATE_WAIT_BIT BIT(1)
4158

@@ -343,7 +360,9 @@ static struct clk_hw *raspberrypi_clk_register(struct raspberrypi_clk *rpi,
343360
data->rpi = rpi;
344361
data->id = id;
345362

346-
init.name = devm_kasprintf(rpi->dev, GFP_KERNEL, "fw-clk-%u", id);
363+
init.name = devm_kasprintf(rpi->dev, GFP_KERNEL,
364+
"fw-clk-%s",
365+
rpi_firmware_clk_names[id]);
347366
init.ops = &raspberrypi_firmware_clk_ops;
348367
init.flags = CLK_GET_RATE_NOCACHE;
349368

0 commit comments

Comments
 (0)