On 5/28/21 5:59 PM, Abhyuday Godhasara wrote:
> Register simple platform device to instantiate Xilinx event
> manager driver.
>
> Signed-off-by: Rajan Vaja <[email protected]>
> Signed-off-by: Abhyuday Godhasara <[email protected]>
> ---
> drivers/firmware/xilinx/zynqmp.c | 14 ++++++++++++++
> 1 file changed, 14 insertions(+)
>
> diff --git a/drivers/firmware/xilinx/zynqmp.c b/drivers/firmware/xilinx/zynqmp.c
> index ce16a72..31f7857 100644
> --- a/drivers/firmware/xilinx/zynqmp.c
> +++ b/drivers/firmware/xilinx/zynqmp.c
> @@ -23,6 +23,7 @@
> #include <linux/hashtable.h>
>
> #include <linux/firmware/xlnx-zynqmp.h>
> +#include <linux/firmware/xlnx-event-manager.h>
> #include "zynqmp-debug.h"
>
> /* Max HashMap Order for PM API feature check (1<<7 = 128) */
> @@ -31,6 +32,8 @@
> static bool feature_check_enabled;
> static DEFINE_HASHTABLE(pm_api_features_map, PM_API_FEATURE_CHECK_MAX_ORDER);
>
> +static struct platform_device *em_dev;
> +
> /**
> * struct pm_api_feature_data - PM API Feature data
> * @pm_api_id: PM API Id, used as key to index into hashmap
> @@ -1412,6 +1415,15 @@ static int zynqmp_firmware_probe(struct platform_device *pdev)
>
> zynqmp_pm_api_debugfs_init();
>
> + np = of_find_compatible_node(NULL, NULL, "xlnx,versal");
> + if (np) {
> + em_dev = platform_device_register_data(&pdev->dev, "xlnx_event_manager",
> + -1, NULL, 0);
> + if (IS_ERR(em_dev))
> + dev_err_probe(&pdev->dev, PTR_ERR(pdev), "EM register fail with error\n");
> + }
> + of_node_put(np);
> +
> return of_platform_populate(dev->of_node, NULL, NULL, dev);
> }
>
> @@ -1429,6 +1441,8 @@ static int zynqmp_firmware_remove(struct platform_device *pdev)
> kfree(feature_data);
> }
>
> + platform_device_unregister(em_dev);
> +
> return 0;
> }
>
>
Acked-by: Michal Simek <[email protected]>
Thanks,
Michal
On 6/21/21 1:48 PM, Michal Simek wrote:
>
>
> On 5/28/21 5:59 PM, Abhyuday Godhasara wrote:
>> Register simple platform device to instantiate Xilinx event
>> manager driver.
>>
>> Signed-off-by: Rajan Vaja <[email protected]>
>> Signed-off-by: Abhyuday Godhasara <[email protected]>
>> ---
>> drivers/firmware/xilinx/zynqmp.c | 14 ++++++++++++++
>> 1 file changed, 14 insertions(+)
>>
>> diff --git a/drivers/firmware/xilinx/zynqmp.c b/drivers/firmware/xilinx/zynqmp.c
>> index ce16a72..31f7857 100644
>> --- a/drivers/firmware/xilinx/zynqmp.c
>> +++ b/drivers/firmware/xilinx/zynqmp.c
>> @@ -23,6 +23,7 @@
>> #include <linux/hashtable.h>
>>
>> #include <linux/firmware/xlnx-zynqmp.h>
>> +#include <linux/firmware/xlnx-event-manager.h>
>> #include "zynqmp-debug.h"
>>
>> /* Max HashMap Order for PM API feature check (1<<7 = 128) */
>> @@ -31,6 +32,8 @@
>> static bool feature_check_enabled;
>> static DEFINE_HASHTABLE(pm_api_features_map, PM_API_FEATURE_CHECK_MAX_ORDER);
>>
>> +static struct platform_device *em_dev;
>> +
>> /**
>> * struct pm_api_feature_data - PM API Feature data
>> * @pm_api_id: PM API Id, used as key to index into hashmap
>> @@ -1412,6 +1415,15 @@ static int zynqmp_firmware_probe(struct platform_device *pdev)
>>
>> zynqmp_pm_api_debugfs_init();
>>
>> + np = of_find_compatible_node(NULL, NULL, "xlnx,versal");
>> + if (np) {
>> + em_dev = platform_device_register_data(&pdev->dev, "xlnx_event_manager",
>> + -1, NULL, 0);
>> + if (IS_ERR(em_dev))
>> + dev_err_probe(&pdev->dev, PTR_ERR(pdev), "EM register fail with error\n");
Above you have IS_ERR(em_dev) and here PTR_ERR(pdev) this should be
PTR_ERR(em_dev).
>> + }
>> + of_node_put(np);
>> +
>> return of_platform_populate(dev->of_node, NULL, NULL, dev);
>> }
>>
>> @@ -1429,6 +1441,8 @@ static int zynqmp_firmware_remove(struct platform_device *pdev)
>> kfree(feature_data);
>> }
>>
>> + platform_device_unregister(em_dev);
>> +
>> return 0;
>> }
>>
>>
>
> Acked-by: Michal Simek <[email protected]>
With above fixed please add this line.
Thanks,
Michal