[PATCH v2 0/2] ACPI: LPSS: Prepare for SPI code cleanup

[PATCH v2 0/2] ACPI: LPSS: Prepare for SPI code cleanup

[Andy Shevchenko]

An ad-hoc cleanup followed by preparation for SPI code cleaning.
The latter will be done in the next kernel cycle to avoid conflicts.

This patch series should go before
https://lore.kernel.org/linux-acpi/20240403170302.1073841-1-andriy.shevchenko@linux.intel.com/

In v2:
- added Fixes tag to the first patch (Rafael)
- reordered to get Fixes first in the series
- v1: 20240402152952.3578659-1-andriy.shevchenko@linux.intel.com

Andy Shevchenko (2):
  ACPI: LPSS: Advertise number of chip selects via property
  ACPI: LPSS: Remove nested ifdeffery for CONFIG_PM

 drivers/acpi/acpi_lpss.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

-- 
2.43.0.rc1.1.gbec44491f096

[PATCH v2 1/2] ACPI: LPSS: Advertise number of chip selects via property

[Andy Shevchenko]

Advertise number of chip selects via property for Intel Braswell.

Fixes: 620c803f42de ("ACPI: LPSS: Provide an SSP type to the driver")
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
 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 04e273167e92..8e01792228d1 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

[PATCH v2 2/2] ACPI: LPSS: Remove nested ifdeffery for CONFIG_PM

[Andy Shevchenko]

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 <andriy.shevchenko@linux.intel.com>
---
 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 8e01792228d1..a3d2d94be5c0 100644
--- a/drivers/acpi/acpi_lpss.c
+++ b/drivers/acpi/acpi_lpss.c
@@ -887,10 +887,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

Re: [PATCH v2 0/2] ACPI: LPSS: Prepare for SPI code cleanup

[Andy Shevchenko]

On Thu, Apr 04, 2024 at 03:06:57PM +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.
> 
> This patch series should go before
> https://lore.kernel.org/linux-acpi/20240403170302.1073841-1-andriy.shevchenko@linux.intel.com/

Indeliberately forgot
Reviewed-by: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>

(Code hasn't been changed, commit messages also stays the same, hence I added
 it from v1)

> In v2:
> - added Fixes tag to the first patch (Rafael)
> - reordered to get Fixes first in the series
> - v1: 20240402152952.3578659-1-andriy.shevchenko@linux.intel.com

-- 
With Best Regards,
Andy Shevchenko

Re: [PATCH v2 0/2] ACPI: LPSS: Prepare for SPI code cleanup

[Rafael J. Wysocki]

On Thu, Apr 4, 2024 at 2:11 PM Andy Shevchenko
<andriy.shevchenko@linux.intel.com> wrote:
>
> On Thu, Apr 04, 2024 at 03:06:57PM +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.
> >
> > This patch series should go before
> > https://lore.kernel.org/linux-acpi/20240403170302.1073841-1-andriy.shevchenko@linux.intel.com/
>
> Indeliberately forgot
> Reviewed-by: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
>
> (Code hasn't been changed, commit messages also stays the same, hence I added
>  it from v1)
>
> > In v2:
> > - added Fixes tag to the first patch (Rafael)
> > - reordered to get Fixes first in the series
> > - v1: 20240402152952.3578659-1-andriy.shevchenko@linux.intel.com
>
> --

Both patches applied as 6.10 material, thanks!