clk: versal: Move pm_query_id out of clock driver

There is no reason to have firmware specific structure in clock driver.
Move it to generic location and also initialize enum values which is based
on https://lore.kernel.org/linux-arm-kernel/20200318125003.GA2727094@kroah.com/
recommended way to go to make sure that values guaranteed by compiler.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>

diff --git a/drivers/clk/clk_versal.c b/drivers/clk/clk_versal.c
index 6f82b60f04dbe94908b0fe2a35d8bb18b158a718..d93b860aed35e7b14b847d2796547788ac1fa1e1 100644 (file)
--- a/drivers/clk/clk_versal.c
+++ b/drivers/clk/clk_versal.c
@@ -68,23 +68,6 @@
 #define CLOCK_NODE_TYPE_DIV    4
 #define CLOCK_NODE_TYPE_GATE   6
 
-enum pm_query_id {
-       PM_QID_INVALID,
-       PM_QID_CLOCK_GET_NAME,
-       PM_QID_CLOCK_GET_TOPOLOGY,
-       PM_QID_CLOCK_GET_FIXEDFACTOR_PARAMS,
-       PM_QID_CLOCK_GET_PARENTS,
-       PM_QID_CLOCK_GET_ATTRIBUTES,
-       PM_QID_PINCTRL_GET_NUM_PINS,
-       PM_QID_PINCTRL_GET_NUM_FUNCTIONS,
-       PM_QID_PINCTRL_GET_NUM_FUNCTION_GROUPS,
-       PM_QID_PINCTRL_GET_FUNCTION_NAME,
-       PM_QID_PINCTRL_GET_FUNCTION_GROUPS,
-       PM_QID_PINCTRL_GET_PIN_GROUPS,
-       PM_QID_CLOCK_GET_NUM_CLOCKS,
-       PM_QID_CLOCK_GET_MAX_DIVISOR,
-};
-
 enum clk_type {
        CLK_TYPE_OUTPUT,
        CLK_TYPE_EXTERNAL,

diff --git a/include/zynqmp_firmware.h b/include/zynqmp_firmware.h
index 2c44951f86183623c1f4a7b0a74010e5ff2b6a4c..f6f82bf8828e1851f25f58d749c97f24493042c1 100644 (file)
--- a/include/zynqmp_firmware.h
+++ b/include/zynqmp_firmware.h
@@ -62,6 +62,23 @@ enum pm_api_id {
        PM_API_MAX,
 };
 
+enum pm_query_id {
+       PM_QID_INVALID = 0,
+       PM_QID_CLOCK_GET_NAME = 1,
+       PM_QID_CLOCK_GET_TOPOLOGY = 2,
+       PM_QID_CLOCK_GET_FIXEDFACTOR_PARAMS = 3,
+       PM_QID_CLOCK_GET_PARENTS = 4,
+       PM_QID_CLOCK_GET_ATTRIBUTES = 5,
+       PM_QID_PINCTRL_GET_NUM_PINS = 6,
+       PM_QID_PINCTRL_GET_NUM_FUNCTIONS = 7,
+       PM_QID_PINCTRL_GET_NUM_FUNCTION_GROUPS = 8,
+       PM_QID_PINCTRL_GET_FUNCTION_NAME = 9,
+       PM_QID_PINCTRL_GET_FUNCTION_GROUPS = 10,
+       PM_QID_PINCTRL_GET_PIN_GROUPS = 11,
+       PM_QID_CLOCK_GET_NUM_CLOCKS = 12,
+       PM_QID_CLOCK_GET_MAX_DIVISOR = 13,
+};
+
 #define PM_SIP_SVC      0xc2000000
 
 #define ZYNQMP_PM_VERSION_MAJOR         1