Commit 6063d077 authored by Frank Schaefer's avatar Frank Schaefer Committed by Mauro Carvalho Chehab

[media] em28xx: add support for illumination button and LED

The SpeedLink VAD Laplace webcam is equipped with an illumination button and
an illumination LED. When the button is pressed, the driver must toggle the
LED state via the corresponding GPO port.
Signed-off-by: default avatarFrank Schäfer <fschaefer.oss@googlemail.com>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent 6b8a3170
...@@ -225,6 +225,25 @@ int em28xx_write_reg_bits(struct em28xx *dev, u16 reg, u8 val, ...@@ -225,6 +225,25 @@ int em28xx_write_reg_bits(struct em28xx *dev, u16 reg, u8 val,
} }
EXPORT_SYMBOL_GPL(em28xx_write_reg_bits); EXPORT_SYMBOL_GPL(em28xx_write_reg_bits);
/*
* em28xx_toggle_reg_bits()
* toggles/inverts the bits (specified by bitmask) of a register
*/
int em28xx_toggle_reg_bits(struct em28xx *dev, u16 reg, u8 bitmask)
{
int oldval;
u8 newval;
oldval = em28xx_read_reg(dev, reg);
if (oldval < 0)
return oldval;
newval = (~oldval & bitmask) | (oldval & ~bitmask);
return em28xx_write_reg(dev, reg, newval);
}
EXPORT_SYMBOL_GPL(em28xx_toggle_reg_bits);
/* /*
* em28xx_is_ac97_ready() * em28xx_is_ac97_ready()
* Checks if ac97 is ready * Checks if ac97 is ready
......
...@@ -480,6 +480,7 @@ static void em28xx_query_buttons(struct work_struct *work) ...@@ -480,6 +480,7 @@ static void em28xx_query_buttons(struct work_struct *work)
u8 i, j; u8 i, j;
int regval; int regval;
bool is_pressed, was_pressed; bool is_pressed, was_pressed;
const struct em28xx_led *led;
/* Poll and evaluate all addresses */ /* Poll and evaluate all addresses */
for (i = 0; i < dev->num_button_polling_addresses; i++) { for (i = 0; i < dev->num_button_polling_addresses; i++) {
...@@ -524,6 +525,15 @@ static void em28xx_query_buttons(struct work_struct *work) ...@@ -524,6 +525,15 @@ static void em28xx_query_buttons(struct work_struct *work)
input_report_key(dev->sbutton_input_dev, input_report_key(dev->sbutton_input_dev,
EM28XX_SNAPSHOT_KEY, 0); EM28XX_SNAPSHOT_KEY, 0);
break; break;
case EM28XX_BUTTON_ILLUMINATION:
led = em28xx_find_led(dev,
EM28XX_LED_ILLUMINATION);
/* Switch illumination LED on/off */
if (led)
em28xx_toggle_reg_bits(dev,
led->gpio_reg,
led->gpio_mask);
break;
default: default:
WARN_ONCE(1, "BUG: unhandled button role."); WARN_ONCE(1, "BUG: unhandled button role.");
} }
...@@ -600,10 +610,17 @@ static void em28xx_init_buttons(struct em28xx *dev) ...@@ -600,10 +610,17 @@ static void em28xx_init_buttons(struct em28xx *dev)
WARN_ONCE(1, "BUG: maximum number of button polling addresses exceeded."); WARN_ONCE(1, "BUG: maximum number of button polling addresses exceeded.");
addr_new = 0; addr_new = 0;
} }
/* Register input device (if needed) */ /* Button role specific checks and actions */
if (button->role == EM28XX_BUTTON_SNAPSHOT) { if (button->role == EM28XX_BUTTON_SNAPSHOT) {
/* Register input device */
if (em28xx_register_snapshot_button(dev) < 0) if (em28xx_register_snapshot_button(dev) < 0)
addr_new = 0; addr_new = 0;
} else if (button->role == EM28XX_BUTTON_ILLUMINATION) {
/* Check sanity */
if (!em28xx_find_led(dev, EM28XX_LED_ILLUMINATION)) {
em28xx_errdev("BUG: illumination button defined, but no illumination LED.\n");
addr_new = 0;
}
} }
/* Add read address to list of polling addresses */ /* Add read address to list of polling addresses */
if (addr_new) { if (addr_new) {
......
...@@ -379,6 +379,7 @@ enum em28xx_adecoder { ...@@ -379,6 +379,7 @@ enum em28xx_adecoder {
enum em28xx_led_role { enum em28xx_led_role {
EM28XX_LED_ANALOG_CAPTURING = 0, EM28XX_LED_ANALOG_CAPTURING = 0,
EM28XX_LED_ILLUMINATION,
EM28XX_NUM_LED_ROLES, /* must be the last */ EM28XX_NUM_LED_ROLES, /* must be the last */
}; };
...@@ -391,6 +392,7 @@ struct em28xx_led { ...@@ -391,6 +392,7 @@ struct em28xx_led {
enum em28xx_button_role { enum em28xx_button_role {
EM28XX_BUTTON_SNAPSHOT = 0, EM28XX_BUTTON_SNAPSHOT = 0,
EM28XX_BUTTON_ILLUMINATION,
EM28XX_NUM_BUTTON_ROLES, /* must be the last */ EM28XX_NUM_BUTTON_ROLES, /* must be the last */
}; };
...@@ -709,6 +711,7 @@ int em28xx_write_regs(struct em28xx *dev, u16 reg, char *buf, int len); ...@@ -709,6 +711,7 @@ int em28xx_write_regs(struct em28xx *dev, u16 reg, char *buf, int len);
int em28xx_write_reg(struct em28xx *dev, u16 reg, u8 val); int em28xx_write_reg(struct em28xx *dev, u16 reg, u8 val);
int em28xx_write_reg_bits(struct em28xx *dev, u16 reg, u8 val, int em28xx_write_reg_bits(struct em28xx *dev, u16 reg, u8 val,
u8 bitmask); u8 bitmask);
int em28xx_toggle_reg_bits(struct em28xx *dev, u16 reg, u8 bitmask);
int em28xx_read_ac97(struct em28xx *dev, u8 reg); int em28xx_read_ac97(struct em28xx *dev, u8 reg);
int em28xx_write_ac97(struct em28xx *dev, u8 reg, u16 val); int em28xx_write_ac97(struct em28xx *dev, u8 reg, u16 val);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment