davinci: dm646x: move vpif related code to driver core header from platform

PATCH RESEND New Manjunath Hadli 3 participants 5 messages Nov 12, 2011 – Nov 30, 2011

Subsystems (5)

Arm (32-bit) Media (V4L/DVB) Arm sub-architectures TI DaVinci machine support +1 more subsystems

lore

Share & tools

lore

Manjunath Hadli

author

2011-11-12 15:06 UTC #0 lore raw

PATCH RESEND 1/1 davinci: dm646x: move vpif related code to driver core header from platform

move vpif related code for capture and display drivers from dm646x platform header file to vpif_types.h as these definitions are related to driver code more than the platform or board.

Signed-off-by Manjunath Hadli <[email protected]>

---
 arch/arm/mach-davinci/include/mach/dm646x.h |   53 +-------------------
 drivers/media/video/davinci/vpif.h          |    1 +
 drivers/media/video/davinci/vpif_capture.h  |    2 +-
 drivers/media/video/davinci/vpif_display.h  |    1 +
 include/media/davinci/vpif_types.h          |   71 +++++++++++++++++++++++++++
 5 files changed, 75 insertions(+), 53 deletions(-)
 create mode 100644 include/media/davinci/vpif_types.h

arch/arm/mach-davinci/include/mach/dm646x.h +1 ~~-52~~

index 2a00fe5..a8ee6c9 100644
@@ -16,6 +16,7 @@
 #include <linux/i2c.h>
 #include <linux/videodev2.h>
 #include <linux/davinci_emac.h>
+#include <media/davinci/vpif_types.h>
 
 #define DM646X_EMAC_BASE		(0x01C80000)
 #define DM646X_EMAC_MDIO_BASE		(DM646X_EMAC_BASE + 0x4000)

@@ -34,58 +35,6 @@ int __init dm646x_init_edma(struct edma_rsv_info *rsv);
 
 void dm646x_video_init(void);
 
-enum vpif_if_type {
-	VPIF_IF_BT656,
-	VPIF_IF_BT1120,
-	VPIF_IF_RAW_BAYER
-};
-
-struct vpif_interface {
-	enum vpif_if_type if_type;
-	unsigned hd_pol:1;
-	unsigned vd_pol:1;
-	unsigned fid_pol:1;
-};
-
-struct vpif_subdev_info {
-	const char *name;
-	struct i2c_board_info board_info;
-	u32 input;
-	u32 output;
-	unsigned can_route:1;
-	struct vpif_interface vpif_if;
-};
-
-struct vpif_display_config {
-	int (*set_clock)(int, int);
-	struct vpif_subdev_info *subdevinfo;
-	int subdev_count;
-	const char **output;
-	int output_count;
-	const char *card_name;
-};
-
-struct vpif_input {
-	struct v4l2_input input;
-	const char *subdev_name;
-};
-
-#define VPIF_CAPTURE_MAX_CHANNELS	2
-
-struct vpif_capture_chan_config {
-	const struct vpif_input *inputs;
-	int input_count;
-};
-
-struct vpif_capture_config {
-	int (*setup_input_channel_mode)(int);
-	int (*setup_input_path)(int, const char *);
-	struct vpif_capture_chan_config chan_config[VPIF_CAPTURE_MAX_CHANNELS];
-	struct vpif_subdev_info *subdev_info;
-	int subdev_count;
-	const char *card_name;
-};
-
 void dm646x_setup_vpif(struct vpif_display_config *,
 		       struct vpif_capture_config *);

drivers/media/video/davinci/vpif.h +1 -0

index 10550bd..25036cb 100644
@@ -20,6 +20,7 @@
 #include <linux/videodev2.h>
 #include <mach/hardware.h>
 #include <mach/dm646x.h>
+#include <media/davinci/vpif_types.h>
 
 /* Maximum channel allowed */
 #define VPIF_NUM_CHANNELS		(4)

drivers/media/video/davinci/vpif_capture.h +1 -1

index 064550f..a693d4e 100644
@@ -27,7 +27,7 @@
 #include <media/v4l2-device.h>
 #include <media/videobuf-core.h>
 #include <media/videobuf-dma-contig.h>
-#include <mach/dm646x.h>
+#include <media/davinci/vpif_types.h>
 
 #include "vpif.h"

drivers/media/video/davinci/vpif_display.h +1 -0

index 5d1936d..56879d1 100644
@@ -22,6 +22,7 @@
 #include <media/v4l2-device.h>
 #include <media/videobuf-core.h>
 #include <media/videobuf-dma-contig.h>
+#include <media/davinci/vpif_types.h>
 
 #include "vpif.h"

include/media/davinci/vpif_types.h new file +71 -0

71 lines not on this page · raw message

Signature · 1 line

1.6.2.4

Mauro Carvalho Chehab

2011-11-24 18:05 UTC #1 lore raw

PATCH RESEND 1/1 davinci: dm646x: move vpif related code to driver core header from platform

Em 12-11-2011 13:06, Manjunath Hadli escreveu:

Quoted 5 lines

move vpif related code for capture and display drivers from dm646x platform header file to vpif_types.h as these definitions are related to driver code more than the platform or board.
Signed-off-by Manjunath Hadli <[email protected]>

Manju,

Why are you re-sending a patch?

My understanding is that you're maintaining the davinci patches, so it is up to you to put those patches on your tree and send me a pull request when they're done. So, please, don't pollute the ML re-sending emails that are for yourself to handle.

Regards,
Mauro.

Nori, Sekhar

2011-11-24 18:22 UTC #2 lore raw

PATCH RESEND 1/1 davinci: dm646x: move vpif related code to driver core header from platform

Hi Mauro,

Quoted 7 lines · Mauro Carvalho Chehab

Em 12-11-2011 13:06, Manjunath Hadli escreveu:
Quoted 5 lines
move vpif related code for capture and display drivers from dm646x platform header file to vpif_types.h as these definitions are related to driver code more than the platform or board.
Signed-off-by Manjunath Hadli <[email protected]>

Quoted 8 lines

Manju,
Why are you re-sending a patch?
My understanding is that you're maintaining the davinci patches, so it is up to you to put those patches on your tree and send me a pull request when they're done. So, please, don't pollute the ML re-sending emails that are for yourself to handle.

Since this particular patch touches arch/arm/mach-davinci as well as drivers/media/video, the plan was to queue the patch through ARM tree with your Ack. We did not get your ack the last time around[1] so it was resent.

Do let me know if your ack is not needed.

Thanks,
Sekhar

[1] http://www.mail-archive.com/davinci-linux-open-source at linux.davincidsp.com/msg21840.html

Mauro Carvalho Chehab

2011-11-24 20:06 UTC #3 lore raw

PATCH RESEND 1/1 davinci: dm646x: move vpif related code to driver core header from platform

Em 24-11-2011 16:22, Nori, Sekhar escreveu:

Quoted 24 lines

Hi Mauro,
Quoted 7 lines · Mauro Carvalho Chehab
Em 12-11-2011 13:06, Manjunath Hadli escreveu:
Quoted 5 lines
move vpif related code for capture and display drivers from dm646x platform header file to vpif_types.h as these definitions are related to driver code more than the platform or board.
Signed-off-by Manjunath Hadli <[email protected]>
Quoted 8 lines
Manju,
Why are you re-sending a patch?
My understanding is that you're maintaining the davinci patches, so it is up to you to put those patches on your tree and send me a pull request when they're done. So, please, don't pollute the ML re-sending emails that are for yourself to handle.
Since this particular patch touches arch/arm/mach-davinci as well as drivers/media/video, the plan was to queue the patch through ARM tree with your Ack. We did not get your ack the last time around[1] so it was resent.

Quoted 6 lines

Do let me know if your ack is not needed.
Thanks,
Sekhar
[1] http://www.mail-archive.com/davinci-linux-open-source at linux.davincidsp.com/msg21840.html

Hmm.. I missed this email, but just re-sending it without request my ACK doesn't help much ;)

If this ever happens again, next time the better is to forward me the patch again, on an email asking for my ack.

With regards to the patch:

Acked-by Mauro Carvalho Chehab <[email protected]>

Regards,
Mauro

Nori, Sekhar

2011-11-30 10:47 UTC #4 lore raw

PATCH RESEND 1/1 davinci: dm646x: move vpif related code to driver core header from platform

Quoted 35 lines · Mauro Carvalho Chehab

Em 24-11-2011 16:22, Nori, Sekhar escreveu:
Quoted 24 lines
Hi Mauro,
Quoted 7 lines · Mauro Carvalho Chehab
Em 12-11-2011 13:06, Manjunath Hadli escreveu:
Quoted 5 lines
move vpif related code for capture and display drivers from dm646x platform header file to vpif_types.h as these definitions are related to driver code more than the platform or board.
Signed-off-by Manjunath Hadli <[email protected]>
Quoted 8 lines
Manju,
Why are you re-sending a patch?
My understanding is that you're maintaining the davinci patches, so it is up to you to put those patches on your tree and send me a pull request when they're done. So, please, don't pollute the ML re-sending emails that are for yourself to handle.
Since this particular patch touches arch/arm/mach-davinci as well as drivers/media/video, the plan was to queue the patch through ARM tree with your Ack. We did not get your ack the last time around[1] so it was resent.
Quoted 6 lines
Do let me know if your ack is not needed.
Thanks,
Sekhar
[1] http://www.mail-archive.com/davinci-linux-open-source at linux.davincidsp.com/msg21840.html
Hmm.. I missed this email, but just re-sending it without request my ACK doesn't help much ;)

Quoted 6 lines

If this ever happens again, next time the better is to forward me the patch again, on an email asking for my ack.
With regards to the patch:
Acked-by Mauro Carvalho Chehab <[email protected]>

Thanks Mauro. Queuing this for v3.3 submission.

Manju, while committing I changed the subject line to:

"ARM: davinci: vpif: move code to driver core header from platform"

to better match the current subject line conventions.

Regards,
Sekhar