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>
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 18aac87..67c64fc 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 eb933a9..39bc15c 100644 (file)
--- a/include/soc/bcm2835/raspberrypi-firmware.h
+++ b/include/soc/bcm2835/raspberrypi-firmware.h
@@ -160,6 +160,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,
+};
+
 #define GET_DISPLAY_SETTINGS_PAYLOAD_SIZE 64
 
 #if IS_ENABLED(CONFIG_RASPBERRYPI_FIRMWARE)