On Wed, Aug 09, 2017 at 11:45:55AM +0200, Quentin Schulz wrote: > The AXP221 has different values for startup time bits from the AXP20X. > > Signed-off-by: Quentin Schulz <quentin.schulz@xxxxxxxxxxxxxxxxxx> > Reviewed-by: Chen-Yu Tsai <wens@xxxxxxxx> Applied, thank you. > --- > drivers/input/misc/axp20x-pek.c | 17 +++++++++++++++++ > 1 file changed, 17 insertions(+) > > diff --git a/drivers/input/misc/axp20x-pek.c b/drivers/input/misc/axp20x-pek.c > index f616fe5..a542906 100644 > --- a/drivers/input/misc/axp20x-pek.c > +++ b/drivers/input/misc/axp20x-pek.c > @@ -56,6 +56,13 @@ static const struct axp20x_time startup_time[] = { > { .time = 2000, .idx = 3 }, > }; > > +static const struct axp20x_time axp221_startup_time[] = { > + { .time = 128, .idx = 0 }, > + { .time = 1000, .idx = 1 }, > + { .time = 2000, .idx = 2 }, > + { .time = 3000, .idx = 3 }, > +}; > + > static const struct axp20x_time shutdown_time[] = { > { .time = 4000, .idx = 0 }, > { .time = 6000, .idx = 1 }, > @@ -70,6 +77,13 @@ static const struct axp20x_info axp20x_info = { > .shutdown_mask = AXP20X_PEK_SHUTDOWN_MASK, > }; > > +static const struct axp20x_info axp221_info = { > + .startup_time = axp221_startup_time, > + .startup_mask = AXP20X_PEK_STARTUP_MASK, > + .shutdown_time = shutdown_time, > + .shutdown_mask = AXP20X_PEK_SHUTDOWN_MASK, > +}; > + > static ssize_t axp20x_show_attr(struct device *dev, > const struct axp20x_time *time, > unsigned int mask, char *buf) > @@ -382,6 +396,9 @@ static const struct platform_device_id axp_pek_id_match[] = { > { > .name = "axp20x-pek", > .driver_data = (kernel_ulong_t)&axp20x_info, > + }, { > + .name = "axp221-pek", > + .driver_data = (kernel_ulong_t)&axp221_info, > }, > }; > > -- > git-series 0.9.1 -- Dmitry -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html