On Sat, Mar 08, 2014 at 03:29:53AM +0100, Christopher Heiny wrote: > In debugging certain touch sensor failures, it's useful to know > whether the device is stuck in bootloader, so print a message > to that effect. > > Also, point to the actual location of the defs for the F01 CTRL0 > bitfields. > > Signed-off-by: Christopher Heiny <cheiny@xxxxxxxxxxxxx> > Cc: Dmitry Torokhov <dmitry.torokhov@xxxxxxxxx> > Cc: Benjamin Tissoires <benjamin.tissoires@xxxxxxxxxx> > Cc: Linux Walleij <linus.walleij@xxxxxxxxxx> > Cc: David Herrmann <dh.herrmann@xxxxxxxxx> > Cc: Jiri Kosina <jkosina@xxxxxxx> > > --- > > drivers/input/rmi4/rmi_f01.c | 9 ++++++++- > 1 file changed, 8 insertions(+), 1 deletion(-) > > diff --git a/drivers/input/rmi4/rmi_f01.c b/drivers/input/rmi4/rmi_f01.c > index 8504865..a078d7d 100644 > --- a/drivers/input/rmi4/rmi_f01.c > +++ b/drivers/input/rmi4/rmi_f01.c > @@ -16,7 +16,7 @@ > #include "rmi_f01.h" > > /** > - * @ctrl0 - see the bit definitions above. > + * @ctrl0 - see the bit definitions in rmi_f01.h. > * @doze_interval - controls the interval between checks for finger presence > * when the touch sensor is in doze mode, in units of 10ms. > * @wakeup_threshold - controls the capacitance threshold at which the touch > @@ -415,6 +415,13 @@ static int rmi_f01_probe(struct rmi_function *fn) > return error; > } > > + driver_data->f01_bootloader_mode = > + RMI_F01_STATUS_BOOTLOADER(device_status); > + if (driver_data->f01_bootloader_mode) > + dev_warn(&rmi_dev->dev, > + "WARNING: RMI4 device is in bootloader mode!\n"); > + > + The logic here is a bit odd. Would it make sense to put this warning in the if condition below? IIRC you can't have a configured device while in bootloader mode. > if (RMI_F01_STATUS_UNCONFIGURED(device_status)) { > dev_err(&fn->dev, > "Device was reset during configuration process, status: %#02x!\n", -Courtney -- 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