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 <nsaenzjulienne@suse.de>
Tested-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Link: https://lore.kernel.org/r/a52a5f5768cd33716cdd35237c6613f26ad75013.1592210452.git-series.maxime@cerno.tech
Signed-off-by: Stephen Boyd <sboyd@kernel.org>

diff --git a/drivers/clk/bcm/clk-raspberrypi.c b/drivers/clk/bcm/clk-raspberrypi.c
index 11a62bde5203a4b8bb0ca50ee05988de1263444c..adc0bb56008a0b28f180564351ea852e14b8777d 100644 (file)
--- a/drivers/clk/bcm/clk-raspberrypi.c
+++ b/drivers/clk/bcm/clk-raspberrypi.c
@@ -36,6 +36,23 @@ enum rpi_firmware_clk_id {
        RPI_FIRMWARE_NUM_CLK_ID,
 };
 
+static char *rpi_firmware_clk_names[] = {
+       [RPI_FIRMWARE_EMMC_CLK_ID]      = "emmc",
+       [RPI_FIRMWARE_UART_CLK_ID]      = "uart",
+       [RPI_FIRMWARE_ARM_CLK_ID]       = "arm",
+       [RPI_FIRMWARE_CORE_CLK_ID]      = "core",
+       [RPI_FIRMWARE_V3D_CLK_ID]       = "v3d",
+       [RPI_FIRMWARE_H264_CLK_ID]      = "h264",
+       [RPI_FIRMWARE_ISP_CLK_ID]       = "isp",
+       [RPI_FIRMWARE_SDRAM_CLK_ID]     = "sdram",
+       [RPI_FIRMWARE_PIXEL_CLK_ID]     = "pixel",
+       [RPI_FIRMWARE_PWM_CLK_ID]       = "pwm",
+       [RPI_FIRMWARE_HEVC_CLK_ID]      = "hevc",
+       [RPI_FIRMWARE_EMMC2_CLK_ID]     = "emmc2",
+       [RPI_FIRMWARE_M2MC_CLK_ID]      = "m2mc",
+       [RPI_FIRMWARE_PIXEL_BVB_CLK_ID] = "pixel-bvb",
+};
+
 #define RPI_FIRMWARE_STATE_ENABLE_BIT  BIT(0)
 #define RPI_FIRMWARE_STATE_WAIT_BIT    BIT(1)
 
@@ -343,7 +360,9 @@ static struct clk_hw *raspberrypi_clk_register(struct raspberrypi_clk *rpi,
        data->rpi = rpi;
        data->id = id;
 
-       init.name = devm_kasprintf(rpi->dev, GFP_KERNEL, "fw-clk-%u", id);
+       init.name = devm_kasprintf(rpi->dev, GFP_KERNEL,
+                                  "fw-clk-%s",
+                                  rpi_firmware_clk_names[id]);
        init.ops = &raspberrypi_firmware_clk_ops;
        init.flags = CLK_GET_RATE_NOCACHE;