firmware: raspberrypi: Move the clock IDs to the firmware header

We'll need the clock IDs in more drivers than just the clock driver from
now on, so let's move them in the firmware header.

Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Acked-by: Stephen Boyd <sboyd@kernel.org>
Link: https://lore.kernel.org/r/20220815-rpi-fix-4k-60-v5-2-fe9e7ac8b111@cerno.tech
Signed-off-by: Maxime Ripard <maxime@cerno.tech>

diff --git a/drivers/clk/bcm/clk-raspberrypi.c b/drivers/clk/bcm/clk-raspberrypi.c
index 679f4649a7efd7cfc2d759ff00832c9c0c564517..ce2f9347973697eaaa7a672633e987f4f3fc4cfa 100644 (file)
--- a/drivers/clk/bcm/clk-raspberrypi.c
+++ b/drivers/clk/bcm/clk-raspberrypi.c
@@ -18,25 +18,6 @@
 
 #include <soc/bcm2835/raspberrypi-firmware.h>
 
-enum rpi_firmware_clk_id {
-       RPI_FIRMWARE_EMMC_CLK_ID = 1,
-       RPI_FIRMWARE_UART_CLK_ID,
-       RPI_FIRMWARE_ARM_CLK_ID,
-       RPI_FIRMWARE_CORE_CLK_ID,
-       RPI_FIRMWARE_V3D_CLK_ID,
-       RPI_FIRMWARE_H264_CLK_ID,
-       RPI_FIRMWARE_ISP_CLK_ID,
-       RPI_FIRMWARE_SDRAM_CLK_ID,
-       RPI_FIRMWARE_PIXEL_CLK_ID,
-       RPI_FIRMWARE_PWM_CLK_ID,
-       RPI_FIRMWARE_HEVC_CLK_ID,
-       RPI_FIRMWARE_EMMC2_CLK_ID,
-       RPI_FIRMWARE_M2MC_CLK_ID,
-       RPI_FIRMWARE_PIXEL_BVB_CLK_ID,
-       RPI_FIRMWARE_VEC_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",

diff --git a/include/soc/bcm2835/raspberrypi-firmware.h b/include/soc/bcm2835/raspberrypi-firmware.h
index 63426082bcb9f1ab46c92eb9859363d73eefb730..9b1db12d013ff151a0945c4cc6effb2df1894ca4 100644 (file)
--- a/include/soc/bcm2835/raspberrypi-firmware.h
+++ b/include/soc/bcm2835/raspberrypi-firmware.h
@@ -136,6 +136,25 @@ enum rpi_firmware_property_tag {
        RPI_FIRMWARE_GET_DMA_CHANNELS =                       0x00060001,
 };
 
+enum rpi_firmware_clk_id {
+       RPI_FIRMWARE_EMMC_CLK_ID = 1,
+       RPI_FIRMWARE_UART_CLK_ID,
+       RPI_FIRMWARE_ARM_CLK_ID,
+       RPI_FIRMWARE_CORE_CLK_ID,
+       RPI_FIRMWARE_V3D_CLK_ID,
+       RPI_FIRMWARE_H264_CLK_ID,
+       RPI_FIRMWARE_ISP_CLK_ID,
+       RPI_FIRMWARE_SDRAM_CLK_ID,
+       RPI_FIRMWARE_PIXEL_CLK_ID,
+       RPI_FIRMWARE_PWM_CLK_ID,
+       RPI_FIRMWARE_HEVC_CLK_ID,
+       RPI_FIRMWARE_EMMC2_CLK_ID,
+       RPI_FIRMWARE_M2MC_CLK_ID,
+       RPI_FIRMWARE_PIXEL_BVB_CLK_ID,
+       RPI_FIRMWARE_VEC_CLK_ID,
+       RPI_FIRMWARE_NUM_CLK_ID,
+};
+
 #if IS_ENABLED(CONFIG_RASPBERRYPI_FIRMWARE)
 int rpi_firmware_property(struct rpi_firmware *fw,
                          u32 tag, void *data, size_t len);