On 6/25/21 3:49 PM, Abhyuday Godhasara wrote:
> Add macros for the Node-Id of Error events.
>
> Move supported api callback ids from zynqmp-power to zynqmp-firmware.
>
> Signed-off-by: Rajan Vaja <[email protected]>
> Signed-off-by: Abhyuday Godhasara <[email protected]>
> ---
> Changes in v2:
> - As per review comment add PM_ACKNOWLEDGE_CB in pm_api_cb_id
> ---
> drivers/soc/xilinx/zynqmp_power.c | 6 ------
> include/linux/firmware/xlnx-zynqmp.h | 14 ++++++++++++++
> 2 files changed, 14 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/soc/xilinx/zynqmp_power.c b/drivers/soc/xilinx/zynqmp_power.c
> index c556623dae02..76478fe2301f 100644
> --- a/drivers/soc/xilinx/zynqmp_power.c
> +++ b/drivers/soc/xilinx/zynqmp_power.c
> @@ -46,12 +46,6 @@ static const char *const suspend_modes[] = {
>
> static enum pm_suspend_mode suspend_mode = PM_SUSPEND_MODE_STD;
>
> -enum pm_api_cb_id {
> - PM_INIT_SUSPEND_CB = 30,
> - PM_ACKNOWLEDGE_CB,
> - PM_NOTIFY_CB,
> -};
> -
> static void zynqmp_pm_get_callback_data(u32 *buf)
> {
> zynqmp_pm_invoke_fn(GET_CALLBACK_DATA, 0, 0, 0, 0, buf);
> diff --git a/include/linux/firmware/xlnx-zynqmp.h b/include/linux/firmware/xlnx-zynqmp.h
> index 655783259415..be3414a6472a 100644
> --- a/include/linux/firmware/xlnx-zynqmp.h
> +++ b/include/linux/firmware/xlnx-zynqmp.h
> @@ -60,6 +60,20 @@
> #define XILINX_ZYNQMP_PM_FPGA_FULL 0x0U
> #define XILINX_ZYNQMP_PM_FPGA_PARTIAL BIT(0)
>
> +/*
> + * Node IDs for the Error Events.
> + */
> +#define EVENT_ERROR_PMC_ERR1 (0x28100000U)
> +#define EVENT_ERROR_PMC_ERR2 (0x28104000U)
> +#define EVENT_ERROR_PSM_ERR1 (0x28108000U)
> +#define EVENT_ERROR_PSM_ERR2 (0x2810C000U)
> +
> +enum pm_api_cb_id {
> + PM_INIT_SUSPEND_CB = 30,
> + PM_ACKNOWLEDGE_CB = 31,
> + PM_NOTIFY_CB = 32,
> +};
> +
> enum pm_api_id {
> PM_GET_API_VERSION = 1,
> PM_REGISTER_NOTIFIER = 5,
>
Acked-by: Michal Simek <[email protected]>
M