iio: ping: set pa_laser_ping_cfg in of_ping_match

PATCH Applied YueHaibing 3 participants 4 messages Mar 4, 2020 – Mar 10, 2020

Subsystems (2)

IIO Parallax ping IIO sensor driver

lore

Share & tools

lore

YueHaibing

author

2020-03-04 11:35 UTC #0 lore raw

PATCH 1/1 iio: ping: set pa_laser_ping_cfg in of_ping_match

pa_laser_ping_cfg should be set in of_ping_match
instead of pa_ping_cfg.

Fixes 7bb501f49ddb ("iio: ping: add parallax ping sensors")

Signed-off-by YueHaibing <[email protected]>

---
 drivers/iio/proximity/ping.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

drivers/iio/proximity/ping.c +1 -1

index 34aff10..12b893c 100644
@@ -269,7 +269,7 @@ static const struct iio_chan_spec ping_chan_spec[] = {
 
 static const struct of_device_id of_ping_match[] = {
 	{ .compatible = "parallax,ping", .data = &pa_ping_cfg},
-	{ .compatible = "parallax,laserping", .data = &pa_ping_cfg},
+	{ .compatible = "parallax,laserping", .data = &pa_laser_ping_cfg},
 	{},
 };

Signature · 1 line

2.7.4

Andreas Klinger

maintainer Acked-by on v1 1/1

2020-03-04 11:56 UTC #1 lore raw

Acked-by Andreas Klinger <[email protected]>

YueHaibing <[email protected]> schrieb am Mi, 04. Mär 19:34:

Quoted 26 lines

pa_laser_ping_cfg should be set in of_ping_match
instead of pa_ping_cfg.
Fixes 7bb501f49ddb ("iio: ping: add parallax ping sensors")
Signed-off-by YueHaibing <[email protected]>
---
 drivers/iio/proximity/ping.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/proximity/ping.c +1 -1
index 34aff10..12b893c 100644
@@ -269,7 +269,7 @@ static const struct iio_chan_spec ping_chan_spec[] = {
 
 static const struct of_device_id of_ping_match[] = {
 	{ .compatible = "parallax,ping", .data = &pa_ping_cfg},
-	{ .compatible = "parallax,laserping", .data = &pa_ping_cfg},
+	{ .compatible = "parallax,laserping", .data = &pa_laser_ping_cfg},
 	{},
 };
 
Signature · 1 line
2.7.4

Jonathan Cameron

maintainer Applied

2020-03-07 15:30 UTC #2 lore raw

Quoted 1 line · On Wed, 4 Mar 2020 12:55:46 +0100 Andreas Klinger <[email protected]> wrote:

Acked-by Andreas Klinger <[email protected]>

Applied to the fixes-togreg branch of iio.git.

Btw this is also in mainline I believe, so the -next is probably an inappropriate marking.

Thanks,

Jonathan

Quoted 28 lines

YueHaibing <[email protected]> schrieb am Mi, 04. Mär 19:34:
Quoted 26 lines
pa_laser_ping_cfg should be set in of_ping_match
instead of pa_ping_cfg.
Fixes 7bb501f49ddb ("iio: ping: add parallax ping sensors")
Signed-off-by YueHaibing <[email protected]>
---
 drivers/iio/proximity/ping.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/proximity/ping.c +1 -1
index 34aff10..12b893c 100644
@@ -269,7 +269,7 @@ static const struct iio_chan_spec ping_chan_spec[] = {
 
 static const struct of_device_id of_ping_match[] = {
 	{ .compatible = "parallax,ping", .data = &pa_ping_cfg},
-	{ .compatible = "parallax,laserping", .data = &pa_ping_cfg},
+	{ .compatible = "parallax,laserping", .data = &pa_laser_ping_cfg},
 	{},
 };
 
Signature · 1 line
2.7.4

Yuehaibing

author

2020-03-10 13:42 UTC #3 lore raw

Quoted 8 lines · Jonathan Cameron

Quoted 1 line · On Wed, 4 Mar 2020 12:55:46 +0100 Andreas Klinger <[email protected]> wrote:
Acked-by Andreas Klinger <[email protected]>
Applied to the fixes-togreg branch of iio.git.
Btw this is also in mainline I believe, so the -next is probably an inappropriate marking.

Got it, will notice this next time, thanks!

Quoted 37 lines

Thanks,
Jonathan
Quoted 24 lines
YueHaibing <[email protected]> schrieb am Mi, 04. Mär 19:34:
Quoted 22 lines
pa_laser_ping_cfg should be set in of_ping_match
instead of pa_ping_cfg.
Fixes 7bb501f49ddb ("iio: ping: add parallax ping sensors")
Signed-off-by YueHaibing <[email protected]>
---
 drivers/iio/proximity/ping.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/proximity/ping.c +1 -1
index 34aff10..12b893c 100644
@@ -269,7 +269,7 @@ static const struct iio_chan_spec ping_chan_spec[] = {
 
 static const struct of_device_id of_ping_match[] = {
 	{ .compatible = "parallax,ping", .data = &pa_ping_cfg},
-	{ .compatible = "parallax,laserping", .data = &pa_ping_cfg},
+	{ .compatible = "parallax,laserping", .data = &pa_laser_ping_cfg},
 	{},
 };
 
Quoted 4 lines
Quoted 4 lines
Signature · 1 line
2.7.4
.