Skip to content

Make irq-imx-irqsteer build without PM_SLEEP #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: lf-5.15.y
Choose a base branch
from
+7 −3
Open

Make irq-imx-irqsteer build without PM_SLEEP #15

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
93cd0b7
irq-imx-irqsteer.chans_enable: Fix typo in variable name
jo-so-nx Oct 30, 2023
7e83eb5
irq-imx-irqsteer: Fix compile without PM_SLEEP
jo-so-nx Oct 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions drivers/irqchip/irq-imx-irqsteer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ static int imx_irqsteer_chans_enable(struct irqsteer_data *data)
{
int ret;

ret = clk_prepare_enable(irqsteer_data->ipg_clk);
ret = clk_prepare_enable(data->ipg_clk);
if (ret) {
dev_err(data->dev, "failed to enable ipg clk: %d\n", ret);
return ret;
Expand Down Expand Up @@ -378,7 +378,6 @@ static int imx_irqsteer_runtime_resume(struct device *dev)

return 0;
}
#endif

static const struct dev_pm_ops imx_irqsteer_pm_ops = {
SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend,
Expand All @@ -387,6 +386,11 @@ static const struct dev_pm_ops imx_irqsteer_pm_ops = {
imx_irqsteer_runtime_resume, NULL)
};

#define IRQSTEER_PM_OPS_PTR (&imx_irqsteer_pm_ops)
#else
#define IRQSTEER_PM_OPS_PTR NULL
#endif

static const struct of_device_id imx_irqsteer_dt_ids[] = {
{ .compatible = "fsl,imx-irqsteer", },
{},
Expand All @@ -397,7 +401,7 @@ static struct platform_driver imx_irqsteer_driver = {
.driver = {
.name = "imx-irqsteer",
.of_match_table = imx_irqsteer_dt_ids,
.pm = &imx_irqsteer_pm_ops,
.pm = IRQSTEER_PM_OPS_PTR,
},
.probe = imx_irqsteer_probe,
.remove = imx_irqsteer_remove,
Expand Down