* [PATCH] media: gpio-ir-recv: add allowed_protos and map_name for platform data
@ 2012-07-03 10:27 Du, Changbin
2012-07-03 11:19 ` Benoît Thébaudeau
0 siblings, 1 reply; 4+ messages in thread
From: Du, Changbin @ 2012-07-03 10:27 UTC (permalink / raw)
To: mchehab; +Cc: tsoni, dan.carpenter, kumarrav, linux-media, linux-kernel
It's better to give platform code a chance to specify the allowed
protocols and which keymap to use.
Signed-off-by: Du, Changbin <changbin.du@gmail.com>
---
drivers/media/rc/gpio-ir-recv.c | 10 ++++++++--
include/media/gpio-ir-recv.h | 6 ++++--
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/drivers/media/rc/gpio-ir-recv.c
b/drivers/media/rc/gpio-ir-recv.c
index 0d87545..f0d09af 100644
--- a/drivers/media/rc/gpio-ir-recv.c
+++ b/drivers/media/rc/gpio-ir-recv.c
@@ -83,11 +83,17 @@ static int __devinit gpio_ir_recv_probe(struct
platform_device *pdev)
}
rcdev->driver_type = RC_DRIVER_IR_RAW;
- rcdev->allowed_protos = RC_TYPE_ALL;
rcdev->input_name = GPIO_IR_DEVICE_NAME;
rcdev->input_id.bustype = BUS_HOST;
rcdev->driver_name = GPIO_IR_DRIVER_NAME;
- rcdev->map_name = RC_MAP_EMPTY;
+ if (pdata->allowed_protos)
+ rcdev->allowed_protos = pdata->allowed_protos;
+ else
+ rcdev->allowed_protos = RC_TYPE_ALL;
+ if (pdata->map_name)
+ rcdev->map_name = pdata->map_name;
+ else
+ rcdev->map_name = RC_MAP_EMPTY;
gpio_dev->rcdev = rcdev;
gpio_dev->gpio_nr = pdata->gpio_nr;
diff --git a/include/media/gpio-ir-recv.h b/include/media/gpio-ir-recv.h
index 67797bf..0142736 100644
--- a/include/media/gpio-ir-recv.h
+++ b/include/media/gpio-ir-recv.h
@@ -14,8 +14,10 @@
#define __GPIO_IR_RECV_H__
struct gpio_ir_recv_platform_data {
- int gpio_nr;
- bool active_low;
+ int gpio_nr;
+ bool active_low;
+ u64 allowed_protos;
+ const char *map_name;
};
#endif /* __GPIO_IR_RECV_H__ */
--
1.7.9.5
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] media: gpio-ir-recv: add allowed_protos and map_name for platform data
2012-07-03 10:27 [PATCH] media: gpio-ir-recv: add allowed_protos and map_name for platform data Du, Changbin
@ 2012-07-03 11:19 ` Benoît Thébaudeau
2012-07-04 3:08 ` Du, Changbin
2012-07-06 21:23 ` Mauro Carvalho Chehab
0 siblings, 2 replies; 4+ messages in thread
From: Benoît Thébaudeau @ 2012-07-03 11:19 UTC (permalink / raw)
To: Changbin Du
Cc: tsoni, dan carpenter, kumarrav, linux-media, linux-kernel, mchehab
Hi Changbin,
On Tue, Jul 3, 2012 at 12:27:19PM +0200, Changbin Du wrote:
> It's better to give platform code a chance to specify the allowed
> protocols and which keymap to use.
Already half done here:
http://git.linuxtv.org/media_tree.git?a=commitdiff;h=2bd237b
Regards,
Benoît
^ permalink raw reply [flat|nested] 4+ messages in thread
* RE: [PATCH] media: gpio-ir-recv: add allowed_protos and map_name for platform data
2012-07-03 11:19 ` Benoît Thébaudeau
@ 2012-07-04 3:08 ` Du, Changbin
2012-07-06 21:23 ` Mauro Carvalho Chehab
1 sibling, 0 replies; 4+ messages in thread
From: Du, Changbin @ 2012-07-04 3:08 UTC (permalink / raw)
To: 'Benoît Thébaudeau'
Cc: tsoni, 'dan carpenter',
kumarrav, linux-media, linux-kernel, mchehab
> Hi Changbin,
>
> On Tue, Jul 3, 2012 at 12:27:19PM +0200, Changbin Du wrote:
> > It's better to give platform code a chance to specify the allowed
> > protocols and which keymap to use.
>
> Already half done here:
> http://git.linuxtv.org/media_tree.git?a=commitdiff;h=2bd237b
Got it, thanks.
[Du, ChangbinX]
> Regards,
> Benoît
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] media: gpio-ir-recv: add allowed_protos and map_name for platform data
2012-07-03 11:19 ` Benoît Thébaudeau
2012-07-04 3:08 ` Du, Changbin
@ 2012-07-06 21:23 ` Mauro Carvalho Chehab
1 sibling, 0 replies; 4+ messages in thread
From: Mauro Carvalho Chehab @ 2012-07-06 21:23 UTC (permalink / raw)
To: Benoît Thébaudeau
Cc: Changbin Du, tsoni, dan carpenter, kumarrav, linux-media,
linux-kernel, mchehab
Em 03-07-2012 08:19, Benoît Thébaudeau escreveu:
> Hi Changbin,
>
> On Tue, Jul 3, 2012 at 12:27:19PM +0200, Changbin Du wrote:
>> It's better to give platform code a chance to specify the allowed
>> protocols and which keymap to use.
>
> Already half done here:
> http://git.linuxtv.org/media_tree.git?a=commitdiff;h=2bd237b
OK. Applied just the other half of the change.
Regards,
Mauro
-
[media] media: gpio-ir-recv: add allowed_protos for platform data
From: Du, Changbin <changbin.du@gmail.com>
It's better to give platform code a chance to specify the allowed
protocols to use.
[mchehab@redhat.com: fix merge conflict with a patch that made
half of this change]
Signed-off-by: Du, Changbin <changbin.du@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
diff --git a/drivers/media/rc/gpio-ir-recv.c b/drivers/media/rc/gpio-ir-recv.c
index 59fe60c..04cb272 100644
--- a/drivers/media/rc/gpio-ir-recv.c
+++ b/drivers/media/rc/gpio-ir-recv.c
@@ -84,7 +84,6 @@ static int __devinit gpio_ir_recv_probe(struct platform_device *pdev)
rcdev->priv = gpio_dev;
rcdev->driver_type = RC_DRIVER_IR_RAW;
- rcdev->allowed_protos = RC_TYPE_ALL;
rcdev->input_name = GPIO_IR_DEVICE_NAME;
rcdev->input_phys = GPIO_IR_DEVICE_NAME "/input0";
rcdev->input_id.bustype = BUS_HOST;
@@ -93,6 +92,10 @@ static int __devinit gpio_ir_recv_probe(struct platform_device *pdev)
rcdev->input_id.version = 0x0100;
rcdev->dev.parent = &pdev->dev;
rcdev->driver_name = GPIO_IR_DRIVER_NAME;
+ if (pdata->allowed_protos)
+ rcdev->allowed_protos = pdata->allowed_protos;
+ else
+ rcdev->allowed_protos = RC_TYPE_ALL;
rcdev->map_name = pdata->map_name ?: RC_MAP_EMPTY;
gpio_dev->rcdev = rcdev;
diff --git a/include/media/gpio-ir-recv.h b/include/media/gpio-ir-recv.h
index 91546f3..0142736 100644
--- a/include/media/gpio-ir-recv.h
+++ b/include/media/gpio-ir-recv.h
@@ -14,9 +14,10 @@
#define __GPIO_IR_RECV_H__
struct gpio_ir_recv_platform_data {
- int gpio_nr;
- bool active_low;
- const char *map_name;
+ int gpio_nr;
+ bool active_low;
+ u64 allowed_protos;
+ const char *map_name;
};
#endif /* __GPIO_IR_RECV_H__ */
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-07-06 21:23 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-07-03 10:27 [PATCH] media: gpio-ir-recv: add allowed_protos and map_name for platform data Du, Changbin
2012-07-03 11:19 ` Benoît Thébaudeau
2012-07-04 3:08 ` Du, Changbin
2012-07-06 21:23 ` Mauro Carvalho Chehab
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.