Skip to contentSkip to conversation

media: gpio-ir-recv: add allowed_protos for platform data

PATCH In review Du, Changbin 2 participants 2 messages Jul 4, 2012 – Jul 6, 2012

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 media: gpio-ir-recv: add allowed_protos for platform data

Make it possible to specify allowed RC protocols through the device's platform data.

---
For v2:
Keymap has already done by another patch.

---
 drivers/media/rc/gpio-ir-recv.c |    2 +-
 include/media/gpio-ir-recv.h    |    7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)
(quoted diff) +0 -0

b/drivers/media/rc/gpio-ir-recv.c
index 59fe60c..38da91e 100644

drivers/media/rc/gpio-ir-recv.c +0 -0
@@ -84,7 +84,7 @@ 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->allowed_protos = pdata->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;

include/media/gpio-ir-recv.h +4 -3
index 91546f3..0142736 100644
@@ -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__ */
Signature · 1 line
1.7.9.5
#1 lore raw

Em 04-07-2012 00:11, Du, Changbin escreveu:

Quoted 4 lines

Make it possible to specify allowed RC protocols through the device's platform data.

Gah, you trapped me: you've resent it, without using the original message ID.

Too late. I'll keep the version where I've fixed the merge conflict, as it does the same thing.

Regards,
Mauro.

Quoted 42 lines

---
For v2:
Keymap has already done by another patch.

---
  drivers/media/rc/gpio-ir-recv.c |    2 +-
  include/media/gpio-ir-recv.h    |    7 ++++---
  2 files changed, 5 insertions(+), 4 deletions(-)
drivers/media/rc/gpio-ir-recv.c +1 -1
index 59fe60c..38da91e 100644
@@ -84,7 +84,7 @@ 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->allowed_protos = pdata->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;
include/media/gpio-ir-recv.h +4 -3
index 91546f3..0142736 100644
@@ -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__ */