spi: pxa2xx: Pass the SSP type via device property
Subsystems (3)
Andy Shevchenko
reviewerv3 cover spi: pxa2xx: Pass the SSP type via device property
Currently the SPI PXA2xx devices on Intel platforms can be instantiated via the following paths:
1) as ACPI LPSS device on Haswell, Bay Trail and Cherry Trail;
2) as ACPI LPSS device on the Sky Lake and newer;
3) as PCI LPSS device on Haswell, Bay Trail and Cherry Trail;
4) as PCI LPSS device on the Sky Lake and newer;
5) as PCI device via ID table.
Each of these cases provides some platform related data differently, i.e.:
1) via drivers/acpi/acpi_lpss.c and drivers/spi/spi-pxa2xx.c
2) via drivers/mfd/intel-lpss-acpi.c
3) via drivers/spi/spi-pxa2xx-pci.c
4) via drivers/mfd/intel-lpss-pci.c and drivers/spi/spi-pxa2xx.c
5) via drivers/spi/spi-pxa2xx-pci.c
This approach has two downsides:
a) there is no data propagated in the case #2 because we can't have two or more drivers to match the same ACPI ID and hence some cases are still not supported (Sky Lake and newer ACPI enabled LPSS);
b) the data is duplicated over two drivers in the cases #1 & #4 and, besides to be a bloatware, it is error prone (e.g. Lakefield has a wrong data right now due to missed PCI entry in the spi-pxa2xx.c).
This series fixes the downsides, and enables previously unsupported cases. On top of that it has a couple of cleanups (patches 4 and 5).
Changelog v3:
- added tags to patches 4 & 5 (Jonathan)
- massaged cover letter
Changelog v2:
- added cover letter (Mark)
- dropped applied patch
Andy Shevchenko (5):
spi: pxa2xx: Respect Intel SSP type given by a property
spi: pxa2xx: Remove no more needed PCI ID table
spi: pxa2xx: Remove no more needed driver data
spi: pxa2xx: Move OF and ACPI ID tables closer to their user
spi: pxa2xx: Switch from PM ifdeffery to pm_ptr()
drivers/spi/spi-pxa2xx.c | 170 +++++++------------------------------ include/linux/pxa2xx_ssp.h | 1 + 2 files changed, 30 insertions(+), 141 deletions(-)
Signature · 1 line
2.35.1
Andy Shevchenko
reviewerPATCH v3 1/5 spi: pxa2xx: Respect Intel SSP type given by a property
Allow to set the Intel SSP type by reading the property.
--- drivers/spi/spi-pxa2xx.c | 6 ++++++ include/linux/pxa2xx_ssp.h | 1 + 2 files changed, 7 insertions(+)
drivers/spi/spi-pxa2xx.c +6 -0
@@ -1460,6 +1460,7 @@ pxa2xx_spi_init_pdata(struct platform_device *pdev)struct resource *res;struct pci_dev *pcidev =dev_is_pci (parent) ?to_pci_dev (parent) :NULL ;const struct pci_device_id *pcidev_id =NULL ; +u32 value =SSP_UNDEFINED ;enum pxa_ssp_type type;const void *match;int status;
@@ -1468,9 +1469,14 @@ pxa2xx_spi_init_pdata(struct platform_device *pdev)if (pcidev) pcidev_id =pci_match_id (pxa2xx_spi_pci_compound_match, pcidev); +/* Always try to read property */ +device_property_read_u32 (&pdev->dev,"intel,spi-pxa2xx-type" , &value); + match =device_get_match_data (&pdev->dev);if (match) type = (enum pxa_ssp_type )match; +else if (value >SSP_UNDEFINED && value <SSP_MAX ) + type = (enum pxa_ssp_type )value;else if (pcidev_id) type = (enum pxa_ssp_type )pcidev_id->driver_data;else
include/linux/pxa2xx_ssp.h +1 -0
@@ -229,6 +229,7 @@ enum pxa_ssp_type {LPSS_SPT_SSP ,LPSS_BXT_SSP ,LPSS_CNL_SSP , +SSP_MAX }; struct ssp_device {
Signature · 1 line
2.35.1
Andy Shevchenko
reviewerPATCH v3 2/5 spi: pxa2xx: Remove no more needed PCI ID table
In reply to Andy ShevchenkoSince the PCI enumerated devices provide a property with SSP type, there is no more necessity to bear the copy of the ID table here. Remove it for good.
--- drivers/spi/spi-pxa2xx.c | 117 +-------------------------------------- 1 file changed, 2 insertions(+), 115 deletions(-)
drivers/spi/spi-pxa2xx.c +2 -115
@@ -20,7 +20,6 @@#include <linux/module.h> #include <linux/mod_devicetable.h> #include <linux/of.h> -#include <linux/pci.h> #include <linux/platform_device.h> #include <linux/pm_runtime.h> #include <linux/property.h>
@@ -1335,121 +1334,17 @@ static const struct acpi_device_id pxa2xx_spi_acpi_match[] = {MODULE_DEVICE_TABLE (acpi, pxa2xx_spi_acpi_match);#endif -/* -* PCI IDs of compound devices that integrate both host controller and private -* integrated DMA engine. Please note these are not used in module -* autoloading and probing in this module but matching the LPSS SSP type. -*/ -static const struct pci_device_id pxa2xx_spi_pci_compound_match[] = { -/* SPT-LP */ - {PCI_VDEVICE (INTEL ,0x9d29 ),LPSS_SPT_SSP }, - {PCI_VDEVICE (INTEL ,0x9d2a ),LPSS_SPT_SSP }, -/* SPT-H */ - {PCI_VDEVICE (INTEL ,0xa129 ),LPSS_SPT_SSP }, - {PCI_VDEVICE (INTEL ,0xa12a ),LPSS_SPT_SSP }, -/* KBL-H */ - {PCI_VDEVICE (INTEL ,0xa2a9 ),LPSS_SPT_SSP }, - {PCI_VDEVICE (INTEL ,0xa2aa ),LPSS_SPT_SSP }, -/* CML-V */ - {PCI_VDEVICE (INTEL ,0xa3a9 ),LPSS_SPT_SSP }, - {PCI_VDEVICE (INTEL ,0xa3aa ),LPSS_SPT_SSP }, -/* BXT A-Step */ - {PCI_VDEVICE (INTEL ,0x0ac2 ),LPSS_BXT_SSP }, - {PCI_VDEVICE (INTEL ,0x0ac4 ),LPSS_BXT_SSP }, - {PCI_VDEVICE (INTEL ,0x0ac6 ),LPSS_BXT_SSP }, -/* BXT B-Step */ - {PCI_VDEVICE (INTEL ,0x1ac2 ),LPSS_BXT_SSP }, - {PCI_VDEVICE (INTEL ,0x1ac4 ),LPSS_BXT_SSP }, - {PCI_VDEVICE (INTEL ,0x1ac6 ),LPSS_BXT_SSP }, -/* GLK */ - {PCI_VDEVICE (INTEL ,0x31c2 ),LPSS_BXT_SSP }, - {PCI_VDEVICE (INTEL ,0x31c4 ),LPSS_BXT_SSP }, - {PCI_VDEVICE (INTEL ,0x31c6 ),LPSS_BXT_SSP }, -/* ICL-LP */ - {PCI_VDEVICE (INTEL ,0x34aa ),LPSS_CNL_SSP }, - {PCI_VDEVICE (INTEL ,0x34ab ),LPSS_CNL_SSP }, - {PCI_VDEVICE (INTEL ,0x34fb ),LPSS_CNL_SSP }, -/* EHL */ - {PCI_VDEVICE (INTEL ,0x4b2a ),LPSS_BXT_SSP }, - {PCI_VDEVICE (INTEL ,0x4b2b ),LPSS_BXT_SSP }, - {PCI_VDEVICE (INTEL ,0x4b37 ),LPSS_BXT_SSP }, -/* JSL */ - {PCI_VDEVICE (INTEL ,0x4daa ),LPSS_CNL_SSP }, - {PCI_VDEVICE (INTEL ,0x4dab ),LPSS_CNL_SSP }, - {PCI_VDEVICE (INTEL ,0x4dfb ),LPSS_CNL_SSP }, -/* TGL-H */ - {PCI_VDEVICE (INTEL ,0x43aa ),LPSS_CNL_SSP }, - {PCI_VDEVICE (INTEL ,0x43ab ),LPSS_CNL_SSP }, - {PCI_VDEVICE (INTEL ,0x43fb ),LPSS_CNL_SSP }, - {PCI_VDEVICE (INTEL ,0x43fd ),LPSS_CNL_SSP }, -/* ADL-P */ - {PCI_VDEVICE (INTEL ,0x51aa ),LPSS_CNL_SSP }, - {PCI_VDEVICE (INTEL ,0x51ab ),LPSS_CNL_SSP }, - {PCI_VDEVICE (INTEL ,0x51fb ),LPSS_CNL_SSP }, -/* ADL-M */ - {PCI_VDEVICE (INTEL ,0x54aa ),LPSS_CNL_SSP }, - {PCI_VDEVICE (INTEL ,0x54ab ),LPSS_CNL_SSP }, - {PCI_VDEVICE (INTEL ,0x54fb ),LPSS_CNL_SSP }, -/* APL */ - {PCI_VDEVICE (INTEL ,0x5ac2 ),LPSS_BXT_SSP }, - {PCI_VDEVICE (INTEL ,0x5ac4 ),LPSS_BXT_SSP }, - {PCI_VDEVICE (INTEL ,0x5ac6 ),LPSS_BXT_SSP }, -/* RPL-S */ - {PCI_VDEVICE (INTEL ,0x7a2a ),LPSS_CNL_SSP }, - {PCI_VDEVICE (INTEL ,0x7a2b ),LPSS_CNL_SSP }, - {PCI_VDEVICE (INTEL ,0x7a79 ),LPSS_CNL_SSP }, - {PCI_VDEVICE (INTEL ,0x7a7b ),LPSS_CNL_SSP }, -/* ADL-S */ - {PCI_VDEVICE (INTEL ,0x7aaa ),LPSS_CNL_SSP }, - {PCI_VDEVICE (INTEL ,0x7aab ),LPSS_CNL_SSP }, - {PCI_VDEVICE (INTEL ,0x7af9 ),LPSS_CNL_SSP }, - {PCI_VDEVICE (INTEL ,0x7afb ),LPSS_CNL_SSP }, -/* MTL-P */ - {PCI_VDEVICE (INTEL ,0x7e27 ),LPSS_CNL_SSP }, - {PCI_VDEVICE (INTEL ,0x7e30 ),LPSS_CNL_SSP }, - {PCI_VDEVICE (INTEL ,0x7e46 ),LPSS_CNL_SSP }, -/* CNL-LP */ - {PCI_VDEVICE (INTEL ,0x9daa ),LPSS_CNL_SSP }, - {PCI_VDEVICE (INTEL ,0x9dab ),LPSS_CNL_SSP }, - {PCI_VDEVICE (INTEL ,0x9dfb ),LPSS_CNL_SSP }, -/* CNL-H */ - {PCI_VDEVICE (INTEL ,0xa32a ),LPSS_CNL_SSP }, - {PCI_VDEVICE (INTEL ,0xa32b ),LPSS_CNL_SSP }, - {PCI_VDEVICE (INTEL ,0xa37b ),LPSS_CNL_SSP }, -/* CML-LP */ - {PCI_VDEVICE (INTEL ,0x02aa ),LPSS_CNL_SSP }, - {PCI_VDEVICE (INTEL ,0x02ab ),LPSS_CNL_SSP }, - {PCI_VDEVICE (INTEL ,0x02fb ),LPSS_CNL_SSP }, -/* CML-H */ - {PCI_VDEVICE (INTEL ,0x06aa ),LPSS_CNL_SSP }, - {PCI_VDEVICE (INTEL ,0x06ab ),LPSS_CNL_SSP }, - {PCI_VDEVICE (INTEL ,0x06fb ),LPSS_CNL_SSP }, -/* TGL-LP */ - {PCI_VDEVICE (INTEL ,0xa0aa ),LPSS_CNL_SSP }, - {PCI_VDEVICE (INTEL ,0xa0ab ),LPSS_CNL_SSP }, - {PCI_VDEVICE (INTEL ,0xa0de ),LPSS_CNL_SSP }, - {PCI_VDEVICE (INTEL ,0xa0df ),LPSS_CNL_SSP }, - {PCI_VDEVICE (INTEL ,0xa0fb ),LPSS_CNL_SSP }, - {PCI_VDEVICE (INTEL ,0xa0fd ),LPSS_CNL_SSP }, - {PCI_VDEVICE (INTEL ,0xa0fe ),LPSS_CNL_SSP }, - { }, -}; -static const struct of_device_id pxa2xx_spi_of_match[] = { { .compatible ="marvell,mmp2-ssp" , .data = (void *)MMP2_SSP }, {}, };MODULE_DEVICE_TABLE (of, pxa2xx_spi_of_match); -#ifdef CONFIG_PCI -static bool pxa2xx_spi_idma_filter (struct dma_chan *chan,void *param) {return param == chan->device->dev; } -#endif /* CONFIG_PCI */ -static struct pxa2xx_spi_controller *pxa2xx_spi_init_pdata (struct platform_device *pdev) {
@@ -1458,17 +1353,12 @@ pxa2xx_spi_init_pdata(struct platform_device *pdev)struct device *parent = dev->parent;struct ssp_device *ssp;struct resource *res; -struct pci_dev *pcidev =dev_is_pci (parent) ?to_pci_dev (parent) :NULL ; -const struct pci_device_id *pcidev_id =NULL ;u32 value =SSP_UNDEFINED ;enum pxa_ssp_type type;const void *match;int status;u64 uid; -if (pcidev) - pcidev_id =pci_match_id (pxa2xx_spi_pci_compound_match, pcidev); -/* Always try to read property */ device_property_read_u32 (&pdev->dev,"intel,spi-pxa2xx-type" , &value);
@@ -1477,8 +1367,6 @@ pxa2xx_spi_init_pdata(struct platform_device *pdev) type = (enum pxa_ssp_type )match; else if (value > SSP_UNDEFINED && value < SSP_MAX) type = (enum pxa_ssp_type )value; - else if (pcidev_id) - type = (enum pxa_ssp_type )pcidev_id->driver_data; else return ERR_PTR(-EINVAL);
@@ -1494,13 +1382,12 @@ pxa2xx_spi_init_pdata(struct platform_device *pdev) ssp->phys_base = res->start; -#ifdef CONFIG_PCI -if (pcidev_id) { +/* Platforms with iDMA 64-bit */ +if (platform_get_resource_byname (pdev,IORESOURCE_MEM ,"lpss_priv" )) { pdata->tx_param = parent; pdata->rx_param = parent; pdata->dma_filter = pxa2xx_spi_idma_filter; } -#endif ssp->clk =devm_clk_get (&pdev->dev,NULL );if (IS_ERR (ssp->clk))
Signature · 1 line
2.35.1
Andy Shevchenko
reviewerPATCH v3 3/5 spi: pxa2xx: Remove no more needed driver data
In reply to Andy ShevchenkoSince the ACPI enumerated devices provide a property with SSP type, there is no more necessity to bear the copy of them in the ID table. Drop the driver data in ACPI ID table.
--- drivers/spi/spi-pxa2xx.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/spi/spi-pxa2xx.c +6 -6
@@ -1323,12 +1323,12 @@ static void cleanup(struct spi_device *spi)#ifdef CONFIG_ACPI static const struct acpi_device_id pxa2xx_spi_acpi_match[] = { - {"INT33C0" ,LPSS_LPT_SSP }, - {"INT33C1" ,LPSS_LPT_SSP }, - {"INT3430" ,LPSS_LPT_SSP }, - {"INT3431" ,LPSS_LPT_SSP }, - {"80860F0E" ,LPSS_BYT_SSP }, - {"8086228E" ,LPSS_BSW_SSP }, + {"INT33C0" }, + {"INT33C1" }, + {"INT3430" }, + {"INT3431" }, + {"80860F0E" }, + {"8086228E" }, { }, };MODULE_DEVICE_TABLE (acpi, pxa2xx_spi_acpi_match);
Signature · 1 line
2.35.1
Andy Shevchenko
reviewerPATCH v3 4/5 spi: pxa2xx: Move OF and ACPI ID tables closer to their user
In reply to Andy ShevchenkoThere is no code that uses ID tables directly, except the struct device_driver at the end of the file. Hence, move tables closer to its user. It's always possible to access them via pointer to a platform device.
--- drivers/spi/spi-pxa2xx.c | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-)
drivers/spi/spi-pxa2xx.c +19 -19
@@ -1321,25 +1321,6 @@ static void cleanup(struct spi_device *spi)kfree (chip); } -#ifdef CONFIG_ACPI -static const struct acpi_device_id pxa2xx_spi_acpi_match[] = { - {"INT33C0" }, - {"INT33C1" }, - {"INT3430" }, - {"INT3431" }, - {"80860F0E" }, - {"8086228E" }, - { }, -}; -MODULE_DEVICE_TABLE (acpi, pxa2xx_spi_acpi_match); -#endif - -static const struct of_device_id pxa2xx_spi_of_match[] = { - { .compatible ="marvell,mmp2-ssp" , .data = (void *)MMP2_SSP }, - {}, -}; -MODULE_DEVICE_TABLE (of, pxa2xx_spi_of_match); -static bool pxa2xx_spi_idma_filter (struct dma_chan *chan,void *param) {return param == chan->device->dev;
@@ -1759,6 +1740,25 @@ static const struct dev_pm_ops pxa2xx_spi_pm_ops = { pxa2xx_spi_runtime_resume, NULL) }; +#ifdef CONFIG_ACPI +static const struct acpi_device_id pxa2xx_spi_acpi_match[] = { + {"80860F0E" }, + {"8086228E" }, + {"INT33C0" }, + {"INT33C1" }, + {"INT3430" }, + {"INT3431" }, + {} +}; +MODULE_DEVICE_TABLE (acpi, pxa2xx_spi_acpi_match); +#endif + +static const struct of_device_id pxa2xx_spi_of_match[] = { + { .compatible ="marvell,mmp2-ssp" , .data = (void *)MMP2_SSP }, + {} +}; +MODULE_DEVICE_TABLE (of, pxa2xx_spi_of_match); +static struct platform_driver driver = { .driver = { .name ="pxa2xx-spi" ,
Signature · 1 line
2.35.1
Andy Shevchenko
reviewerPATCH v3 5/5 spi: pxa2xx: Switch from PM ifdeffery to pm_ptr()
In reply to Andy ShevchenkoCleaning up the driver to use pm_ptr() macro instead of ifdeffery that makes it simpler and allows the compiler to remove those functions if built without CONFIG_PM and CONFIG_PM_SLEEP support.
--- drivers/spi/spi-pxa2xx.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-)
drivers/spi/spi-pxa2xx.c +3 -8
@@ -1680,7 +1680,6 @@ static int pxa2xx_spi_remove(struct platform_device *pdev)return 0 ; } -#ifdef CONFIG_PM_SLEEP static int pxa2xx_spi_suspend (struct device *dev) {struct driver_data *drv_data =dev_get_drvdata (dev);
@@ -1715,9 +1714,7 @@ static int pxa2xx_spi_resume(struct device *dev)/* Start the queue running */ return spi_controller_resume (drv_data->controller); } -#endif -#ifdef CONFIG_PM static int pxa2xx_spi_runtime_suspend (struct device *dev) {struct driver_data *drv_data =dev_get_drvdata (dev);
@@ -1732,12 +1729,10 @@ static int pxa2xx_spi_runtime_resume(struct device *dev)return clk_prepare_enable (drv_data->ssp->clk); } -#endif static const struct dev_pm_ops pxa2xx_spi_pm_ops = { - SET_SYSTEM_SLEEP_PM_OPS(pxa2xx_spi_suspend, pxa2xx_spi_resume) -SET_RUNTIME_PM_OPS (pxa2xx_spi_runtime_suspend, - pxa2xx_spi_runtime_resume,NULL ) + SYSTEM_SLEEP_PM_OPS(pxa2xx_spi_suspend, pxa2xx_spi_resume) +RUNTIME_PM_OPS (pxa2xx_spi_runtime_suspend, pxa2xx_spi_runtime_resume,NULL ) };#ifdef CONFIG_ACPI
@@ -1762,7 +1757,7 @@ MODULE_DEVICE_TABLE(of, pxa2xx_spi_of_match);static struct platform_driver driver = { .driver = { .name ="pxa2xx-spi" , - .pm = &pxa2xx_spi_pm_ops, + .pm =pm_ptr (&pxa2xx_spi_pm_ops), .acpi_match_table =ACPI_PTR (pxa2xx_spi_acpi_match), .of_match_table =of_match_ptr (pxa2xx_spi_of_match), },
Signature · 1 line
2.35.1