An ad-hoc cleanup followed by preparation for SPI code cleaning.
The latter will be done in the next kernel cycle to avoid conflicts.
Andy Shevchenko (2):
ACPI: LPSS: Remove nested ifdeffery for CONFIG_PM
ACPI: LPSS: Advertise number of chip selects via property
drivers/acpi/acpi_lpss.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
--
2.43.0.rc1.1.gbec44491f096
There is no need to have the ifdef CONFIG_PM to be nested.
The second and so on will obviously become a no-op.
Remove redundant nested ifdeffery.
Signed-off-by: Andy Shevchenko <[email protected]>
---
drivers/acpi/acpi_lpss.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/drivers/acpi/acpi_lpss.c b/drivers/acpi/acpi_lpss.c
index 04e273167e92..5b56f198d005 100644
--- a/drivers/acpi/acpi_lpss.c
+++ b/drivers/acpi/acpi_lpss.c
@@ -886,10 +886,8 @@ static int acpi_lpss_activate(struct device *dev)
if (pdata->dev_desc->flags & (LPSS_SAVE_CTX | LPSS_SAVE_CTX_ONCE))
lpss_deassert_reset(pdata);
-#ifdef CONFIG_PM
if (pdata->dev_desc->flags & LPSS_SAVE_CTX_ONCE)
acpi_lpss_save_ctx(dev, pdata);
-#endif
return 0;
}
--
2.43.0.rc1.1.gbec44491f096
Advertise number of chip selects via property for Intel Braswell.
Signed-off-by: Andy Shevchenko <[email protected]>
---
drivers/acpi/acpi_lpss.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/acpi/acpi_lpss.c b/drivers/acpi/acpi_lpss.c
index 5b56f198d005..a3d2d94be5c0 100644
--- a/drivers/acpi/acpi_lpss.c
+++ b/drivers/acpi/acpi_lpss.c
@@ -325,6 +325,7 @@ static const struct lpss_device_desc bsw_i2c_dev_desc = {
static const struct property_entry bsw_spi_properties[] = {
PROPERTY_ENTRY_U32("intel,spi-pxa2xx-type", LPSS_BSW_SSP),
+ PROPERTY_ENTRY_U32("num-cs", 2),
{ }
};
--
2.43.0.rc1.1.gbec44491f096
On 4/2/24 8:28 AM, Andy Shevchenko wrote:
> An ad-hoc cleanup followed by preparation for SPI code cleaning.
> The latter will be done in the next kernel cycle to avoid conflicts.
Looks good to me.
Reviewed-by: Kuppuswamy Sathyanarayanan <[email protected]>
> Andy Shevchenko (2):
> ACPI: LPSS: Remove nested ifdeffery for CONFIG_PM
> ACPI: LPSS: Advertise number of chip selects via property
>
> drivers/acpi/acpi_lpss.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
--
Sathyanarayanan Kuppuswamy
Linux Kernel Developer
On Tue, Apr 02, 2024 at 06:28:51PM +0300, Andy Shevchenko wrote:
> An ad-hoc cleanup followed by preparation for SPI code cleaning.
> The latter will be done in the next kernel cycle to avoid conflicts.
Thinking more about these two, it might be even possible to put them
as amendments for v6.9-rc3, but I'm fine to have them for v6.10-rc1.
Just speaking out my thoughts, whatever is better for you is good
for me.
--
With Best Regards,
Andy Shevchenko
On Tue, Apr 2, 2024 at 5:30 PM Andy Shevchenko
<[email protected]> wrote:
>
> Advertise number of chip selects via property for Intel Braswell.
>
> Signed-off-by: Andy Shevchenko <[email protected]>
A Fixes: tag, please?
Also, IIUC this should be applied before
https://lore.kernel.org/linux-acpi/[email protected]/
?
> ---
> drivers/acpi/acpi_lpss.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/acpi/acpi_lpss.c b/drivers/acpi/acpi_lpss.c
> index 5b56f198d005..a3d2d94be5c0 100644
> --- a/drivers/acpi/acpi_lpss.c
> +++ b/drivers/acpi/acpi_lpss.c
> @@ -325,6 +325,7 @@ static const struct lpss_device_desc bsw_i2c_dev_desc = {
>
> static const struct property_entry bsw_spi_properties[] = {
> PROPERTY_ENTRY_U32("intel,spi-pxa2xx-type", LPSS_BSW_SSP),
> + PROPERTY_ENTRY_U32("num-cs", 2),
> { }
> };
>
> --
> 2.43.0.rc1.1.gbec44491f096
>
On Thu, Apr 04, 2024 at 12:58:29PM +0200, Rafael J. Wysocki wrote:
> On Tue, Apr 2, 2024 at 5:30 PM Andy Shevchenko
> <[email protected]> wrote:
> >
> > Advertise number of chip selects via property for Intel Braswell.
> >
> > Signed-off-by: Andy Shevchenko <[email protected]>
>
> A Fixes: tag, please?
Sure.
> Also, IIUC this should be applied before
> https://lore.kernel.org/linux-acpi/[email protected]/
> ?
I believe yes for the sake of simplicity in maintaining / backporting
(if needed).
--
With Best Regards,
Andy Shevchenko