power: zynqmp: Use zynqmp_pmufw_node() from firmware
authorMichal Simek <michal.simek@xilinx.com>
Tue, 1 Mar 2022 08:10:59 +0000 (09:10 +0100)
committerMichal Simek <michal.simek@xilinx.com>
Mon, 7 Mar 2022 15:33:47 +0000 (16:33 +0100)
Remove private xpm_configobject[] and use zynqmp_pmufw_node() which
provides the same functionality.
Also add debug messages for easier debugging.

Fixes: e0283cbdfd49 ("power: zynqmp: Add power domain driver for ZynqMP")
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Reviewed-by: Jaehoon Chung <jh80.chung@samsung.com>
Link: https://lore.kernel.org/r/bddf11459b9b9e849fac9a50db2f1a5fdfae4119.1646122254.git.michal.simek@xilinx.com
drivers/power/domain/zynqmp-power-domain.c

index 5383d09..6943658 100644 (file)
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <dm/device_compat.h>
 #include <log.h>
 #include <malloc.h>
 #include <misc.h>
 
 #include <zynqmp_firmware.h>
 
-#define NODE_ID_LOCATION       5
-
-static unsigned int xpm_configobject[] = {
-       /* HEADER */
-       2,      /* Number of remaining words in the header */
-       1,      /* Number of sections included in config object */
-       PM_CONFIG_OBJECT_TYPE_OVERLAY,  /* Type of Config object as overlay */
-       /* SLAVE SECTION */
-
-       PM_CONFIG_SLAVE_SECTION_ID,     /* Section ID */
-       1,                              /* Number of slaves */
-
-       0, /* Node ID which will be changed below */
-       PM_SLAVE_FLAG_IS_SHAREABLE,
-       PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK |
-       PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK |
-       PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */
-};
-
 static int zynqmp_pm_request_node(const u32 node, const u32 capabilities,
                                  const u32 qos, const enum zynqmp_pm_request_ack ack)
 {
@@ -41,12 +23,9 @@ static int zynqmp_pm_request_node(const u32 node, const u32 capabilities,
 
 static int zynqmp_power_domain_request(struct power_domain *power_domain)
 {
-       /* Record power domain id */
-       xpm_configobject[NODE_ID_LOCATION] = power_domain->id;
-
-       zynqmp_pmufw_load_config_object(xpm_configobject, sizeof(xpm_configobject));
+       dev_dbg(power_domain->dev, "Request for id: %ld\n", power_domain->id);
 
-       return 0;
+       return zynqmp_pmufw_node(power_domain->id);
 }
 
 static int zynqmp_power_domain_free(struct power_domain *power_domain)
@@ -57,6 +36,8 @@ static int zynqmp_power_domain_free(struct power_domain *power_domain)
 
 static int zynqmp_power_domain_on(struct power_domain *power_domain)
 {
+       dev_dbg(power_domain->dev, "Domain ON for id: %ld\n", power_domain->id);
+
        return zynqmp_pm_request_node(power_domain->id,
                                      ZYNQMP_PM_CAPABILITY_ACCESS,
                                      ZYNQMP_PM_MAX_QOS,