From: "Daniel W. S. Almeida" <dwlsalmeida@gmail.com>
To: mchehab@kernel.org, hverkuil@xs4all.nl
Cc: linux-kernel@vger.kernel.org,
linux-kernel-mentees@lists.linuxfoundation.org,
"Daniel W. S. Almeida" <dwlsalmeida@gmail.com>,
linux-media@vger.kernel.org
Subject: [Linux-kernel-mentees] [PATCH 1/4] media: vidtv: Add media controller support
Date: Tue, 5 Jan 2021 10:09:53 -0300 [thread overview]
Message-ID: <20210105130956.1133222-2-dwlsalmeida@gmail.com> (raw)
In-Reply-To: <20210105130956.1133222-1-dwlsalmeida@gmail.com>
From: "Daniel W. S. Almeida" <dwlsalmeida@gmail.com>
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.
Signed-off-by: Daniel W. S. Almeida <dwlsalmeida@gmail.com>
---
.../media/test-drivers/vidtv/vidtv_bridge.c | 26 +++++++++++++++++++
.../media/test-drivers/vidtv/vidtv_bridge.h | 6 +++++
2 files changed, 32 insertions(+)
diff --git a/drivers/media/test-drivers/vidtv/vidtv_bridge.c b/drivers/media/test-drivers/vidtv/vidtv_bridge.c
index fc64d0c8492a..4424f9585f86 100644
--- a/drivers/media/test-drivers/vidtv/vidtv_bridge.c
+++ b/drivers/media/test-drivers/vidtv/vidtv_bridge.c
@@ -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,28 @@ 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;
+err_media_device_register:
+ media_device_cleanup(&dvb->mdev);
err_dvb:
kfree(dvb);
return ret;
@@ -516,6 +537,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) {
diff --git a/drivers/media/test-drivers/vidtv/vidtv_bridge.h b/drivers/media/test-drivers/vidtv/vidtv_bridge.h
index 2528adaee27d..d42899a31295 100644
--- a/drivers/media/test-drivers/vidtv/vidtv_bridge.h
+++ b/drivers/media/test-drivers/vidtv/vidtv_bridge.h
@@ -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
--
2.30.0
_______________________________________________
Linux-kernel-mentees mailing list
Linux-kernel-mentees@lists.linuxfoundation.org
https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees
next prev parent reply other threads:[~2021-01-05 13:10 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-05 13:09 [Linux-kernel-mentees] [PATCH 0/4] media: vidtv: add media controller support Daniel W. S. Almeida
2021-01-05 13:09 ` Daniel W. S. Almeida [this message]
2021-01-05 15:39 ` [Linux-kernel-mentees] [PATCH 1/4] media: vidtv: Add " kernel test robot
2021-01-05 16:44 ` kernel test robot
2021-01-05 16:49 ` kernel test robot
2021-01-05 13:09 ` [Linux-kernel-mentees] [PATCH 2/4] media: vidtv: reinstate sysfs bind attrs Daniel W. S. Almeida
2021-01-05 13:09 ` [Linux-kernel-mentees] [PATCH 3/4] media: vidtv: use a simpler name in platform_{device|driver} Daniel W. S. Almeida
2021-01-05 13:09 ` [Linux-kernel-mentees] [PATCH 4/4] media: vidtv: print message when driver is removed Daniel W. S. Almeida
2021-01-25 8:57 ` [Linux-kernel-mentees] [PATCH 0/4] media: vidtv: add media controller support Hans Verkuil
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210105130956.1133222-2-dwlsalmeida@gmail.com \
--to=dwlsalmeida@gmail.com \
--cc=hverkuil@xs4all.nl \
--cc=linux-kernel-mentees@lists.linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).