Hello,
This patch series fixes a module alias issue with the five recently added panel drivers used by omapdrm.
Before those panel drivers, omapdrm had custom drivers for the panels, and prefixed the OF compatible strings with an "omapdss," prefix. The SPI device IDs are constructed by stripping the OF compatible string from the prefix, resulting in the "omapdss," prefix being removed, but the subsequence OF vendor prefix being kept. The SPI drivers thus had modules aliases that contained the vendor prefix.
Now that the panels are supported by standard drivers and the "omapdss," prefix is removed, the SPI device IDs are stripped from the OF vendor prefix. As the new panel drivers copied the module aliases from the omapdrm-specific drivers, they contain the vendor prefix in their SPI module aliases, and are thus not loaded automatically.
Fix this by removing the vendor prefix from the SPI modules aliases in the drivers. For consistency reason, the manual module aliases are also moved to use an SPI module table.
These patches are based on the drm-misc-fixes branch as they fix v5.4 regressions.
Laurent Pinchart (5): drm/panel: lg-lb035q02: Fix SPI alias drm/panel: nec-nl8048hl11: Fix SPI alias drm/panel: sony-acx565akm: Fix SPI alias drm/panel: tpo-td028ttec1: Fix SPI alias drm/panel: tpo-td043mtea1: Fix SPI alias
drivers/gpu/drm/panel/panel-lg-lb035q02.c | 9 ++++++++- drivers/gpu/drm/panel/panel-nec-nl8048hl11.c | 9 ++++++++- drivers/gpu/drm/panel/panel-sony-acx565akm.c | 9 ++++++++- drivers/gpu/drm/panel/panel-tpo-td028ttec1.c | 3 +-- drivers/gpu/drm/panel/panel-tpo-td043mtea1.c | 9 ++++++++- 5 files changed, 33 insertions(+), 6 deletions(-)
The panel-lg-lb035q02 driver incorrectly includes the OF vendor prefix in its SPI alias. Fix it, and move the manual alias to an SPI module device table.
Fixes: f5b0c6542476 ("drm/panel: Add driver for the LG Philips LB035Q02 panel") Reported-by: H. Nikolaus Schaller hns@goldelico.com Signed-off-by: Laurent Pinchart laurent.pinchart@ideasonboard.com --- drivers/gpu/drm/panel/panel-lg-lb035q02.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/panel/panel-lg-lb035q02.c b/drivers/gpu/drm/panel/panel-lg-lb035q02.c index fc82a525b071..ee4379729a5b 100644 --- a/drivers/gpu/drm/panel/panel-lg-lb035q02.c +++ b/drivers/gpu/drm/panel/panel-lg-lb035q02.c @@ -220,9 +220,17 @@ static const struct of_device_id lb035q02_of_match[] = {
MODULE_DEVICE_TABLE(of, lb035q02_of_match);
+static const struct spi_device_id lb035q02_ids[] = { + { "lb035q02", 0 }, + { /* sentinel */ } +}; + +MODULE_DEVICE_TABLE(spi, lb035q02_ids); + static struct spi_driver lb035q02_driver = { .probe = lb035q02_probe, .remove = lb035q02_remove, + .id_table = lb035q02_ids, .driver = { .name = "panel-lg-lb035q02", .of_match_table = lb035q02_of_match, @@ -231,7 +239,6 @@ static struct spi_driver lb035q02_driver = {
module_spi_driver(lb035q02_driver);
-MODULE_ALIAS("spi:lgphilips,lb035q02"); MODULE_AUTHOR("Tomi Valkeinen tomi.valkeinen@ti.com"); MODULE_DESCRIPTION("LG.Philips LB035Q02 LCD Panel driver"); MODULE_LICENSE("GPL");
The panel-nec-nl8048hl11 driver incorrectly includes the OF vendor prefix in its SPI alias. Fix it, and move the manual alias to an SPI module device table.
Fixes: df439abe6501 ("drm/panel: Add driver for the NEC NL8048HL11 panel") Reported-by: H. Nikolaus Schaller hns@goldelico.com Signed-off-by: Laurent Pinchart laurent.pinchart@ideasonboard.com --- drivers/gpu/drm/panel/panel-nec-nl8048hl11.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/panel/panel-nec-nl8048hl11.c b/drivers/gpu/drm/panel/panel-nec-nl8048hl11.c index 299b217c83e1..20f17e46e65d 100644 --- a/drivers/gpu/drm/panel/panel-nec-nl8048hl11.c +++ b/drivers/gpu/drm/panel/panel-nec-nl8048hl11.c @@ -230,9 +230,17 @@ static const struct of_device_id nl8048_of_match[] = {
MODULE_DEVICE_TABLE(of, nl8048_of_match);
+static const struct spi_device_id nl8048_ids[] = { + { "nl8048hl11", 0 }, + { /* sentinel */ } +}; + +MODULE_DEVICE_TABLE(spi, nl8048_ids); + static struct spi_driver nl8048_driver = { .probe = nl8048_probe, .remove = nl8048_remove, + .id_table = nl8048_ids, .driver = { .name = "panel-nec-nl8048hl11", .pm = &nl8048_pm_ops, @@ -242,7 +250,6 @@ static struct spi_driver nl8048_driver = {
module_spi_driver(nl8048_driver);
-MODULE_ALIAS("spi:nec,nl8048hl11"); MODULE_AUTHOR("Erik Gilling konkers@android.com"); MODULE_DESCRIPTION("NEC-NL8048HL11 Driver"); MODULE_LICENSE("GPL");
The panel-sony-acx565akm driver incorrectly includes the OF vendor prefix in its SPI alias. Fix it, and move the manual alias to an SPI module device table.
Fixes: 1c8fc3f0c5d2 ("drm/panel: Add driver for the Sony ACX565AKM panel") Reported-by: H. Nikolaus Schaller hns@goldelico.com Signed-off-by: Laurent Pinchart laurent.pinchart@ideasonboard.com --- drivers/gpu/drm/panel/panel-sony-acx565akm.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/panel/panel-sony-acx565akm.c b/drivers/gpu/drm/panel/panel-sony-acx565akm.c index 305259b58767..3d5b9c4f68d9 100644 --- a/drivers/gpu/drm/panel/panel-sony-acx565akm.c +++ b/drivers/gpu/drm/panel/panel-sony-acx565akm.c @@ -684,9 +684,17 @@ static const struct of_device_id acx565akm_of_match[] = {
MODULE_DEVICE_TABLE(of, acx565akm_of_match);
+static const struct spi_device_id acx565akm_ids[] = { + { "acx565akm", 0 }, + { /* sentinel */ } +}; + +MODULE_DEVICE_TABLE(spi, acx565akm_ids); + static struct spi_driver acx565akm_driver = { .probe = acx565akm_probe, .remove = acx565akm_remove, + .id_table = acx565akm_ids, .driver = { .name = "panel-sony-acx565akm", .of_match_table = acx565akm_of_match, @@ -695,7 +703,6 @@ static struct spi_driver acx565akm_driver = {
module_spi_driver(acx565akm_driver);
-MODULE_ALIAS("spi:sony,acx565akm"); MODULE_AUTHOR("Nokia Corporation"); MODULE_DESCRIPTION("Sony ACX565AKM LCD Panel Driver"); MODULE_LICENSE("GPL");
The panel-tpo-td028ttec1 driver incorrectly includes the OF vendor prefix in its SPI alias. Fix it.
Fixes: 415b8dd08711 ("drm/panel: Add driver for the Toppoly TD028TTEC1 panel") Reported-by: H. Nikolaus Schaller hns@goldelico.com Signed-off-by: Laurent Pinchart laurent.pinchart@ideasonboard.com --- drivers/gpu/drm/panel/panel-tpo-td028ttec1.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/panel/panel-tpo-td028ttec1.c b/drivers/gpu/drm/panel/panel-tpo-td028ttec1.c index d7b2e34626ef..f2baff827f50 100644 --- a/drivers/gpu/drm/panel/panel-tpo-td028ttec1.c +++ b/drivers/gpu/drm/panel/panel-tpo-td028ttec1.c @@ -375,8 +375,7 @@ static const struct of_device_id td028ttec1_of_match[] = { MODULE_DEVICE_TABLE(of, td028ttec1_of_match);
static const struct spi_device_id td028ttec1_ids[] = { - { "tpo,td028ttec1", 0}, - { "toppoly,td028ttec1", 0 }, + { "td028ttec1", 0 }, { /* sentinel */ } };
On Mon, 7 Oct 2019 20:08:00 +0300 Laurent Pinchart laurent.pinchart@ideasonboard.com wrote:
The panel-tpo-td028ttec1 driver incorrectly includes the OF vendor prefix in its SPI alias. Fix it.
Fixes: 415b8dd08711 ("drm/panel: Add driver for the Toppoly TD028TTEC1 panel") Reported-by: H. Nikolaus Schaller hns@goldelico.com Signed-off-by: Laurent Pinchart laurent.pinchart@ideasonboard.com
Tested-by: Andreas Kemnade andreas@kemnade.info
drivers/gpu/drm/panel/panel-tpo-td028ttec1.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/panel/panel-tpo-td028ttec1.c b/drivers/gpu/drm/panel/panel-tpo-td028ttec1.c index d7b2e34626ef..f2baff827f50 100644 --- a/drivers/gpu/drm/panel/panel-tpo-td028ttec1.c +++ b/drivers/gpu/drm/panel/panel-tpo-td028ttec1.c @@ -375,8 +375,7 @@ static const struct of_device_id td028ttec1_of_match[] = { MODULE_DEVICE_TABLE(of, td028ttec1_of_match);
static const struct spi_device_id td028ttec1_ids[] = {
- { "tpo,td028ttec1", 0},
- { "toppoly,td028ttec1", 0 },
- { "td028ttec1", 0 }, { /* sentinel */ }
};
Am 07.10.2019 um 19:58 schrieb Andreas Kemnade andreas@kemnade.info:
On Mon, 7 Oct 2019 20:08:00 +0300 Laurent Pinchart laurent.pinchart@ideasonboard.com wrote:
The panel-tpo-td028ttec1 driver incorrectly includes the OF vendor prefix in its SPI alias. Fix it.
Fixes: 415b8dd08711 ("drm/panel: Add driver for the Toppoly TD028TTEC1 panel") Reported-by: H. Nikolaus Schaller hns@goldelico.com Signed-off-by: Laurent Pinchart laurent.pinchart@ideasonboard.com
Tested-by: Andreas Kemnade andreas@kemnade.info
Tested-by: H. Nikolaus Schaller hns@goldelico.com
drivers/gpu/drm/panel/panel-tpo-td028ttec1.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/panel/panel-tpo-td028ttec1.c b/drivers/gpu/drm/panel/panel-tpo-td028ttec1.c index d7b2e34626ef..f2baff827f50 100644 --- a/drivers/gpu/drm/panel/panel-tpo-td028ttec1.c +++ b/drivers/gpu/drm/panel/panel-tpo-td028ttec1.c @@ -375,8 +375,7 @@ static const struct of_device_id td028ttec1_of_match[] = { MODULE_DEVICE_TABLE(of, td028ttec1_of_match);
static const struct spi_device_id td028ttec1_ids[] = {
- { "tpo,td028ttec1", 0},
- { "toppoly,td028ttec1", 0 },
- { "td028ttec1", 0 }, { /* sentinel */ }
};
The panel-tpo-td043mtea1 driver incorrectly includes the OF vendor prefix in its SPI alias. Fix it, and move the manual alias to an SPI module device table.
Fixes: dc2e1e5b2799 ("drm/panel: Add driver for the Toppoly TD043MTEA1 panel") Reported-by: H. Nikolaus Schaller hns@goldelico.com Signed-off-by: Laurent Pinchart laurent.pinchart@ideasonboard.com --- drivers/gpu/drm/panel/panel-tpo-td043mtea1.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/panel/panel-tpo-td043mtea1.c b/drivers/gpu/drm/panel/panel-tpo-td043mtea1.c index 84370562910f..ba163c779084 100644 --- a/drivers/gpu/drm/panel/panel-tpo-td043mtea1.c +++ b/drivers/gpu/drm/panel/panel-tpo-td043mtea1.c @@ -491,9 +491,17 @@ static const struct of_device_id td043mtea1_of_match[] = {
MODULE_DEVICE_TABLE(of, td043mtea1_of_match);
+static const struct spi_device_id td043mtea1_ids[] = { + { "td043mtea1", 0 }, + { /* sentinel */ } +}; + +MODULE_DEVICE_TABLE(spi, td043mtea1_ids); + static struct spi_driver td043mtea1_driver = { .probe = td043mtea1_probe, .remove = td043mtea1_remove, + .id_table = td043mtea1_ids, .driver = { .name = "panel-tpo-td043mtea1", .pm = &td043mtea1_pm_ops, @@ -503,7 +511,6 @@ static struct spi_driver td043mtea1_driver = {
module_spi_driver(td043mtea1_driver);
-MODULE_ALIAS("spi:tpo,td043mtea1"); MODULE_AUTHOR("Gražvydas Ignotas notasas@gmail.com"); MODULE_DESCRIPTION("TPO TD043MTEA1 Panel Driver"); MODULE_LICENSE("GPL");
Am 07.10.2019 um 19:08 schrieb Laurent Pinchart laurent.pinchart@ideasonboard.com:
The panel-tpo-td043mtea1 driver incorrectly includes the OF vendor prefix in its SPI alias. Fix it, and move the manual alias to an SPI module device table.
Fixes: dc2e1e5b2799 ("drm/panel: Add driver for the Toppoly TD043MTEA1 panel") Reported-by: H. Nikolaus Schaller hns@goldelico.com Signed-off-by: Laurent Pinchart laurent.pinchart@ideasonboard.com
Tested-by: H. Nikolaus Schaller hns@goldelico.com # OpenPandora
drivers/gpu/drm/panel/panel-tpo-td043mtea1.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/panel/panel-tpo-td043mtea1.c b/drivers/gpu/drm/panel/panel-tpo-td043mtea1.c index 84370562910f..ba163c779084 100644 --- a/drivers/gpu/drm/panel/panel-tpo-td043mtea1.c +++ b/drivers/gpu/drm/panel/panel-tpo-td043mtea1.c @@ -491,9 +491,17 @@ static const struct of_device_id td043mtea1_of_match[] = {
MODULE_DEVICE_TABLE(of, td043mtea1_of_match);
+static const struct spi_device_id td043mtea1_ids[] = {
- { "td043mtea1", 0 },
- { /* sentinel */ }
+};
+MODULE_DEVICE_TABLE(spi, td043mtea1_ids);
static struct spi_driver td043mtea1_driver = { .probe = td043mtea1_probe, .remove = td043mtea1_remove,
- .id_table = td043mtea1_ids, .driver = { .name = "panel-tpo-td043mtea1", .pm = &td043mtea1_pm_ops,
@@ -503,7 +511,6 @@ static struct spi_driver td043mtea1_driver = {
module_spi_driver(td043mtea1_driver);
-MODULE_ALIAS("spi:tpo,td043mtea1"); MODULE_AUTHOR("Gražvydas Ignotas notasas@gmail.com"); MODULE_DESCRIPTION("TPO TD043MTEA1 Panel Driver"); MODULE_LICENSE("GPL"); -- Regards,
Laurent Pinchart
Hi Laurent. On Mon, Oct 07, 2019 at 08:07:56PM +0300, Laurent Pinchart wrote:
Hello,
This patch series fixes a module alias issue with the five recently added panel drivers used by omapdrm.
Before those panel drivers, omapdrm had custom drivers for the panels, and prefixed the OF compatible strings with an "omapdss," prefix. The SPI device IDs are constructed by stripping the OF compatible string from the prefix, resulting in the "omapdss," prefix being removed, but the subsequence OF vendor prefix being kept. The SPI drivers thus had modules aliases that contained the vendor prefix.
Now that the panels are supported by standard drivers and the "omapdss," prefix is removed, the SPI device IDs are stripped from the OF vendor prefix. As the new panel drivers copied the module aliases from the omapdrm-specific drivers, they contain the vendor prefix in their SPI module aliases, and are thus not loaded automatically.
Fix this by removing the vendor prefix from the SPI modules aliases in the drivers. For consistency reason, the manual module aliases are also moved to use an SPI module table.
Good explanation - thanks.
These patches are based on the drm-misc-fixes branch as they fix v5.4 regressions.
Laurent Pinchart (5): drm/panel: lg-lb035q02: Fix SPI alias drm/panel: nec-nl8048hl11: Fix SPI alias drm/panel: sony-acx565akm: Fix SPI alias drm/panel: tpo-td028ttec1: Fix SPI alias drm/panel: tpo-td043mtea1: Fix SPI alias
Full series is: Acked-by: Sam Ravnborg sam@ravnborg.org
I expect someone else to pick them up or that you apply them.
Sam
Hi Sam,
On Mon, Oct 07, 2019 at 07:22:56PM +0200, Sam Ravnborg wrote:
Hi Laurent. On Mon, Oct 07, 2019 at 08:07:56PM +0300, Laurent Pinchart wrote:
Hello,
This patch series fixes a module alias issue with the five recently added panel drivers used by omapdrm.
Before those panel drivers, omapdrm had custom drivers for the panels, and prefixed the OF compatible strings with an "omapdss," prefix. The SPI device IDs are constructed by stripping the OF compatible string from the prefix, resulting in the "omapdss," prefix being removed, but the subsequence OF vendor prefix being kept. The SPI drivers thus had modules aliases that contained the vendor prefix.
Now that the panels are supported by standard drivers and the "omapdss," prefix is removed, the SPI device IDs are stripped from the OF vendor prefix. As the new panel drivers copied the module aliases from the omapdrm-specific drivers, they contain the vendor prefix in their SPI module aliases, and are thus not loaded automatically.
Fix this by removing the vendor prefix from the SPI modules aliases in the drivers. For consistency reason, the manual module aliases are also moved to use an SPI module table.
Good explanation - thanks.
These patches are based on the drm-misc-fixes branch as they fix v5.4 regressions.
Laurent Pinchart (5): drm/panel: lg-lb035q02: Fix SPI alias drm/panel: nec-nl8048hl11: Fix SPI alias drm/panel: sony-acx565akm: Fix SPI alias drm/panel: tpo-td028ttec1: Fix SPI alias drm/panel: tpo-td043mtea1: Fix SPI alias
Full series is: Acked-by: Sam Ravnborg sam@ravnborg.org
I expect someone else to pick them up or that you apply them.
I'd like someone to test the patches first if possible :-) Tomi, could you then pick these up as v5.4 fixes ?
On 07/10/2019 20:22, Sam Ravnborg wrote:
Hi Laurent. On Mon, Oct 07, 2019 at 08:07:56PM +0300, Laurent Pinchart wrote:
Hello,
This patch series fixes a module alias issue with the five recently added panel drivers used by omapdrm.
Before those panel drivers, omapdrm had custom drivers for the panels, and prefixed the OF compatible strings with an "omapdss," prefix. The SPI device IDs are constructed by stripping the OF compatible string from the prefix, resulting in the "omapdss," prefix being removed, but the subsequence OF vendor prefix being kept. The SPI drivers thus had modules aliases that contained the vendor prefix.
Now that the panels are supported by standard drivers and the "omapdss," prefix is removed, the SPI device IDs are stripped from the OF vendor prefix. As the new panel drivers copied the module aliases from the omapdrm-specific drivers, they contain the vendor prefix in their SPI module aliases, and are thus not loaded automatically.
Fix this by removing the vendor prefix from the SPI modules aliases in the drivers. For consistency reason, the manual module aliases are also moved to use an SPI module table.
Good explanation - thanks.
These patches are based on the drm-misc-fixes branch as they fix v5.4 regressions.
Laurent Pinchart (5): drm/panel: lg-lb035q02: Fix SPI alias drm/panel: nec-nl8048hl11: Fix SPI alias drm/panel: sony-acx565akm: Fix SPI alias drm/panel: tpo-td028ttec1: Fix SPI alias drm/panel: tpo-td043mtea1: Fix SPI alias
Full series is: Acked-by: Sam Ravnborg sam@ravnborg.org
I expect someone else to pick them up or that you apply them.
Thanks! I've pushed these to drm-misc-fixes.
Tomi
Hi,
On Mon, Oct 07, 2019 at 08:07:56PM +0300, Laurent Pinchart wrote:
This patch series fixes a module alias issue with the five recently added panel drivers used by omapdrm.
For the whole series:
Reviewed-by: Sebastian Reichel sebastian.reichel@collabora.com
-- Sebastian
dri-devel@lists.freedesktop.org
-
Andreas Kemnade -
H. Nikolaus Schaller -
Laurent Pinchart -
Sam Ravnborg -
Sebastian Reichel -
Tomi Valkeinen