|
@@ -81,26 +81,26 @@ struct f01_basic_properties {
|
|
* This bit disables whatever sleep mode may be selected by the sleep_mode
|
|
* This bit disables whatever sleep mode may be selected by the sleep_mode
|
|
* field and forces the device to run at full power without sleeping.
|
|
* field and forces the device to run at full power without sleeping.
|
|
*/
|
|
*/
|
|
-#define RMI_F01_CRTL0_NOSLEEP_BIT BIT(2)
|
|
|
|
|
|
+#define RMI_F01_CTRL0_NOSLEEP_BIT BIT(2)
|
|
|
|
|
|
/*
|
|
/*
|
|
* When this bit is set, the touch controller employs a noise-filtering
|
|
* When this bit is set, the touch controller employs a noise-filtering
|
|
* algorithm designed for use with a connected battery charger.
|
|
* algorithm designed for use with a connected battery charger.
|
|
*/
|
|
*/
|
|
-#define RMI_F01_CRTL0_CHARGER_BIT BIT(5)
|
|
|
|
|
|
+#define RMI_F01_CTRL0_CHARGER_BIT BIT(5)
|
|
|
|
|
|
/*
|
|
/*
|
|
* Sets the report rate for the device. The effect of this setting is
|
|
* Sets the report rate for the device. The effect of this setting is
|
|
* highly product dependent. Check the spec sheet for your particular
|
|
* highly product dependent. Check the spec sheet for your particular
|
|
* touch sensor.
|
|
* touch sensor.
|
|
*/
|
|
*/
|
|
-#define RMI_F01_CRTL0_REPORTRATE_BIT BIT(6)
|
|
|
|
|
|
+#define RMI_F01_CTRL0_REPORTRATE_BIT BIT(6)
|
|
|
|
|
|
/*
|
|
/*
|
|
* Written by the host as an indicator that the device has been
|
|
* Written by the host as an indicator that the device has been
|
|
* successfully configured.
|
|
* successfully configured.
|
|
*/
|
|
*/
|
|
-#define RMI_F01_CRTL0_CONFIGURED_BIT BIT(7)
|
|
|
|
|
|
+#define RMI_F01_CTRL0_CONFIGURED_BIT BIT(7)
|
|
|
|
|
|
/**
|
|
/**
|
|
* @ctrl0 - see the bit definitions above.
|
|
* @ctrl0 - see the bit definitions above.
|
|
@@ -330,10 +330,10 @@ static int rmi_f01_probe(struct rmi_function *fn)
|
|
case RMI_F01_NOSLEEP_DEFAULT:
|
|
case RMI_F01_NOSLEEP_DEFAULT:
|
|
break;
|
|
break;
|
|
case RMI_F01_NOSLEEP_OFF:
|
|
case RMI_F01_NOSLEEP_OFF:
|
|
- f01->device_control.ctrl0 &= ~RMI_F01_CRTL0_NOSLEEP_BIT;
|
|
|
|
|
|
+ f01->device_control.ctrl0 &= ~RMI_F01_CTRL0_NOSLEEP_BIT;
|
|
break;
|
|
break;
|
|
case RMI_F01_NOSLEEP_ON:
|
|
case RMI_F01_NOSLEEP_ON:
|
|
- f01->device_control.ctrl0 |= RMI_F01_CRTL0_NOSLEEP_BIT;
|
|
|
|
|
|
+ f01->device_control.ctrl0 |= RMI_F01_CTRL0_NOSLEEP_BIT;
|
|
break;
|
|
break;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -349,7 +349,7 @@ static int rmi_f01_probe(struct rmi_function *fn)
|
|
f01->device_control.ctrl0 &= ~RMI_F01_CTRL0_SLEEP_MODE_MASK;
|
|
f01->device_control.ctrl0 &= ~RMI_F01_CTRL0_SLEEP_MODE_MASK;
|
|
}
|
|
}
|
|
|
|
|
|
- f01->device_control.ctrl0 |= RMI_F01_CRTL0_CONFIGURED_BIT;
|
|
|
|
|
|
+ f01->device_control.ctrl0 |= RMI_F01_CTRL0_CONFIGURED_BIT;
|
|
|
|
|
|
error = rmi_write(rmi_dev, fn->fd.control_base_addr,
|
|
error = rmi_write(rmi_dev, fn->fd.control_base_addr,
|
|
f01->device_control.ctrl0);
|
|
f01->device_control.ctrl0);
|
|
@@ -535,8 +535,8 @@ static int rmi_f01_suspend(struct rmi_function *fn)
|
|
int error;
|
|
int error;
|
|
|
|
|
|
f01->old_nosleep =
|
|
f01->old_nosleep =
|
|
- f01->device_control.ctrl0 & RMI_F01_CRTL0_NOSLEEP_BIT;
|
|
|
|
- f01->device_control.ctrl0 &= ~RMI_F01_CRTL0_NOSLEEP_BIT;
|
|
|
|
|
|
+ f01->device_control.ctrl0 & RMI_F01_CTRL0_NOSLEEP_BIT;
|
|
|
|
+ f01->device_control.ctrl0 &= ~RMI_F01_CTRL0_NOSLEEP_BIT;
|
|
|
|
|
|
f01->device_control.ctrl0 &= ~RMI_F01_CTRL0_SLEEP_MODE_MASK;
|
|
f01->device_control.ctrl0 &= ~RMI_F01_CTRL0_SLEEP_MODE_MASK;
|
|
if (device_may_wakeup(fn->rmi_dev->xport->dev))
|
|
if (device_may_wakeup(fn->rmi_dev->xport->dev))
|
|
@@ -549,7 +549,7 @@ static int rmi_f01_suspend(struct rmi_function *fn)
|
|
if (error) {
|
|
if (error) {
|
|
dev_err(&fn->dev, "Failed to write sleep mode: %d.\n", error);
|
|
dev_err(&fn->dev, "Failed to write sleep mode: %d.\n", error);
|
|
if (f01->old_nosleep)
|
|
if (f01->old_nosleep)
|
|
- f01->device_control.ctrl0 |= RMI_F01_CRTL0_NOSLEEP_BIT;
|
|
|
|
|
|
+ f01->device_control.ctrl0 |= RMI_F01_CTRL0_NOSLEEP_BIT;
|
|
f01->device_control.ctrl0 &= ~RMI_F01_CTRL0_SLEEP_MODE_MASK;
|
|
f01->device_control.ctrl0 &= ~RMI_F01_CTRL0_SLEEP_MODE_MASK;
|
|
f01->device_control.ctrl0 |= RMI_SLEEP_MODE_NORMAL;
|
|
f01->device_control.ctrl0 |= RMI_SLEEP_MODE_NORMAL;
|
|
return error;
|
|
return error;
|
|
@@ -564,7 +564,7 @@ static int rmi_f01_resume(struct rmi_function *fn)
|
|
int error;
|
|
int error;
|
|
|
|
|
|
if (f01->old_nosleep)
|
|
if (f01->old_nosleep)
|
|
- f01->device_control.ctrl0 |= RMI_F01_CRTL0_NOSLEEP_BIT;
|
|
|
|
|
|
+ f01->device_control.ctrl0 |= RMI_F01_CTRL0_NOSLEEP_BIT;
|
|
|
|
|
|
f01->device_control.ctrl0 &= ~RMI_F01_CTRL0_SLEEP_MODE_MASK;
|
|
f01->device_control.ctrl0 &= ~RMI_F01_CTRL0_SLEEP_MODE_MASK;
|
|
f01->device_control.ctrl0 |= RMI_SLEEP_MODE_NORMAL;
|
|
f01->device_control.ctrl0 |= RMI_SLEEP_MODE_NORMAL;
|