[PATCH 0/2] Some fixes for spi-altera

[PATCH 0/2] Some fixes for spi-altera

[Xu Yilun]

Two fixes for indirect access support patchset.

Xu Yilun (2):
  spi: altera: fix driver matching failure of the device ID "spi_altera"
  spi: altera: fix module autoload

 drivers/spi/spi-altera.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

-- 
2.7.4

[PATCH 1/2] spi: altera: fix driver matching failure of the device ID "spi_altera"

[Xu Yilun]

The driver is expected to support device ID "spi_altera" for MMIO accessed
devices, device ID "subdev_spi_altera" for indirect accessed devices. But
the platform bus will not try driver name match anymore if the platform
driver has an id_table. So the "spi_altera" should also be added to
id_table.

Signed-off-by: Xu Yilun <yilun.xu@intel.com>
Signed-off-by: Russ Weight <russell.h.weight@intel.com>
---
 drivers/spi/spi-altera.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/spi/spi-altera.c b/drivers/spi/spi-altera.c
index d91c093..e272a04 100644
--- a/drivers/spi/spi-altera.c
+++ b/drivers/spi/spi-altera.c
@@ -352,7 +352,8 @@ MODULE_DEVICE_TABLE(of, altera_spi_match);
 #endif /* CONFIG_OF */
 
 static const struct platform_device_id altera_spi_ids[] = {
-	{ "subdev_spi_altera", ALTERA_SPI_TYPE_SUBDEV },
+	{ DRV_NAME,		ALTERA_SPI_TYPE_UNKNOWN },
+	{ "subdev_spi_altera",	ALTERA_SPI_TYPE_SUBDEV },
 	{ }
 };
 
-- 
2.7.4

[PATCH 2/2] spi: altera: fix module autoload

[Xu Yilun]

Add the MODULE_DEVICE_TABLE macro for the platform_device_id table to
allow proper creation of modalias strings and fix autoloading module for
this driver.

Signed-off-by: Xu Yilun <yilun.xu@intel.com>
Signed-off-by: Russ Weight <russell.h.weight@intel.com>
---
 drivers/spi/spi-altera.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/spi/spi-altera.c b/drivers/spi/spi-altera.c
index e272a04..809bfff 100644
--- a/drivers/spi/spi-altera.c
+++ b/drivers/spi/spi-altera.c
@@ -356,6 +356,7 @@ static const struct platform_device_id altera_spi_ids[] = {
 	{ "subdev_spi_altera",	ALTERA_SPI_TYPE_SUBDEV },
 	{ }
 };
+MODULE_DEVICE_TABLE(platform, altera_spi_ids);
 
 static struct platform_driver altera_spi_driver = {
 	.probe = altera_spi_probe,
-- 
2.7.4

Re: [PATCH 0/2] Some fixes for spi-altera

[Mark Brown]

On Wed, 24 Jun 2020 09:31:24 +0800, Xu Yilun wrote:
> Two fixes for indirect access support patchset.
> 
> Xu Yilun (2):
>   spi: altera: fix driver matching failure of the device ID "spi_altera"
>   spi: altera: fix module autoload
> 
>  drivers/spi/spi-altera.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)

Applied to

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git for-next

Thanks!

[1/2] spi: altera: fix driver matching failure of the device ID "spi_altera"
      commit: de5fd9cb6a3f89a1ac8f27883d029f823112243f
[2/2] spi: altera: fix module autoload
      commit: 1ac6f21a948b45a49737a5eff6b4dae9f37a8dc0

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark