RE: [PATCH v3] soc: fsl: enable acpi support
Hi Christophe On Wednesday, August 19, 2020 2:48 PM, Christophe Leroy wrote: > > > > Le 19/08/2020 à 06:00, Ran Wang a écrit : > > From: Peng Ma > > > > This patch enables ACPI support in RCPM driver. > > Can you change the subject to "soc: fsl: enable acpi support in RCPM driver" ? Sure. > > > > Signed-off-by: Peng Ma > > Signed-off-by: Ran Wang > > --- > > Change in v3: > > - Add #ifdef CONFIG_ACPI for acpi_device_id > > - Rename rcpm_acpi_imx_ids to rcpm_acpi_ids > > > > Change in v2: > > - Update acpi_device_id to fix conflict with other driver > > > > drivers/soc/fsl/rcpm.c | 13 - > > 1 file changed, 12 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/soc/fsl/rcpm.c b/drivers/soc/fsl/rcpm.c index > > a093dbe..55d1d73 100644 > > --- a/drivers/soc/fsl/rcpm.c > > +++ b/drivers/soc/fsl/rcpm.c > > @@ -2,7 +2,7 @@ > > // > > // rcpm.c - Freescale QorIQ RCPM driver > > // > > -// Copyright 2019 NXP > > +// Copyright 2019-2020 NXP > > // > > // Author: Ran Wang > > > > @@ -13,6 +13,7 @@ > > #include > > #include > > #include > > +#include > > > > #define RCPM_WAKEUP_CELL_MAX_SIZE 7 > > > > @@ -125,6 +126,7 @@ static int rcpm_probe(struct platform_device > > *pdev) > > > > ret = device_property_read_u32(>dev, > > "#fsl,rcpm-wakeup-cells", >wakeup_cells); > > + > > This blank line addition is unrelated to the patch and shouldn't be there. Got it, will remove this in v4, thanks. Regards, Ran > Christophe > > > if (ret) > > return ret; > > > > @@ -139,10 +141,19 @@ static const struct of_device_id rcpm_of_match[] > = { > > }; > > MODULE_DEVICE_TABLE(of, rcpm_of_match); > > > > +#ifdef CONFIG_ACPI > > +static const struct acpi_device_id rcpm_acpi_ids[] = { > > + {"NXP0015",}, > > + { } > > +}; > > +MODULE_DEVICE_TABLE(acpi, rcpm_acpi_ids); #endif > > + > > static struct platform_driver rcpm_driver = { > > .driver = { > > .name = "rcpm", > > .of_match_table = rcpm_of_match, > > + .acpi_match_table = ACPI_PTR(rcpm_acpi_ids), > > .pm = _pm_ops, > > }, > > .probe = rcpm_probe, > >
Re: [PATCH v3] soc: fsl: enable acpi support
Le 19/08/2020 à 06:00, Ran Wang a écrit : From: Peng Ma This patch enables ACPI support in RCPM driver. Can you change the subject to "soc: fsl: enable acpi support in RCPM driver" ? Signed-off-by: Peng Ma Signed-off-by: Ran Wang --- Change in v3: - Add #ifdef CONFIG_ACPI for acpi_device_id - Rename rcpm_acpi_imx_ids to rcpm_acpi_ids Change in v2: - Update acpi_device_id to fix conflict with other driver drivers/soc/fsl/rcpm.c | 13 - 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/drivers/soc/fsl/rcpm.c b/drivers/soc/fsl/rcpm.c index a093dbe..55d1d73 100644 --- a/drivers/soc/fsl/rcpm.c +++ b/drivers/soc/fsl/rcpm.c @@ -2,7 +2,7 @@ // // rcpm.c - Freescale QorIQ RCPM driver // -// Copyright 2019 NXP +// Copyright 2019-2020 NXP // // Author: Ran Wang @@ -13,6 +13,7 @@ #include #include #include +#include #define RCPM_WAKEUP_CELL_MAX_SIZE 7 @@ -125,6 +126,7 @@ static int rcpm_probe(struct platform_device *pdev) ret = device_property_read_u32(>dev, "#fsl,rcpm-wakeup-cells", >wakeup_cells); + This blank line addition is unrelated to the patch and shouldn't be there. Christophe if (ret) return ret; @@ -139,10 +141,19 @@ static const struct of_device_id rcpm_of_match[] = { }; MODULE_DEVICE_TABLE(of, rcpm_of_match); +#ifdef CONFIG_ACPI +static const struct acpi_device_id rcpm_acpi_ids[] = { + {"NXP0015",}, + { } +}; +MODULE_DEVICE_TABLE(acpi, rcpm_acpi_ids); +#endif + static struct platform_driver rcpm_driver = { .driver = { .name = "rcpm", .of_match_table = rcpm_of_match, + .acpi_match_table = ACPI_PTR(rcpm_acpi_ids), .pm = _pm_ops, }, .probe = rcpm_probe,
[PATCH v3] soc: fsl: enable acpi support
From: Peng Ma This patch enables ACPI support in RCPM driver. Signed-off-by: Peng Ma Signed-off-by: Ran Wang --- Change in v3: - Add #ifdef CONFIG_ACPI for acpi_device_id - Rename rcpm_acpi_imx_ids to rcpm_acpi_ids Change in v2: - Update acpi_device_id to fix conflict with other driver drivers/soc/fsl/rcpm.c | 13 - 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/drivers/soc/fsl/rcpm.c b/drivers/soc/fsl/rcpm.c index a093dbe..55d1d73 100644 --- a/drivers/soc/fsl/rcpm.c +++ b/drivers/soc/fsl/rcpm.c @@ -2,7 +2,7 @@ // // rcpm.c - Freescale QorIQ RCPM driver // -// Copyright 2019 NXP +// Copyright 2019-2020 NXP // // Author: Ran Wang @@ -13,6 +13,7 @@ #include #include #include +#include #define RCPM_WAKEUP_CELL_MAX_SIZE 7 @@ -125,6 +126,7 @@ static int rcpm_probe(struct platform_device *pdev) ret = device_property_read_u32(>dev, "#fsl,rcpm-wakeup-cells", >wakeup_cells); + if (ret) return ret; @@ -139,10 +141,19 @@ static const struct of_device_id rcpm_of_match[] = { }; MODULE_DEVICE_TABLE(of, rcpm_of_match); +#ifdef CONFIG_ACPI +static const struct acpi_device_id rcpm_acpi_ids[] = { + {"NXP0015",}, + { } +}; +MODULE_DEVICE_TABLE(acpi, rcpm_acpi_ids); +#endif + static struct platform_driver rcpm_driver = { .driver = { .name = "rcpm", .of_match_table = rcpm_of_match, + .acpi_match_table = ACPI_PTR(rcpm_acpi_ids), .pm = _pm_ops, }, .probe = rcpm_probe, -- 2.7.4