clk: bcm: rpi: Add an enum for the firmware clocks (be1559f6) · Commits · 戴 / test

While the firmware allows us to discover the available clocks, we need to discriminate those clocks to only register the ones meaningful to Linux. The firmware also doesn't provide a clock name, so having a list of the ID will help us to give clocks a proper name later on. 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/4738f77ee7de9b48a3bb1c558ead958d0cc064d9.1592210452.git-series.maxime@cerno.tech Signed-off-by:

Stephen Boyd <sboyd@kernel.org>

drivers/clk/bcm/clk-raspberrypi.c

+19 −4

Original line number	Diff line number	Diff line
		@@ -18,7 +18,23 @@

		#include <soc/bcm2835/raspberrypi-firmware.h>

		#define RPI_FIRMWARE_ARM_CLK_ID 0x00000003
		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_NUM_CLK_ID,
		};

		#define RPI_FIRMWARE_STATE_ENABLE_BIT BIT(0)
		#define RPI_FIRMWARE_STATE_WAIT_BIT BIT(1)
		@@ -31,8 +47,6 @@

		#define A2W_PLL_FRAC_BITS 20

		#define NUM_FW_CLKS 16

		struct raspberrypi_clk {
		struct device *dev;
		struct rpi_firmware *firmware;
		@@ -320,7 +334,8 @@ static int raspberrypi_clk_probe(struct platform_device *pdev)
		rpi->firmware = firmware;
		platform_set_drvdata(pdev, rpi);

		clk_data = devm_kzalloc(dev, struct_size(clk_data, hws, NUM_FW_CLKS),
		clk_data = devm_kzalloc(dev, struct_size(clk_data, hws,
		RPI_FIRMWARE_NUM_CLK_ID),
		GFP_KERNEL);
		if (!clk_data)
		return -ENOMEM;

Admin message