media: vidtv: add media controller support
Subsystems (2)
Daniel W. S. Almeida
maintainerv2 cover media: vidtv: add media controller support
From: "Daniel W. S. Almeida" <[email protected]>
This series adds media controller support for vidtv so that we can support this driver at the test-media script in v4l-utils.
I based my implementation on vim2m's.
changes in v2:
added missing #ifdef that otherwise prevented this code from compilling if CONFIG_MEDIA_CONTROLLER_DVB was not set.
Daniel W. S. Almeida (4):
media: vidtv: Add media controller support
media: vidtv: reinstate sysfs bind attrs
media: vidtv: use a simpler name in platform_{device|driver}
media: vidtv: print message when driver is removed
.../media/test-drivers/vidtv/vidtv_bridge.c | 34 +++++++++++++++++-- .../media/test-drivers/vidtv/vidtv_bridge.h | 7 ++++ 2 files changed, 38 insertions(+), 3 deletions(-)
Signature · 6 lines
2.30.0 _______________________________________________ Linux-kernel-mentees mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees
Daniel W. S. Almeida
maintainerPATCH v2 1/4 media: vidtv: Add media controller support
From: "Daniel W. S. Almeida" <[email protected]>
Add media controller support when CONFIG_MEDIA_CONTROLLER_DVB is set so that, in the future, a test sequence in v4l-utils can be written without having to know which /dev/fooX device should be used.
--- .../media/test-drivers/vidtv/vidtv_bridge.c | 28 +++++++++++++++++++ .../media/test-drivers/vidtv/vidtv_bridge.h | 6 ++++ 2 files changed, 34 insertions(+)
drivers/media/test-drivers/vidtv/vidtv_bridge.c +28 -0
@@ -17,6 +17,8 @@#include <linux/time.h> #include <linux/types.h> #include <linux/workqueue.h> +#include <media/dvbdev.h> +#include <media/media-device.h> #include "vidtv_bridge.h" #include "vidtv_common.h"
@@ -501,9 +503,30 @@ static int vidtv_bridge_probe(struct platform_device *pdev)platform_set_drvdata (pdev, dvb); +#ifdef CONFIG_MEDIA_CONTROLLER_DVB + dvb->mdev.dev = &pdev->dev; + +strscpy (dvb->mdev.model,"vidtv" ,sizeof (dvb->mdev.model)); +strscpy (dvb->mdev.bus_info,"platform:vidtv" ,sizeof (dvb->mdev.bus_info)); + +media_device_init (&dvb->mdev); + ret =media_device_register (&dvb->mdev); +if (ret) { +dev_err (dvb->mdev.dev, +"media device register failed (err=%d)\n" , ret); + goto err_media_device_register; + } + +dvb_register_media_controller (&dvb->adapter, &dvb->mdev); +#endif //CONFIG_MEDIA_CONTROLLER_DVB +dev_info (&pdev->dev,"Successfully initialized vidtv!\n" );return ret; +#ifdef CONFIG_MEDIA_CONTROLLER_DVB +err_media_device_register: +media_device_cleanup (&dvb->mdev); +#endif //CONFIG_MEDIA_CONTROLLER_DVB err_dvb:kfree (dvb);return ret;
@@ -516,6 +539,11 @@ static int vidtv_bridge_remove(struct platform_device *pdev) dvb =platform_get_drvdata (pdev); +#ifdef CONFIG_MEDIA_CONTROLLER_DVB +media_device_unregister (&dvb->mdev); +media_device_cleanup (&dvb->mdev); +#endif //CONFIG_MEDIA_CONTROLLER_DVB +mutex_destroy (&dvb->feed_lock);for (i =0 ; i <NUM_FE ; ++i) {
drivers/media/test-drivers/vidtv/vidtv_bridge.h +6 -0
@@ -24,6 +24,7 @@#include <media/dmxdev.h> #include <media/dvb_demux.h> #include <media/dvb_frontend.h> +#include <media/media-device.h> #include "vidtv_mux.h"
@@ -42,6 +43,7 @@* @feed_lock: Protects access to the start/stop stream logic/data. * @streaming: Whether we are streaming now. * @mux: The abstraction responsible for delivering MPEG TS packets to the bridge. +* @mdev: The media_device struct for media controller support. */ struct vidtv_dvb {struct platform_device *pdev;
@@ -60,6 +62,10 @@ struct vidtv_dvb {bool streaming;struct vidtv_mux *mux; + +#ifdef CONFIG_MEDIA_CONTROLLER_DVB +struct media_device mdev; +#endif //CONFIG_MEDIA_CONTROLLER_DVB };#endif // VIDTV_BRIDG_H
Signature · 6 lines
2.30.0 _______________________________________________ Linux-kernel-mentees mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees
Daniel W. S. Almeida
maintainerPATCH v2 2/4 media: vidtv: reinstate sysfs bind attrs
In reply to Daniel W. S. AlmeidaFrom: "Daniel W. S. Almeida" <[email protected]>
Reinstate sysfs bind attrs so that vidtv can be bound and unbound via sysfs. This is useful for automated regression testing in userspace.
--- drivers/media/test-drivers/vidtv/vidtv_bridge.c | 1 - 1 file changed, 1 deletion(-)
drivers/media/test-drivers/vidtv/vidtv_bridge.c +0 -1
@@ -571,7 +571,6 @@ static struct platform_device vidtv_bridge_dev = {static struct platform_driver vidtv_bridge_driver = { .driver = { .name ="vidtv_bridge" , - .suppress_bind_attrs = true, }, .probe = vidtv_bridge_probe, .remove = vidtv_bridge_remove,
Signature · 6 lines
2.30.0 _______________________________________________ Linux-kernel-mentees mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees
Daniel W. S. Almeida
maintainerPATCH v2 3/4 media: vidtv: use a simpler name in platform_{device|driver}
In reply to Daniel W. S. AlmeidaFrom: "Daniel W. S. Almeida" <[email protected]>
Change from "vidtv_bridge" to simply "vidtv" so that vidtv looks more similar to the other media virtual drivers in /sys/bus/platform.
--- drivers/media/test-drivers/vidtv/vidtv_bridge.c | 4 ++-- drivers/media/test-drivers/vidtv/vidtv_bridge.h | 1 + 2 files changed, 3 insertions(+), 2 deletions(-)
drivers/media/test-drivers/vidtv/vidtv_bridge.c +2 -2
@@ -564,13 +564,13 @@ static void vidtv_bridge_dev_release(struct device *dev) }static struct platform_device vidtv_bridge_dev = { - .name ="vidtv_bridge" , + .name =VIDTV_PDEV_NAME , .dev.release = vidtv_bridge_dev_release, };static struct platform_driver vidtv_bridge_driver = { .driver = { - .name ="vidtv_bridge" , + .name =VIDTV_PDEV_NAME , }, .probe = vidtv_bridge_probe, .remove = vidtv_bridge_remove,
drivers/media/test-drivers/vidtv/vidtv_bridge.h +1 -0
@@ -16,6 +16,7 @@* For now, only one frontend is supported. See vidtv_start_streaming() */ #define NUM_FE 1 +#define VIDTV_PDEV_NAME "vidtv"#include <linux/i2c.h> #include <linux/platform_device.h>
Signature · 6 lines
2.30.0 _______________________________________________ Linux-kernel-mentees mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees
Daniel W. S. Almeida
maintainerPATCH v2 4/4 media: vidtv: print message when driver is removed
In reply to Daniel W. S. AlmeidaFrom: "Daniel W. S. Almeida" <[email protected]>
Print a message when the driver is removed so that we get some visual confirmation when unbinding vidtv.
--- drivers/media/test-drivers/vidtv/vidtv_bridge.c | 1 + 1 file changed, 1 insertion(+)
drivers/media/test-drivers/vidtv/vidtv_bridge.c +1 -0
@@ -555,6 +555,7 @@ static int vidtv_bridge_remove(struct platform_device *pdev)dvb_dmxdev_release (&dvb->dmx_dev);dvb_dmx_release (&dvb->demux);dvb_unregister_adapter (&dvb->adapter); +dev_info (&pdev->dev,"Successfully removed vidtv\n" );return 0 ; }
Signature · 6 lines
2.30.0 _______________________________________________ Linux-kernel-mentees mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees