| Message ID | 20200121141525.3404-3-nick.reitemeyer@web.de (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | da3289044833769188c0da945d2cec90af35e87e |
| Headers | show |
| Series | [1/3] dt-bindings: vendor-prefixes: Add Coreriver vendor prefix | expand |
On Tue, Jan 21, 2020 at 03:15:26PM +0100, Nick Reitemeyer wrote: > The Coreriver TouchCore 360 is like the midas board touchkey, but it is using a fixed regulator. > > Signed-off-by: Nick Reitemeyer <nick.reitemeyer@web.de> Applied, thank you. > --- > drivers/input/keyboard/tm2-touchkey.c | 11 +++++++++++ > 1 file changed, 11 insertions(+) > > diff --git a/drivers/input/keyboard/tm2-touchkey.c b/drivers/input/keyboard/tm2-touchkey.c > index 14b55bacdd0f..fb078e049413 100644 > --- a/drivers/input/keyboard/tm2-touchkey.c > +++ b/drivers/input/keyboard/tm2-touchkey.c > @@ -75,6 +75,14 @@ static struct touchkey_variant aries_touchkey_variant = { > .cmd_led_off = ARIES_TOUCHKEY_CMD_LED_OFF, > }; > > +static const struct touchkey_variant tc360_touchkey_variant = { > + .keycode_reg = 0x00, > + .base_reg = 0x00, > + .fixed_regulator = true, > + .cmd_led_on = TM2_TOUCHKEY_CMD_LED_ON, > + .cmd_led_off = TM2_TOUCHKEY_CMD_LED_OFF, > +}; > + > static int tm2_touchkey_led_brightness_set(struct led_classdev *led_dev, > enum led_brightness brightness) > { > @@ -327,6 +335,9 @@ static const struct of_device_id tm2_touchkey_of_match[] = { > }, { > .compatible = "cypress,aries-touchkey", > .data = &aries_touchkey_variant, > + }, { > + .compatible = "coreriver,tc360-touchkey", > + .data = &tc360_touchkey_variant, > }, > { }, > }; > -- > 2.23.0 >
diff --git a/drivers/input/keyboard/tm2-touchkey.c b/drivers/input/keyboard/tm2-touchkey.c index 14b55bacdd0f..fb078e049413 100644 --- a/drivers/input/keyboard/tm2-touchkey.c +++ b/drivers/input/keyboard/tm2-touchkey.c @@ -75,6 +75,14 @@ static struct touchkey_variant aries_touchkey_variant = { .cmd_led_off = ARIES_TOUCHKEY_CMD_LED_OFF, }; +static const struct touchkey_variant tc360_touchkey_variant = { + .keycode_reg = 0x00, + .base_reg = 0x00, + .fixed_regulator = true, + .cmd_led_on = TM2_TOUCHKEY_CMD_LED_ON, + .cmd_led_off = TM2_TOUCHKEY_CMD_LED_OFF, +}; + static int tm2_touchkey_led_brightness_set(struct led_classdev *led_dev, enum led_brightness brightness) { @@ -327,6 +335,9 @@ static const struct of_device_id tm2_touchkey_of_match[] = { }, { .compatible = "cypress,aries-touchkey", .data = &aries_touchkey_variant, + }, { + .compatible = "coreriver,tc360-touchkey", + .data = &tc360_touchkey_variant, }, { }, };
The Coreriver TouchCore 360 is like the midas board touchkey, but it is using a fixed regulator. Signed-off-by: Nick Reitemeyer <nick.reitemeyer@web.de> --- drivers/input/keyboard/tm2-touchkey.c | 11 +++++++++++ 1 file changed, 11 insertions(+) -- 2.23.0