--- v5
+++ v16
@@ -1,4 +1,3 @@
-
Adds support for the Dialog DA7280 LRA/ERM Haptic Driver with
multiple mode and integrated waveform memory and wideband support.
It communicates via an I2C bus to the device.
@@ -6,6 +5,31 @@
Signed-off-by: Roy Im <roy.im.opensource@diasemi.com>
---
+v16:
+ - Corrected some code and updated description in Kconfig.
+v15:
+ - Removed some defines and updated some comments.
+v14:
+ - Updated pwm related code, alignments and comments.
+v13:
+ - Updated some conditions in pwm function and alignments.
+v12: No changes.
+v11:
+ - Updated the pwm related code, comments and typo.
+v10:
+ - Updated the pwm related function and added some comments.
+v9:
+ - Removed the header file and put the definitions into the c file.
+ - Updated the pwm code and error logs with %pE
+v8:
+ - Added changes to support FF_PERIODIC/FF_CUSTOM and FF_CONSTANT.
+ - Updated the dt-related code.
+ - Removed memless related functions.
+v7:
+ - Added more attributes to handle one value per file.
+ - Replaced and updated the dt-related code and functions called.
+ - Fixed error/functions.
+v6: No changes.
v5: Fixed errors in Kconfig file.
v4: Updated code as dt-bindings are changed.
v3: No changes.
@@ -14,19 +38,17 @@
drivers/input/misc/Kconfig | 13 +
drivers/input/misc/Makefile | 1 +
- drivers/input/misc/da7280.c | 1438 +++++++++++++++++++++++++++++++++++++++++++
- drivers/input/misc/da7280.h | 412 +++++++++++++
- 4 files changed, 1864 insertions(+)
+ drivers/input/misc/da7280.c | 1840 +++++++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 1854 insertions(+)
create mode 100644 drivers/input/misc/da7280.c
- create mode 100644 drivers/input/misc/da7280.h
diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
-index ca59a2b..751cac6 100644
+index 362e8a0..06dc5a3 100644
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
-@@ -851,4 +851,17 @@ config INPUT_SC27XX_VIBRA
- To compile this driver as a module, choose M here. The module will
- be called sc27xx_vibra.
+@@ -869,4 +869,17 @@ config INPUT_STPMIC1_ONKEY
+ To compile this driver as a module, choose M here: the
+ module will be called stpmic1_onkey.
+config INPUT_DA7280_HAPTICS
+ tristate "Dialog Semiconductor DA7280 haptics support"
@@ -35,7 +57,7 @@
+ select REGMAP_I2C
+ help
+ Say Y to enable support for the Dialog DA7280 haptics driver.
-+ The haptics can be controlled by i2c communication,
++ The haptics can be controlled by I2C communication,
+ or by PWM input, or by GPI.
+
+ To compile this driver as a module, choose M here: the
@@ -43,7 +65,7 @@
+
endif
diff --git a/drivers/input/misc/Makefile b/drivers/input/misc/Makefile
-index 9d0f9d1..d941348 100644
+index a48e5f2..9cfd6ab 100644
--- a/drivers/input/misc/Makefile
+++ b/drivers/input/misc/Makefile
@@ -25,6 +25,7 @@ obj-$(CONFIG_INPUT_CMA3000) += cma3000_d0x.o
@@ -56,15 +78,15 @@
obj-$(CONFIG_INPUT_DA9063_ONKEY) += da9063_onkey.o
diff --git a/drivers/input/misc/da7280.c b/drivers/input/misc/da7280.c
new file mode 100644
-index 0000000..3a64730
+index 0000000..c8c42ac
--- /dev/null
+++ b/drivers/input/misc/da7280.c
-@@ -0,0 +1,1438 @@
+@@ -0,0 +1,1840 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * DA7280 Haptic device driver
+ *
-+ * Copyright (c) 2018 Dialog Semiconductor.
++ * Copyright (c) 2020 Dialog Semiconductor.
+ * Author: Roy Im <Roy.Im.Opensource@diasemi.com>
+ */
+
@@ -76,9 +98,139 @@
+#include <linux/pwm.h>
+#include <linux/regmap.h>
+#include <linux/workqueue.h>
-+#include "da7280.h"
-+
-+/* uV unit for voltage rate */
++#include <linux/uaccess.h>
++#include <linux/bitops.h>
++#include <linux/bitfield.h>
++
++/* Registers */
++#define DA7280_IRQ_EVENT1 0x03
++#define DA7280_IRQ_EVENT_WARNING_DIAG 0x04
++#define DA7280_IRQ_EVENT_SEQ_DIAG 0x05
++#define DA7280_IRQ_STATUS1 0x06
++#define DA7280_IRQ_MASK1 0x07
++#define DA7280_FRQ_LRA_PER_H 0x0A
++#define DA7280_FRQ_LRA_PER_L 0x0B
++#define DA7280_ACTUATOR1 0x0C
++#define DA7280_ACTUATOR2 0x0D
++#define DA7280_ACTUATOR3 0x0E
++#define DA7280_CALIB_V2I_H 0x0F
++#define DA7280_CALIB_V2I_L 0x10
++#define DA7280_TOP_CFG1 0x13
++#define DA7280_TOP_CFG2 0x14
++#define DA7280_TOP_CFG4 0x16
++#define DA7280_TOP_INT_CFG1 0x17
++#define DA7280_TOP_CTL1 0x22
++#define DA7280_TOP_CTL2 0x23
++#define DA7280_SEQ_CTL2 0x28
++#define DA7280_GPI_0_CTL 0x29
++#define DA7280_GPI_1_CTL 0x2A
++#define DA7280_GPI_2_CTL 0x2B
++#define DA7280_MEM_CTL1 0x2C
++#define DA7280_MEM_CTL2 0x2D
++#define DA7280_TOP_CFG5 0x6E
++#define DA7280_IRQ_MASK2 0x83
++#define DA7280_SNP_MEM_99 0xE7
++
++/* Register field */
++
++/* DA7280_IRQ_EVENT1 (Address 0x03) */
++#define DA7280_E_SEQ_CONTINUE_MASK BIT(0)
++#define DA7280_E_UVLO_MASK BIT(1)
++#define DA7280_E_SEQ_DONE_MASK BIT(2)
++#define DA7280_E_OVERTEMP_CRIT_MASK BIT(3)
++#define DA7280_E_SEQ_FAULT_MASK BIT(4)
++#define DA7280_E_WARNING_MASK BIT(5)
++#define DA7280_E_ACTUATOR_FAULT_MASK BIT(6)
++#define DA7280_E_OC_FAULT_MASK BIT(7)
++
++/* DA7280_IRQ_EVENT_WARNING_DIAG (Address 0x04) */
++#define DA7280_E_OVERTEMP_WARN_MASK BIT(3)
++#define DA7280_E_MEM_TYPE_MASK BIT(4)
++#define DA7280_E_LIM_DRIVE_ACC_MASK BIT(6)
++#define DA7280_E_LIM_DRIVE_MASK BIT(7)
++
++/* DA7280_IRQ_EVENT_PAT_DIAG (Address 0x05) */
++#define DA7280_E_PWM_FAULT_MASK BIT(5)
++#define DA7280_E_MEM_FAULT_MASK BIT(6)
++#define DA7280_E_SEQ_ID_FAULT_MASK BIT(7)
++
++/* DA7280_IRQ_STATUS1 (Address 0x06) */
++#define DA7280_STA_SEQ_CONTINUE_MASK BIT(0)
++#define DA7280_STA_UVLO_VBAT_OK_MASK BIT(1)
++#define DA7280_STA_SEQ_DONE_MASK BIT(2)
++#define DA7280_STA_OVERTEMP_CRIT_MASK BIT(3)
++#define DA7280_STA_SEQ_FAULT_MASK BIT(4)
++#define DA7280_STA_WARNING_MASK BIT(5)
++#define DA7280_STA_ACTUATOR_MASK BIT(6)
++#define DA7280_STA_OC_MASK BIT(7)
++
++/* DA7280_IRQ_MASK1 (Address 0x07) */
++#define DA7280_SEQ_CONTINUE_M_MASK BIT(0)
++#define DA7280_E_UVLO_M_MASK BIT(1)
++#define DA7280_SEQ_DONE_M_MASK BIT(2)
++#define DA7280_OVERTEMP_CRIT_M_MASK BIT(3)
++#define DA7280_SEQ_FAULT_M_MASK BIT(4)
++#define DA7280_WARNING_M_MASK BIT(5)
++#define DA7280_ACTUATOR_M_MASK BIT(6)
++#define DA7280_OC_M_MASK BIT(7)
++
++/* DA7280_ACTUATOR3 (Address 0x0e) */
++#define DA7280_IMAX_MASK (31 << 0)
++
++/* DA7280_TOP_CFG1 (Address 0x13) */
++#define DA7280_AMP_PID_EN_MASK BIT(0)
++#define DA7280_RAPID_STOP_EN_MASK BIT(1)
++#define DA7280_ACCELERATION_EN_MASK BIT(2)
++#define DA7280_FREQ_TRACK_EN_MASK BIT(3)
++#define DA7280_BEMF_SENSE_EN_MASK BIT(4)
++#define DA7280_ACTUATOR_TYPE_MASK BIT(5)
++
++/* DA7280_TOP_CFG2 (Address 0x14) */
++#define DA7280_FULL_BRAKE_THR_MASK (15 << 0)
++#define DA7280_MEM_DATA_SIGNED_MASK BIT(4)
++
++/* DA7280_TOP_CFG4 (Address 0x16) */
++#define DA7280_TST_CALIB_IMPEDANCE_DIS_MASK BIT(6)
++#define DA7280_V2I_FACTOR_FREEZE_MASK BIT(7)
++
++/* DA7280_TOP_INT_CFG1 (Address 0x17) */
++#define DA7280_BEMF_FAULT_LIM_MASK (3 << 0)
++
++/* DA7280_TOP_CTL1 (Address 0x22) */
++#define DA7280_OPERATION_MODE_MASK (7 << 0)
++#define DA7280_STANDBY_EN_MASK BIT(3)
++#define DA7280_SEQ_START_MASK BIT(4)
++
++/* DA7280_SEQ_CTL2 (Address 0x28) */
++#define DA7280_PS_SEQ_ID_MASK (15 << 0)
++#define DA7280_PS_SEQ_LOOP_MASK (15 << 4)
++
++/* DA7280_GPIO_0_CTL (Address 0x29) */
++#define DA7280_GPI0_POLARITY_MASK (3 << 0)
++#define DA7280_GPI0_MODE_MASK BIT(2)
++#define DA7280_GPI0_SEQUENCE_ID_MASK (15 << 3)
++
++/* DA7280_GPIO_1_CTL (Address 0x2a) */
++#define DA7280_GPI1_POLARITY_MASK (3 << 0)
++#define DA7280_GPI1_MODE_MASK BIT(2)
++#define DA7280_GPI1_SEQUENCE_ID_MASK (15 << 3)
++
++/* DA7280_GPIO_2_CTL (Address 0x2b) */
++#define DA7280_GPI2_POLARITY_MASK (3 << 0)
++#define DA7280_GPI2_MODE_MASK BIT(2)
++#define DA7280_GPI2_SEQUENCE_ID_MASK (15 << 3)
++
++/* DA7280_MEM_CTL2 (Address 0x2d) */
++#define DA7280_WAV_MEM_LOCK_MASK BIT(7)
++
++/* DA7280_TOP_CFG5 (Address 0x6e) */
++#define DA7280_V2I_FACTOR_OFFSET_EN_MASK BIT(0)
++
++/* DA7280_IRQ_MASK2 (Address 0x83) */
++#define DA7280_ADC_SAT_M_MASK BIT(7)
++
++/* Controls */
++
+#define DA7280_VOLTAGE_RATE_MAX 6000000
+#define DA7280_VOLTAGE_RATE_STEP 23400
+#define DA7280_NOMMAX_DFT 0x6B
@@ -88,7 +240,6 @@
+#define DA7280_IMPD_DEFAULT 22000000
+
+#define DA7280_IMAX_DEFAULT 0x0E
-+/* uA unit step and limit for IMAX*/
+#define DA7280_IMAX_STEP 7200
+#define DA7280_IMAX_LIMIT 252000
+
@@ -96,12 +247,10 @@
+#define DA7280_RESONT_FREQL_DFT 0x32
+#define DA7280_MIN_RESONAT_FREQ_HZ 50
+#define DA7280_MAX_RESONAT_FREQ_HZ 300
-+#define DA7280_MIN_PWM_FREQ_KHZ 10
-+#define DA7280_MAX_PWM_FREQ_KHZ 250
+
+#define DA7280_SEQ_ID_MAX 15
+#define DA7280_SEQ_LOOP_MAX 15
-+#define DA7280_GPI1_SEQ_ID_DEFT 0x0
++#define DA7280_GPI_SEQ_ID_DFT 0x0
+
+#define DA7280_SNP_MEM_SIZE 100
+#define DA7280_SNP_MEM_MAX DA7280_SNP_MEM_99
@@ -109,6 +258,11 @@
+#define IRQ_NUM 3
+
+#define DA7280_SKIP_INIT 0x100
++
++#define DA7280_FF_EFFECT_COUNT_MAX 15
++
++/* Maximum gain is 0x7fff for PWM mode */
++#define MAX_MAGNITUDE_SHIFT 15
+
+enum da7280_haptic_dev_t {
+ DA7280_LRA = 0,
@@ -126,6 +280,20 @@
+ DA7280_OPMODE_MAX,
+};
+
++#define DA7280_FF_CONSTANT_DRO 1
++#define DA7280_FF_PERIODIC_PWM 2
++#define DA7280_FF_PERIODIC_RTWM 1
++#define DA7280_FF_PERIODIC_ETWM 2
++
++#define DA7280_FF_PERIODIC_MODE DA7280_RTWM_MODE
++#define DA7280_FF_CONSTANT_MODE DA7280_DRO_MODE
++
++enum da7280_custom_effect_param {
++ DA7280_CUSTOM_DATA_SEQ_ID_IDX = 0,
++ DA7280_CUSTOM_DATA_SEQ_LOOP_IDX = 1,
++ DA7280_CUSTOM_DATA_LEN = 2,
++};
++
+struct da7280_gpi_ctl {
+ u8 seq_id;
+ u8 mode;
@@ -138,32 +306,39 @@
+ struct device *dev;
+ struct i2c_client *client;
+ struct pwm_device *pwm_dev;
-+ bool legacy;
-+ int pwm_id;
-+ struct work_struct work;
-+
-+ bool suspend_state;
-+ unsigned int magnitude;
++
++ bool legacy;
++ struct delayed_work work_duration;
++ struct work_struct work_playback;
++ struct work_struct work_setgain;
++ int val;
++ u16 gain;
++ u16 new_gain;
++
++ s16 level;
+
+ u8 dev_type;
+ u8 op_mode;
++ u8 const_op_mode;
++ u8 periodic_op_mode;
+ u16 nommax;
+ u16 absmax;
+ u32 imax;
+ u32 impd;
+ u32 resonant_freq_h;
+ u32 resonant_freq_l;
-+ u8 bemf_sense_en;
-+ u8 freq_track_en;
-+ u8 acc_en;
-+ u8 rapid_stop_en;
-+ u8 amp_pid_en;
++ bool bemf_sense_en;
++ bool freq_track_en;
++ bool acc_en;
++ bool rapid_stop_en;
++ bool amp_pid_en;
+ u8 ps_seq_id;
+ u8 ps_seq_loop;
+ struct da7280_gpi_ctl gpi_ctl[3];
+ bool mem_update;
+ u8 snp_mem[DA7280_SNP_MEM_SIZE];
-+ const struct attribute_group **attr_group;
++ u8 enabled;
++ int length_ms;
+};
+
+static bool da7280_volatile_register(struct device *dev, unsigned int reg)
@@ -189,15 +364,13 @@
+
+static int da7280_haptic_mem_update(struct da7280_haptic *haptics)
+{
-+ int ret;
+ unsigned int val;
-+
-+ /* It is recommended to update the patterns
-+ * during haptic is not working in order to avoid conflict
-+ */
-+ ret = regmap_read(haptics->regmap, DA7280_IRQ_STATUS1, &val);
-+ if (ret)
-+ return ret;
++ int error;
++
++ /* The patterns should be updated when haptic is not working */
++ error = regmap_read(haptics->regmap, DA7280_IRQ_STATUS1, &val);
++ if (error)
++ return error;
+ if (val & DA7280_STA_WARNING_MASK) {
+ dev_warn(haptics->dev,
+ "Warning! Please check HAPTIC status.\n");
@@ -206,9 +379,9 @@
+
+ /* Patterns are not updated if the lock bit is enabled */
+ val = 0;
-+ ret = regmap_read(haptics->regmap, DA7280_MEM_CTL2, &val);
-+ if (ret)
-+ return ret;
++ error = regmap_read(haptics->regmap, DA7280_MEM_CTL2, &val);
++ if (error)
++ return error;
+ if (~val & DA7280_WAV_MEM_LOCK_MASK) {
+ dev_warn(haptics->dev,
+ "Please unlock the bit first\n");
@@ -216,96 +389,100 @@
+ }
+
+ /* Set to Inactive mode to make sure safety */
-+ ret = regmap_update_bits(haptics->regmap,
-+ DA7280_TOP_CTL1,
-+ DA7280_OPERATION_MODE_MASK,
-+ 0);
-+ if (ret)
-+ return ret;
-+
-+ ret = regmap_read(haptics->regmap, DA7280_MEM_CTL1, &val);
-+ if (ret)
-+ return ret;
++ error = regmap_update_bits(haptics->regmap,
++ DA7280_TOP_CTL1,
++ DA7280_OPERATION_MODE_MASK,
++ 0);
++ if (error)
++ return error;
++
++ error = regmap_read(haptics->regmap, DA7280_MEM_CTL1, &val);
++ if (error)
++ return error;
+
+ return regmap_bulk_write(haptics->regmap, val,
+ haptics->snp_mem, DA7280_SNP_MEM_MAX - val + 1);
+}
+
-+static int da7280_haptic_set_pwm(struct da7280_haptic *haptics)
-+{
-+ struct pwm_args pargs;
++static int da7280_haptic_set_pwm(struct da7280_haptic *haptics, bool enabled)
++{
++ struct pwm_state state;
+ u64 period_mag_multi;
-+ unsigned int pwm_duty;
-+ int ret;
-+
-+ pwm_get_args(haptics->pwm_dev, &pargs);
-+ period_mag_multi =
-+ (u64)(pargs.period * haptics->magnitude);
-+ if (haptics->acc_en)
-+ pwm_duty =
-+ (unsigned int)(period_mag_multi >> 16);
-+ else
-+ pwm_duty =
-+ (unsigned int)((period_mag_multi >> 16)
-+ + pargs.period) / 2;
-+
-+ ret = pwm_config(haptics->pwm_dev,
-+ pwm_duty, pargs.period);
-+ if (ret) {
++ int error;
++
++ if (!haptics->gain && enabled) {
+ dev_err(haptics->dev,
-+ "failed to configure pwm : %d\n", ret);
-+ return ret;
-+ }
-+
-+ ret = pwm_enable(haptics->pwm_dev);
-+ if (ret) {
-+ pwm_disable(haptics->pwm_dev);
-+ dev_err(haptics->dev,
-+ "failed to enable haptics pwm device : %d\n", ret);
-+ }
-+
-+ return ret;
++ "Please set the gain first for the pwm mode\n");
++ return -EINVAL;
++ }
++
++ pwm_get_state(haptics->pwm_dev, &state);
++ state.enabled = enabled;
++ if (enabled) {
++ period_mag_multi = state.period * haptics->gain;
++ period_mag_multi >>= MAX_MAGNITUDE_SHIFT;
++
++ /* The interpretation of duty cycle depends on the acc_en,
++ * it should be between 50% and 100% for acc_en = 0.
++ * See datasheet 'PWM mode' section.
++ */
++ if (!haptics->acc_en) {
++ period_mag_multi += state.period;
++ period_mag_multi /= 2;
++ }
++
++ state.duty_cycle = period_mag_multi;
++ }
++
++ error = pwm_apply_state(haptics->pwm_dev, &state);
++ if (error)
++ dev_err(haptics->dev, "failed to apply pwm state: %pE\n",
++ ERR_PTR(error));
++
++ return error;
+}
+
+static void da7280_haptic_enable(struct da7280_haptic *haptics)
+{
-+ int ret = 0;
++ int error = 0;
++
++ if (haptics->enabled)
++ return;
+
+ switch (haptics->op_mode) {
+ case DA7280_DRO_MODE:
+ /* the valid range check when acc_en is enabled */
-+ if (haptics->acc_en && haptics->magnitude > 0x7F)
-+ haptics->magnitude = 0x7F;
-+ else if (haptics->magnitude > 0xFF)
-+ haptics->magnitude = 0xFF;
++ if (haptics->acc_en && haptics->level > 0x7F)
++ haptics->level = 0x7F;
++ else if (haptics->level > 0xFF)
++ haptics->level = 0xFF;
+
+ /* Set driver level
+ * as a % of ACTUATOR_NOMMAX(nommax)
+ */
-+ ret = regmap_write(haptics->regmap,
-+ DA7280_TOP_CTL2,
-+ haptics->magnitude);
-+ if (ret) {
++ error = regmap_write(haptics->regmap,
++ DA7280_TOP_CTL2,
++ haptics->level);
++ if (error) {
+ dev_err(haptics->dev,
-+ "i2c err for driving level set : %d\n",
-+ ret);
++ "i2c err %pE for driving level (%d)\n",
++ ERR_PTR(error), haptics->level);
+ return;
+ }
+ break;
+ case DA7280_PWM_MODE:
-+ if (da7280_haptic_set_pwm(haptics))
++ if (da7280_haptic_set_pwm(haptics, true))
+ return;
+ break;
+ case DA7280_RTWM_MODE:
-+ /* PS_SEQ_ID will be played
-+ * as many times as the PS_SEQ_LOOP
++ /* The pattern will be played by
++ * the PS_SEQ_ID and the PS_SEQ_LOOP
+ */
+ case DA7280_ETWM_MODE:
-+ /* Now users are able to control the GPI(N)
-+ * assigned to GPI_0, GPI1 and GPI2 accordingly
-+ * please see the datasheet for details.
-+ * GPI(N)_SEQUENCE_ID will be played
-+ * as many times as the PS_SEQ_LOOP
++ /* The pattern will be played by
++ * the GPI[N] state, GPI(N)_SEQUENCE_ID
++ * and the PS_SEQ_LOOP.
++ * please see the datasheet for the details.
+ */
+ break;
+ default:
@@ -314,150 +491,363 @@
+ return;
+ }
+
-+ ret = regmap_update_bits(haptics->regmap,
-+ DA7280_TOP_CTL1,
-+ DA7280_OPERATION_MODE_MASK,
-+ haptics->op_mode);
-+ if (ret) {
++ error = regmap_update_bits(haptics->regmap,
++ DA7280_TOP_CTL1,
++ DA7280_OPERATION_MODE_MASK,
++ haptics->op_mode);
++ if (error) {
+ dev_err(haptics->dev,
-+ "i2c err for op_mode setting : %d\n", ret);
++ "op_mode i2c err: %pE\n", ERR_PTR(error));
+ return;
+ }
+
+ if (haptics->op_mode == DA7280_PWM_MODE ||
+ haptics->op_mode == DA7280_RTWM_MODE) {
-+ ret = regmap_update_bits(haptics->regmap,
-+ DA7280_TOP_CTL1,
-+ DA7280_SEQ_START_MASK,
-+ DA7280_SEQ_START_MASK);
-+ if (ret)
++ error = regmap_update_bits(haptics->regmap,
++ DA7280_TOP_CTL1,
++ DA7280_SEQ_START_MASK,
++ DA7280_SEQ_START_MASK);
++ if (error) {
+ dev_err(haptics->dev,
-+ "i2c err for sequence triggering : %d\n", ret);
-+ }
++ "i2c err for sequence triggering : %pE\n",
++ ERR_PTR(error));
++ return;
++ }
++ }
++
++ haptics->enabled = true;
++ if (haptics->length_ms && haptics->op_mode <= DA7280_PWM_MODE)
++ schedule_delayed_work(&haptics->work_duration,
++ msecs_to_jiffies(haptics->length_ms));
+}
+
+static void da7280_haptic_disable(struct da7280_haptic *haptics)
+{
-+ int ret;
++ int error;
++
++ if (!haptics->enabled)
++ return;
+
+ /* Set to Inactive mode */
-+ ret = regmap_update_bits(haptics->regmap,
-+ DA7280_TOP_CTL1,
-+ DA7280_OPERATION_MODE_MASK, 0);
-+ if (ret) {
++ error = regmap_update_bits(haptics->regmap,
++ DA7280_TOP_CTL1,
++ DA7280_OPERATION_MODE_MASK, 0);
++ if (error) {
+ dev_err(haptics->dev,
-+ "i2c err for op_mode off : %d\n", ret);
++ "i2c err for op_mode off : %pE\n", ERR_PTR(error));
+ return;
+ }
+
+ switch (haptics->op_mode) {
++ case DA7280_DRO_MODE:
++ error = regmap_write(haptics->regmap,
++ DA7280_TOP_CTL2, 0);
++ if (error) {
++ dev_err(haptics->dev,
++ "i2c err for DRO mode off : %pE\n",
++ ERR_PTR(error));
++ return;
++ }
++ break;
++ case DA7280_PWM_MODE:
++ if (da7280_haptic_set_pwm(haptics, false))
++ return;
++ break;
+ case DA7280_RTWM_MODE:
+ case DA7280_ETWM_MODE:
-+ ret = regmap_update_bits(haptics->regmap,
-+ DA7280_TOP_CTL1,
-+ DA7280_SEQ_START_MASK, 0);
-+ if (ret) {
++ error = regmap_update_bits(haptics->regmap,
++ DA7280_TOP_CTL1,
++ DA7280_SEQ_START_MASK, 0);
++ if (error) {
+ dev_err(haptics->dev,
-+ "i2c err for RTWM or ETWM mode off : %d\n",
-+ ret);
++ "i2c err for RTWM or ETWM mode off: %pE\n",
++ ERR_PTR(error));
+ return;
+ }
-+ break;
-+ case DA7280_DRO_MODE:
-+ ret = regmap_write(haptics->regmap,
-+ DA7280_TOP_CTL2, 0);
-+ if (ret) {
-+ dev_err(haptics->dev,
-+ "i2c err for DRO mode off : %d\n",
-+ ret);
-+ return;
-+ }
-+ break;
-+ case DA7280_PWM_MODE:
-+ pwm_disable(haptics->pwm_dev);
+ break;
+ default:
+ dev_err(haptics->dev,
+ "Invalid Mode(%d)\n", haptics->op_mode);
-+ break;
-+ }
-+}
-+
-+static void da7280_haptic_work(struct work_struct *work)
++ return;
++ }
++
++ haptics->enabled = false;
++}
++
++static void da7280_haptic_work_duration(struct work_struct *work)
+{
+ struct da7280_haptic *haptics =
-+ container_of(work, struct da7280_haptic, work);
-+
-+ if (haptics->magnitude)
++ container_of(work, struct da7280_haptic, work_duration.work);
++
++ da7280_haptic_disable(haptics);
++}
++
++static void da7280_haptic_work_playback(struct work_struct *work)
++{
++ struct da7280_haptic *haptics =
++ container_of(work, struct da7280_haptic, work_playback);
++ int val = haptics->val;
++
++ if (!!val)
+ da7280_haptic_enable(haptics);
+ else
+ da7280_haptic_disable(haptics);
+}
+
-+static int da7280_haptic_play(struct input_dev *dev, void *data,
-+ struct ff_effect *effect)
++static void da7280_haptic_work_setgain(struct work_struct *work)
++{
++ struct da7280_haptic *haptics =
++ container_of(work, struct da7280_haptic, work_setgain);
++ u16 gain = haptics->new_gain;
++ int error = 0;
++
++ if (gain == 0)
++ return;
++
++ /* DRO and PWM modes support set_gain feature
++ */
++ switch (haptics->op_mode) {
++ case DA7280_DRO_MODE:
++ if (haptics->acc_en == 1) {
++ haptics->level = (u8)(gain * 0x7F / 0x7fff);
++ } else if (haptics->acc_en == 0) {
++ haptics->level = (u8)(gain * 0xFF / 0x7fff);
++
++ if (gain <= 0x3FFF)
++ haptics->level = haptics->level + 0x80;
++ else if (gain > 0x3FFF)
++ haptics->level = haptics->level - 0x80;
++ } else {
++ dev_err(haptics->dev, "Invalid acc_en %d.\n",
++ haptics->acc_en);
++ }
++
++ /* Set driver level
++ * as a % of ACTUATOR_NOMMAX(nommax)
++ */
++ error = regmap_write(haptics->regmap,
++ DA7280_TOP_CTL2,
++ haptics->level);
++ if (error) {
++ dev_err(haptics->dev,
++ "i2c err for driving level set: %pE\n",
++ ERR_PTR(error));
++ return;
++ }
++ break;
++ case DA7280_PWM_MODE:
++ haptics->gain = gain;
++ if (haptics->enabled) {
++ if (da7280_haptic_set_pwm(haptics, true))
++ return;
++ }
++ break;
++ default:
++ dev_err(haptics->dev,
++ "Invalid Mode(%d). Change to DRM (Constant) mode.\n",
++ haptics->op_mode);
++ break;
++ }
++}
++
++static int da7280_haptics_upload_effect(struct input_dev *dev,
++ struct ff_effect *effect,
++ struct ff_effect *old)
+{
+ struct da7280_haptic *haptics = input_get_drvdata(dev);
-+
-+ if (effect->u.rumble.strong_magnitude > 0)
-+ haptics->magnitude = effect->u.rumble.strong_magnitude;
-+ else if (effect->u.rumble.weak_magnitude > 0)
-+ haptics->magnitude = effect->u.rumble.weak_magnitude;
-+ else
-+ haptics->magnitude = 0;
-+
-+ schedule_work(&haptics->work);
++ s16 data[DA7280_SNP_MEM_SIZE] = {0,};
++ unsigned int val;
++ int tmp, i;
++ int error;
++
++ switch (effect->type) {
++ /* DRO/PWM modes support this type */
++ case FF_CONSTANT:
++ haptics->op_mode = haptics->const_op_mode;
++ /* effect->replay.length should be ms base */
++ haptics->length_ms = effect->replay.length;
++ if (haptics->op_mode == DA7280_DRO_MODE) {
++ tmp = effect->u.constant.level * 254;
++ haptics->level = tmp / 0x7FFF;
++ break;
++ }
++
++ haptics->gain = (effect->u.constant.level <= 0) ?
++ 0 : effect->u.constant.level;
++ break;
++
++ /* RTWM/ETWM modes support this type */
++ case FF_PERIODIC:
++ if (effect->u.periodic.waveform != FF_CUSTOM) {
++ dev_err(haptics->dev,
++ "Only accept FF_CUSTOM type\n");
++ return -EINVAL;
++ }
++
++ /*
++ * Load the data and check the length.
++ * the data will be patterns in this case: 3 < X <= 100,
++ * and will be saved into the waveform memory inside DA728x.
++ * If X = 2, the data will be PS_SEQ_ID and PS_SEQ_LOOP .
++ */
++ if (effect->u.periodic.custom_len == DA7280_CUSTOM_DATA_LEN)
++ goto set_id_loop;
++
++ if (effect->u.periodic.custom_len < DA7280_CUSTOM_DATA_LEN ||
++ effect->u.periodic.custom_len > DA7280_SNP_MEM_SIZE) {
++ dev_err(haptics->dev, "Invalid data size\n");
++ return -EINVAL;
++ }
++
++ if (copy_from_user(data, effect->u.periodic.custom_data,
++ sizeof(s16) *
++ effect->u.periodic.custom_len)) {
++ dev_err(haptics->dev, "custom data load error\n");
++ return -EFAULT;
++ }
++
++ memset(haptics->snp_mem, 0, DA7280_SNP_MEM_SIZE);
++
++ for (i = 0; i < effect->u.periodic.custom_len; i++) {
++ if (data[i] <= 0xff) {
++ haptics->snp_mem[i] = (u8)data[i];
++ } else {
++ dev_err(haptics->dev,
++ "Invalid data in the custom data\n");
++ return -EINVAL;
++ }
++ }
++
++ error = da7280_haptic_mem_update(haptics);
++ if (error) {
++ dev_err(haptics->dev,
++ "mem update error: %pE\n", ERR_PTR(error));
++ return error;
++ }
++ break;
++
++set_id_loop:
++ if (copy_from_user(data, effect->u.periodic.custom_data,
++ sizeof(s16) * DA7280_CUSTOM_DATA_LEN)) {
++ dev_err(haptics->dev,
++ "custom id/loop load error\n");
++ return -EFAULT;
++ }
++
++ haptics->ps_seq_id =
++ data[DA7280_CUSTOM_DATA_SEQ_ID_IDX] <=
++ DA7280_SEQ_ID_MAX ?
++ data[DA7280_CUSTOM_DATA_SEQ_ID_IDX] : 0;
++
++ haptics->ps_seq_loop =
++ data[DA7280_CUSTOM_DATA_SEQ_LOOP_IDX] <=
++ DA7280_SEQ_LOOP_MAX ?
++ data[DA7280_CUSTOM_DATA_SEQ_LOOP_IDX] : 0;
++
++ haptics->op_mode = haptics->periodic_op_mode;
++
++ val = FIELD_PREP(DA7280_PS_SEQ_ID_MASK, haptics->ps_seq_id) |
++ FIELD_PREP(DA7280_PS_SEQ_LOOP_MASK,
++ haptics->ps_seq_loop);
++ error = regmap_write(haptics->regmap,
++ DA7280_SEQ_CTL2, val);
++ if (error) {
++ dev_err(haptics->dev,
++ "i2c err for driving level set: %pE\n",
++ ERR_PTR(error));
++ return error;
++ }
++ break;
++
++ default:
++ dev_err(haptics->dev, "Unsupported effect type: %d\n",
++ effect->type);
++ return -EINVAL;
++ }
+
+ return 0;
+}
+
++static int da7280_haptics_playback(struct input_dev *dev,
++ int effect_id, int val)
++{
++ struct da7280_haptic *haptics = input_get_drvdata(dev);
++
++ if (!haptics->op_mode) {
++ dev_warn(haptics->dev,
++ "Any effects are not uploaded yet\n");
++ return -EPERM;
++ }
++
++ haptics->val = val;
++ schedule_work(&haptics->work_playback);
++
++ return 0;
++}
++
++static void da7280_haptics_set_gain(struct input_dev *dev, u16 gain)
++{
++ struct da7280_haptic *haptics = input_get_drvdata(dev);
++
++ if (gain > 0x7fff)
++ gain = 0x7fff;
++
++ haptics->new_gain = gain;
++
++ schedule_work(&haptics->work_setgain);
++}
++
+static int da7280_haptic_open(struct input_dev *dev)
+{
+ struct da7280_haptic *haptics = input_get_drvdata(dev);
-+ int ret;
-+
-+ ret = regmap_update_bits(haptics->regmap,
-+ DA7280_TOP_CTL1,
-+ DA7280_STANDBY_EN_MASK,
-+ DA7280_STANDBY_EN_MASK);
-+ if (ret)
++ int error;
++
++ error = regmap_update_bits(haptics->regmap,
++ DA7280_TOP_CTL1,
++ DA7280_STANDBY_EN_MASK,
++ DA7280_STANDBY_EN_MASK);
++ if (error)
+ dev_err(haptics->dev,
-+ "Failed to open haptic, i2c error : %d\n", ret);
-+
-+ return ret;
++ "Failed to open haptic, i2c error: %pE\n",
++ ERR_PTR(error));
++
++ return error;
+}
+
+static void da7280_haptic_close(struct input_dev *dev)
+{
+ struct da7280_haptic *haptics = input_get_drvdata(dev);
-+ int ret;
-+
-+ cancel_work_sync(&haptics->work);
-+
-+ ret = regmap_update_bits(haptics->regmap,
-+ DA7280_TOP_CTL1,
-+ DA7280_OPERATION_MODE_MASK, 0);
-+ if (ret)
++ int error;
++
++ cancel_delayed_work_sync(&haptics->work_duration);
++ cancel_work_sync(&haptics->work_playback);
++ cancel_work_sync(&haptics->work_setgain);
++
++ error = regmap_update_bits(haptics->regmap,
++ DA7280_TOP_CTL1,
++ DA7280_OPERATION_MODE_MASK, 0);
++ if (error)
+ goto error_i2c;
+
+ if (haptics->op_mode == DA7280_DRO_MODE) {
-+ ret = regmap_write(haptics->regmap,
-+ DA7280_TOP_CTL2, 0);
-+
-+ if (ret)
++ error = regmap_write(haptics->regmap,
++ DA7280_TOP_CTL2, 0);
++
++ if (error)
+ goto error_i2c;
+ }
+
-+ ret = regmap_update_bits(haptics->regmap,
-+ DA7280_TOP_CTL1,
-+ DA7280_STANDBY_EN_MASK, 0);
-+ if (ret)
++ error = regmap_update_bits(haptics->regmap,
++ DA7280_TOP_CTL1,
++ DA7280_STANDBY_EN_MASK, 0);
++ if (error)
+ goto error_i2c;
+
+ return;
+
+error_i2c:
-+ dev_err(haptics->dev, "DA7280-haptic i2c error : %d\n", ret);
++ dev_err(haptics->dev, "DA7280-haptic i2c error : %pE\n",
++ ERR_PTR(error));
+}
+
+static u8 da7280_haptic_of_mode_str(struct device *dev,
@@ -470,7 +860,7 @@
+ else if (!strcmp(str, "ERM-coin"))
+ return DA7280_ERM_COIN;
+
-+ dev_warn(dev, "Invalid string - set to default\n");
++ dev_warn(dev, "Invalid string - set to LRA\n");
+ return DA7280_LRA;
+}
+
@@ -482,7 +872,7 @@
+ else if (!strcmp(str, "Multi-pattern"))
+ return 1;
+
-+ dev_warn(dev, "Invalid string - set to default\n");
++ dev_warn(dev, "Invalid string - set to Single-pattern\n");
+ return 0;
+}
+
@@ -496,7 +886,7 @@
+ else if (!strcmp(str, "Both-edge"))
+ return 2;
+
-+ dev_warn(dev, "Invalid string - set to default\n");
++ dev_warn(dev, "Invalid string - set to Rising-edge\n");
+ return 0;
+}
+
@@ -511,74 +901,82 @@
+ return (u8)voltage;
+}
+
-+static void da7280_of_to_pdata(struct device *dev,
-+ struct da7280_haptic *haptics)
-+{
-+ struct device_node *np = dev->of_node;
-+ char dt_gpi_str1[] = "dlg,gpi0-seq-id";
-+ char dt_gpi_str2[] = "dlg,gpi0-mode";
-+ char dt_gpi_str3[] = "dlg,gpi0-polarity";
-+ unsigned int mem[DA7280_SNP_MEM_SIZE];
-+ const char *of_str;
-+ u32 of_val32;
-+ int i;
-+
-+ if (!of_property_read_string(np, "dlg,actuator-type", &of_str))
++static void da7280_parse_properties(struct device *dev,
++ struct da7280_haptic *haptics)
++{
++ unsigned int i, mem[DA7280_SNP_MEM_SIZE];
++ char gpi_str1[] = "dlg,gpi0-seq-id";
++ char gpi_str2[] = "dlg,gpi0-mode";
++ char gpi_str3[] = "dlg,gpi0-polarity";
++ const char *str;
++ u32 val;
++
++ if (!device_property_read_string(dev, "dlg,actuator-type", &str))
+ haptics->dev_type =
-+ da7280_haptic_of_mode_str(dev, of_str);
++ da7280_haptic_of_mode_str(dev, str);
+ else /* if no property, then use the mode inside chip */
+ haptics->dev_type = DA7280_DEV_MAX;
+
-+ if (of_property_read_u32(np, "dlg,op-mode", &of_val32) >= 0)
-+ if (of_val32 && of_val32 < DA7280_OPMODE_MAX)
-+ haptics->op_mode = of_val32;
++ if (device_property_read_u32(dev, "dlg,const-op-mode", &val) >= 0)
++ if (val == DA7280_FF_PERIODIC_PWM)
++ haptics->const_op_mode = DA7280_PWM_MODE;
+ else
-+ haptics->op_mode = DA7280_DRO_MODE;
++ haptics->const_op_mode = DA7280_DRO_MODE;
+ else
-+ haptics->op_mode = DA7280_DRO_MODE;
-+
-+ if (of_property_read_u32(np, "dlg,nom-microvolt", &of_val32) >= 0)
-+ if (of_val32 < DA7280_VOLTAGE_RATE_MAX)
++ haptics->const_op_mode = DA7280_DRO_MODE;
++
++ if (device_property_read_u32(dev, "dlg,periodic-op-mode", &val) >= 0)
++ if (val == DA7280_FF_PERIODIC_ETWM)
++ haptics->periodic_op_mode = DA7280_ETWM_MODE;
++ else
++ haptics->periodic_op_mode = DA7280_RTWM_MODE;
++ else
++ haptics->periodic_op_mode = DA7280_RTWM_MODE;
++
++ if (device_property_read_u32(dev, "dlg,nom-microvolt", &val) >= 0)
++ if (val < DA7280_VOLTAGE_RATE_MAX)
+ haptics->nommax =
-+ da7280_haptic_of_volt_rating_set(of_val32);
++ da7280_haptic_of_volt_rating_set(val);
+ else
+ haptics->nommax = DA7280_SKIP_INIT;
+ else /* if no property, then use the value inside chip */
+ haptics->nommax = DA7280_SKIP_INIT;
+
-+ if (of_property_read_u32(np, "dlg,abs-max-microvolt", &of_val32) >= 0)
-+ if (of_val32 < DA7280_VOLTAGE_RATE_MAX)
++ if (device_property_read_u32(dev, "dlg,abs-max-microvolt",
++ &val) >= 0)
++ if (val < DA7280_VOLTAGE_RATE_MAX)
+ haptics->absmax =
-+ da7280_haptic_of_volt_rating_set(of_val32);
++ da7280_haptic_of_volt_rating_set(val);
+ else
+ haptics->absmax = DA7280_SKIP_INIT;
+ else
+ haptics->absmax = DA7280_SKIP_INIT;
+
-+ if (of_property_read_u32(np, "dlg,imax-microamp", &of_val32) >= 0)
-+ if (of_val32 < DA7280_IMAX_LIMIT)
-+ haptics->imax = (of_val32 - 28600)
++ if (device_property_read_u32(dev, "dlg,imax-microamp", &val) >= 0)
++ if (val < DA7280_IMAX_LIMIT)
++ haptics->imax = (val - 28600)
+ / DA7280_IMAX_STEP + 1;
+ else
+ haptics->imax = DA7280_IMAX_DEFAULT;
+ else
+ haptics->imax = DA7280_IMAX_DEFAULT;
+
-+ if (of_property_read_u32(np, "dlg,impd-micro-ohms", &of_val32) >= 0)
-+ if (of_val32 <= DA7280_IMPD_MAX)
-+ haptics->impd = of_val32;
++ if (device_property_read_u32(dev, "dlg,impd-micro-ohms", &val) >= 0)
++ if (val <= DA7280_IMPD_MAX)
++ haptics->impd = val;
+ else
+ haptics->impd = DA7280_IMPD_DEFAULT;
+ else
+ haptics->impd = DA7280_IMPD_DEFAULT;
+
-+ if (of_property_read_u32(np, "dlg,resonant-freq-hz", &of_val32) >= 0) {
-+ if (of_val32 < DA7280_MAX_RESONAT_FREQ_HZ &&
-+ of_val32 > DA7280_MIN_RESONAT_FREQ_HZ) {
++ if (device_property_read_u32(dev, "dlg,resonant-freq-hz",
++ &val) >= 0) {
++ if (val < DA7280_MAX_RESONAT_FREQ_HZ &&
++ val > DA7280_MIN_RESONAT_FREQ_HZ) {
+ haptics->resonant_freq_h =
-+ ((1000000000 / (of_val32 * 1333)) >> 7) & 0xFF;
++ ((1000000000 / (val * 1333)) >> 7) & 0xFF;
+ haptics->resonant_freq_l =
-+ (1000000000 / (of_val32 * 1333)) & 0x7F;
++ (1000000000 / (val * 1333)) & 0x7F;
+ } else {
+ haptics->resonant_freq_h =
+ DA7280_RESONT_FREQH_DFT;
@@ -590,17 +988,17 @@
+ haptics->resonant_freq_l = DA7280_SKIP_INIT;
+ }
+
-+ if (of_property_read_u32(np, "dlg,ps-seq-id", &of_val32) >= 0)
-+ if (of_val32 <= DA7280_SEQ_ID_MAX)
-+ haptics->ps_seq_id = of_val32;
++ if (device_property_read_u32(dev, "dlg,ps-seq-id", &val) >= 0)
++ if (val <= DA7280_SEQ_ID_MAX)
++ haptics->ps_seq_id = val;
+ else
+ haptics->ps_seq_id = 0;
+ else /* if no property, set to zero as a default do nothing */
+ haptics->ps_seq_id = 0;
+
-+ if (of_property_read_u32(np, "dlg,ps-seq-loop", &of_val32) >= 0)
-+ if (of_val32 <= DA7280_SEQ_LOOP_MAX)
-+ haptics->ps_seq_loop = of_val32;
++ if (device_property_read_u32(dev, "dlg,ps-seq-loop", &val) >= 0)
++ if (val <= DA7280_SEQ_LOOP_MAX)
++ haptics->ps_seq_loop = val;
+ else
+ haptics->ps_seq_loop = 0;
+ else /* if no property, then do nothing */
@@ -608,112 +1006,137 @@
+
+ /* GPI0~2 Control */
+ for (i = 0; i < 3; i++) {
-+ dt_gpi_str1[7] = '0' + i;
-+ if (of_property_read_u32(np, dt_gpi_str1, &of_val32) >= 0)
-+ if (of_val32 <= DA7280_SEQ_ID_MAX)
-+ haptics->gpi_ctl[i].seq_id = of_val32;
++ gpi_str1[7] = '0' + i;
++ if (device_property_read_u32 (dev, gpi_str1, &val) >= 0)
++ if (val <= DA7280_SEQ_ID_MAX)
++ haptics->gpi_ctl[i].seq_id = val;
+ else
+ haptics->gpi_ctl[i].seq_id =
-+ DA7280_GPI1_SEQ_ID_DEFT + i;
++ DA7280_GPI_SEQ_ID_DFT + i;
+ else /* if no property, then do nothing */
+ haptics->gpi_ctl[i].seq_id =
-+ DA7280_GPI1_SEQ_ID_DEFT + i;
-+
-+ dt_gpi_str2[7] = '0' + i;
-+ if (!of_property_read_string(np, dt_gpi_str2, &of_str))
++ DA7280_GPI_SEQ_ID_DFT + i;
++
++ gpi_str2[7] = '0' + i;
++ if (!device_property_read_string(dev, gpi_str2, &str))
+ haptics->gpi_ctl[i].mode =
-+ da7280_haptic_of_gpi_mode_str(dev, of_str);
++ da7280_haptic_of_gpi_mode_str(dev, str);
+ else
+ haptics->gpi_ctl[i].mode = 0;
+
-+ dt_gpi_str3[7] = '0' + i;
-+ if (!of_property_read_string(np, dt_gpi_str3, &of_str))
++ gpi_str3[7] = '0' + i;
++ if (!device_property_read_string(dev, gpi_str3, &str))
+ haptics->gpi_ctl[i].polarity =
-+ da7280_haptic_of_gpi_pol_str(dev, of_str);
++ da7280_haptic_of_gpi_pol_str(dev, str);
+ else
+ haptics->gpi_ctl[i].polarity = 0;
+ }
+
+ haptics->bemf_sense_en =
-+ of_property_read_bool(np, "dlg,bemf-sens-enable");
++ device_property_read_bool(dev, "dlg,bemf-sens-enable");
+ haptics->freq_track_en =
-+ of_property_read_bool(np, "dlg,freq-track-enable");
++ device_property_read_bool(dev, "dlg,freq-track-enable");
+ haptics->acc_en =
-+ of_property_read_bool(np, "dlg,acc-enable");
++ device_property_read_bool(dev, "dlg,acc-enable");
+ haptics->rapid_stop_en =
-+ of_property_read_bool(np, "dlg,rapid-stop-enable");
++ device_property_read_bool(dev, "dlg,rapid-stop-enable");
+ haptics->amp_pid_en =
-+ of_property_read_bool(np, "dlg,amp-pid-enable");
-+
-+ if (of_property_read_u32_array(np, "dlg,mem-array",
-+ &mem[0], DA7280_SNP_MEM_SIZE) >= 0) {
-+ haptics->mem_update = 1;
++ device_property_read_bool(dev, "dlg,amp-pid-enable");
++
++ if (device_property_read_u32_array(dev, "dlg,mem-array",
++ &mem[0],
++ DA7280_SNP_MEM_SIZE) >= 0) {
++ haptics->mem_update = true;
++ memset(haptics->snp_mem, 0, DA7280_SNP_MEM_SIZE);
+ for (i = 0; i < DA7280_SNP_MEM_SIZE; i++) {
-+ if (mem[i] > 0xff)
-+ haptics->snp_mem[i] = 0x0;
-+ else
++ if (mem[i] <= 0xff) {
+ haptics->snp_mem[i] = (u8)mem[i];
++ } else {
++ dev_err(haptics->dev,
++ "Invalid data in mem-array\n");
++ haptics->mem_update = false;
++ break;
++ }
+ }
+ } else {
-+ haptics->mem_update = 0;
++ haptics->mem_update = false;
+ }
+}
+
+static irqreturn_t da7280_irq_handler(int irq, void *data)
+{
+ struct da7280_haptic *haptics = data;
++ struct device *dev = haptics->dev;
+ u8 events[IRQ_NUM];
-+ int ret;
++ int error;
+
+ /* Check what events have happened */
-+ ret = regmap_bulk_read(haptics->regmap,
-+ DA7280_IRQ_EVENT1,
-+ events, IRQ_NUM);
-+ if (ret)
++ error = regmap_bulk_read(haptics->regmap,
++ DA7280_IRQ_EVENT1,
++ events, IRQ_NUM);
++ if (error)
+ goto error_i2c;
+
-+ /* Empty check due to shared interrupt */
-+ if ((events[0] | events[1] | events[2]) == 0x00)
-+ return IRQ_HANDLED;
++ /* Clear events */
++ error = regmap_write(haptics->regmap,
++ DA7280_IRQ_EVENT1, events[0]);
++ if (error)
++ goto error_i2c;
+
+ if (events[0] & DA7280_E_SEQ_FAULT_MASK) {
+ /* Stop first if Haptic is working
+ * Otherwise, the fault may happen continually
+ * even though the bit is cleared.
+ */
-+ ret = regmap_update_bits(haptics->regmap,
-+ DA7280_TOP_CTL1,
-+ DA7280_OPERATION_MODE_MASK, 0);
-+ if (ret)
++ error = regmap_update_bits(haptics->regmap,
++ DA7280_TOP_CTL1,
++ DA7280_OPERATION_MODE_MASK, 0);
++ if (error)
+ goto error_i2c;
+ }
+
-+ /* Clear events */
-+ ret = regmap_write(haptics->regmap,
-+ DA7280_IRQ_EVENT1, events[0]);
-+ if (ret)
-+ goto error_i2c;
++ if (events[0] & DA7280_E_SEQ_DONE_MASK)
++ haptics->enabled = false;
++
++ if (events[0] & DA7280_E_WARNING_MASK) {
++ if (events[1] & DA7280_E_LIM_DRIVE_MASK ||
++ events[1] & DA7280_E_LIM_DRIVE_ACC_MASK)
++ dev_warn(dev, "Please reduce the driver level\n");
++ if (events[1] & DA7280_E_MEM_TYPE_MASK)
++ dev_warn(dev, "Please check the mem data format\n");
++ if (events[1] & DA7280_E_OVERTEMP_WARN_MASK)
++ dev_warn(dev, "Over-temperature warning\n");
++ }
++
++ if (events[0] & DA7280_E_SEQ_FAULT_MASK) {
++ if (events[2] & DA7280_E_SEQ_ID_FAULT_MASK)
++ dev_info(dev, "Please reload PS_SEQ_ID & mem data\n");
++ if (events[2] & DA7280_E_MEM_FAULT_MASK)
++ dev_info(dev, "Please reload the mem data\n");
++ if (events[2] & DA7280_E_PWM_FAULT_MASK)
++ dev_info(dev, "Please restart PWM interface\n");
++ }
+
+ return IRQ_HANDLED;
+
+error_i2c:
-+ dev_err(haptics->dev, "da7280 i2c error : %d\n", ret);
++ dev_err(dev, "da7280 i2c error: %pE\n", ERR_PTR(error));
+ return IRQ_NONE;
+}
+
+static int da7280_init(struct da7280_haptic *haptics)
+{
-+ int ret, i;
+ unsigned int val = 0;
+ u32 v2i_factor;
++ int error, i;
+ u8 mask = 0;
+
+ /* If device type is DA7280_DEV_MAX,
-+ * then skip to initialze and use default value inside chip.
++ * then just use default value inside chip.
+ */
+ if (haptics->dev_type == DA7280_DEV_MAX) {
-+ ret = regmap_read(haptics->regmap, DA7280_TOP_CFG1, &val);
-+ if (ret)
++ error = regmap_read(haptics->regmap, DA7280_TOP_CFG1, &val);
++ if (error)
+ goto error_i2c;
+ if (val & DA7280_ACTUATOR_TYPE_MASK)
+ haptics->dev_type = DA7280_ERM_COIN;
@@ -724,43 +1147,38 @@
+ /* Apply user settings */
+ if (haptics->dev_type == DA7280_LRA) {
+ if (haptics->resonant_freq_l != DA7280_SKIP_INIT) {
-+ ret = regmap_write(haptics->regmap,
-+ DA7280_FRQ_LRA_PER_H,
-+ haptics->resonant_freq_h);
-+ if (ret)
++ error = regmap_write(haptics->regmap,
++ DA7280_FRQ_LRA_PER_H,
++ haptics->resonant_freq_h);
++ if (error)
+ goto error_i2c;
-+ ret = regmap_write(haptics->regmap,
-+ DA7280_FRQ_LRA_PER_L,
-+ haptics->resonant_freq_l);
-+ if (ret)
++ error = regmap_write(haptics->regmap,
++ DA7280_FRQ_LRA_PER_L,
++ haptics->resonant_freq_l);
++ if (error)
+ goto error_i2c;
+ }
+ } else if (haptics->dev_type == DA7280_ERM_COIN) {
-+ ret = regmap_update_bits(haptics->regmap,
-+ DA7280_TOP_INT_CFG1,
-+ DA7280_BEMF_FAULT_LIM_MASK, 0);
-+ if (ret)
++ error = regmap_update_bits(haptics->regmap,
++ DA7280_TOP_INT_CFG1,
++ DA7280_BEMF_FAULT_LIM_MASK, 0);
++ if (error)
+ goto error_i2c;
+
-+ ret = regmap_update_bits(haptics->regmap,
-+ DA7280_TOP_CFG4,
-+ DA7280_TST_CALIB_IMPEDANCE_DIS_MASK |
-+ DA7280_V2I_FACTOR_FREEZE_MASK,
-+ DA7280_TST_CALIB_IMPEDANCE_DIS_MASK |
-+ DA7280_V2I_FACTOR_FREEZE_MASK);
-+ if (ret)
++ mask = DA7280_TST_CALIB_IMPEDANCE_DIS_MASK |
++ DA7280_V2I_FACTOR_FREEZE_MASK;
++ val = DA7280_TST_CALIB_IMPEDANCE_DIS_MASK |
++ DA7280_V2I_FACTOR_FREEZE_MASK;
++ error = regmap_update_bits(haptics->regmap,
++ DA7280_TOP_CFG4,
++ mask, val);
++ if (error)
+ goto error_i2c;
+
-+ haptics->acc_en = 0;
-+ haptics->rapid_stop_en = 0;
-+ haptics->amp_pid_en = 0;
-+ }
-+
-+ /* Should be set to 0 only
-+ * in custom waveform and wideband operation
-+ */
-+ if (haptics->op_mode >= DA7280_RTWM_MODE)
-+ haptics->bemf_sense_en = 0;
++ haptics->acc_en = false;
++ haptics->rapid_stop_en = false;
++ haptics->amp_pid_en = false;
++ }
+
+ mask = DA7280_ACTUATOR_TYPE_MASK |
+ DA7280_BEMF_SENSE_EN_MASK |
@@ -768,113 +1186,137 @@
+ DA7280_ACCELERATION_EN_MASK |
+ DA7280_RAPID_STOP_EN_MASK |
+ DA7280_AMP_PID_EN_MASK;
-+
-+ val = (haptics->dev_type ? 1 : 0)
-+ << DA7280_ACTUATOR_TYPE_SHIFT |
-+ (haptics->bemf_sense_en ? 1 : 0)
-+ << DA7280_BEMF_SENSE_EN_SHIFT |
-+ (haptics->freq_track_en ? 1 : 0)
-+ << DA7280_FREQ_TRACK_EN_SHIFT |
-+ (haptics->acc_en ? 1 : 0)
-+ << DA7280_ACCELERATION_EN_SHIFT |
-+ (haptics->rapid_stop_en ? 1 : 0)
-+ << DA7280_RAPID_STOP_EN_SHIFT |
-+ (haptics->amp_pid_en ? 1 : 0)
-+ << DA7280_AMP_PID_EN_SHIFT;
-+
-+ ret = regmap_update_bits(haptics->regmap,
-+ DA7280_TOP_CFG1, mask, val);
-+ if (ret)
++ val = FIELD_PREP(DA7280_ACTUATOR_TYPE_MASK,
++ (haptics->dev_type ? 1 : 0)) |
++ FIELD_PREP(DA7280_BEMF_SENSE_EN_MASK,
++ (haptics->bemf_sense_en ? 1 : 0)) |
++ FIELD_PREP(DA7280_FREQ_TRACK_EN_MASK,
++ (haptics->freq_track_en ? 1 : 0)) |
++ FIELD_PREP(DA7280_ACCELERATION_EN_MASK,
++ (haptics->acc_en ? 1 : 0)) |
++ FIELD_PREP(DA7280_RAPID_STOP_EN_MASK,
++ (haptics->rapid_stop_en ? 1 : 0)) |
++ FIELD_PREP(DA7280_AMP_PID_EN_MASK,
++ (haptics->amp_pid_en ? 1 : 0));
++
++ error = regmap_update_bits(haptics->regmap,
++ DA7280_TOP_CFG1, mask, val);
++ if (error)
+ goto error_i2c;
+
++ error = regmap_update_bits(haptics->regmap,
++ DA7280_TOP_CFG5,
++ DA7280_V2I_FACTOR_OFFSET_EN_MASK,
++ haptics->acc_en ?
++ DA7280_V2I_FACTOR_OFFSET_EN_MASK : 0);
++ if (error)
++ goto error_i2c;
++
++ error = regmap_update_bits(haptics->regmap,
++ DA7280_TOP_CFG2,
++ DA7280_MEM_DATA_SIGNED_MASK,
++ haptics->acc_en ?
++ 0 : DA7280_MEM_DATA_SIGNED_MASK);
++ if (error)
++ goto error_i2c;
++
+ if (haptics->nommax != DA7280_SKIP_INIT) {
-+ ret = regmap_write(haptics->regmap,
-+ DA7280_ACTUATOR1,
-+ haptics->nommax);
-+ if (ret)
++ error = regmap_write(haptics->regmap,
++ DA7280_ACTUATOR1,
++ haptics->nommax);
++ if (error)
+ goto error_i2c;
+ }
+
+ if (haptics->absmax != DA7280_SKIP_INIT) {
-+ ret = regmap_write(haptics->regmap, DA7280_ACTUATOR2,
-+ haptics->absmax);
-+ if (ret)
++ error = regmap_write(haptics->regmap, DA7280_ACTUATOR2,
++ haptics->absmax);
++ if (error)
+ goto error_i2c;
+ }
+
-+ ret = regmap_update_bits(haptics->regmap,
-+ DA7280_ACTUATOR3,
-+ DA7280_IMAX_MASK,
-+ haptics->imax);
-+ if (ret)
++ error = regmap_update_bits(haptics->regmap,
++ DA7280_ACTUATOR3,
++ DA7280_IMAX_MASK,
++ haptics->imax);
++ if (error)
+ goto error_i2c;
+
+ v2i_factor =
+ haptics->impd * (haptics->imax + 4) / 1610400;
-+ ret = regmap_write(haptics->regmap,
-+ DA7280_CALIB_V2I_L,
-+ v2i_factor & 0xff);
-+ if (ret)
++ error = regmap_write(haptics->regmap,
++ DA7280_CALIB_V2I_L,
++ v2i_factor & 0xff);
++ if (error)
+ goto error_i2c;
-+ ret = regmap_write(haptics->regmap,
-+ DA7280_CALIB_V2I_H,
-+ v2i_factor >> 8);
-+ if (ret)
++ error = regmap_write(haptics->regmap,
++ DA7280_CALIB_V2I_H,
++ v2i_factor >> 8);
++ if (error)
+ goto error_i2c;
+
-+ ret = regmap_update_bits(haptics->regmap,
-+ DA7280_TOP_CTL1,
-+ DA7280_STANDBY_EN_MASK,
-+ DA7280_STANDBY_EN_MASK);
-+ if (ret)
++ error = regmap_update_bits(haptics->regmap,
++ DA7280_TOP_CTL1,
++ DA7280_STANDBY_EN_MASK,
++ DA7280_STANDBY_EN_MASK);
++ if (error)
+ goto error_i2c;
+
+ if (haptics->mem_update) {
-+ ret = da7280_haptic_mem_update(haptics);
-+ if (ret)
++ error = da7280_haptic_mem_update(haptics);
++ if (error)
+ goto error_i2c;
+ }
+
+ /* Set PS_SEQ_ID and PS_SEQ_LOOP */
-+ val = haptics->ps_seq_id << DA7280_PS_SEQ_ID_SHIFT |
-+ haptics->ps_seq_loop << DA7280_PS_SEQ_LOOP_SHIFT;
-+ ret = regmap_write(haptics->regmap,
-+ DA7280_SEQ_CTL2, val);
-+ if (ret)
++ val = FIELD_PREP(DA7280_PS_SEQ_ID_MASK, haptics->ps_seq_id) |
++ FIELD_PREP(DA7280_PS_SEQ_LOOP_MASK, haptics->ps_seq_loop);
++ error = regmap_write(haptics->regmap,
++ DA7280_SEQ_CTL2, val);
++ if (error)
+ goto error_i2c;
+
+ /* GPI(N) CTL */
+ for (i = 0; i < 3; i++) {
-+ val = haptics->gpi_ctl[i].seq_id
-+ << DA7280_GPI0_SEQUENCE_ID_SHIFT |
-+ haptics->gpi_ctl[i].mode
-+ << DA7280_GPI0_MODE_SHIFT |
-+ haptics->gpi_ctl[i].polarity
-+ << DA7280_GPI0_POLARITY_SHIFT;
-+ ret = regmap_write(haptics->regmap,
-+ DA7280_GPI_0_CTL + i, val);
-+ if (ret)
++ val = FIELD_PREP(DA7280_GPI0_SEQUENCE_ID_MASK,
++ haptics->gpi_ctl[i].seq_id) |
++ FIELD_PREP(DA7280_GPI0_MODE_MASK,
++ haptics->gpi_ctl[i].mode) |
++ FIELD_PREP(DA7280_GPI0_POLARITY_MASK,
++ haptics->gpi_ctl[i].polarity);
++ error = regmap_write(haptics->regmap,
++ DA7280_GPI_0_CTL + i, val);
++ if (error)
+ goto error_i2c;
+ }
+
++ /* Mask ADC_SAT_M bit as default */
++ error = regmap_update_bits(haptics->regmap,
++ DA7280_IRQ_MASK2,
++ DA7280_ADC_SAT_M_MASK,
++ DA7280_ADC_SAT_M_MASK);
++ if (error)
++ goto error_i2c;
++
+ /* Clear Interrupts */
-+ ret = regmap_write(haptics->regmap, DA7280_IRQ_EVENT1, 0xff);
-+ if (ret)
++ error = regmap_write(haptics->regmap, DA7280_IRQ_EVENT1, 0xff);
++ if (error)
+ goto error_i2c;
+
-+ ret = regmap_update_bits(haptics->regmap,
-+ DA7280_IRQ_MASK1,
-+ DA7280_SEQ_FAULT_M_MASK
-+ | DA7280_SEQ_DONE_M_MASK, 0);
-+ if (ret)
++ error = regmap_update_bits(haptics->regmap,
++ DA7280_IRQ_MASK1,
++ DA7280_SEQ_FAULT_M_MASK
++ | DA7280_SEQ_DONE_M_MASK, 0);
++ if (error)
+ goto error_i2c;
+
-+ haptics->suspend_state = 0;
++ haptics->enabled = false;
+ return 0;
+
+error_i2c:
-+ dev_err(haptics->dev, "haptic init - I2C error : %d\n", ret);
-+ return ret;
++ dev_err(haptics->dev,
++ "haptic init - i2c error: %pE\n", ERR_PTR(error));
++ return error;
+}
+
+/* Valid format for ps_seq_id
@@ -888,20 +1330,25 @@
+ size_t count)
+{
+ struct da7280_haptic *haptics = dev_get_drvdata(dev);
++ unsigned int set_val;
+ long val = 0xff;
-+ int ret;
++ int error;
++
++ if (haptics->enabled)
++ return -EBUSY;
+
+ if (kstrtol(&buf[0], 0, &val) < 0)
+ goto err;
+
-+ ret = regmap_update_bits(haptics->regmap,
-+ DA7280_SEQ_CTL2,
-+ DA7280_PS_SEQ_ID_MASK,
-+ (val & 0xf) >> DA7280_PS_SEQ_ID_SHIFT);
-+ if (ret) {
++ set_val = FIELD_PREP(DA7280_PS_SEQ_ID_MASK, (val & 0xf));
++ error = regmap_update_bits(haptics->regmap,
++ DA7280_SEQ_CTL2,
++ DA7280_PS_SEQ_ID_MASK,
++ set_val);
++ if (error) {
+ dev_err(haptics->dev,
-+ "failed to update register : %d\n", ret);
-+ return ret;
++ "failed to update register: %pE\n", ERR_PTR(error));
++ return error;
+ }
+
+ haptics->ps_seq_id = val & 0xf;
@@ -918,17 +1365,16 @@
+ char *buf)
+{
+ struct da7280_haptic *haptics = dev_get_drvdata(dev);
-+ int ret;
+ unsigned int val;
-+
-+ ret = regmap_read(haptics->regmap, DA7280_SEQ_CTL2, &val);
-+ if (ret) {
++ int error;
++
++ error = regmap_read(haptics->regmap, DA7280_SEQ_CTL2, &val);
++ if (error) {
+ dev_err(haptics->dev,
-+ "failed to read register : %d\n", ret);
-+ return ret;
-+ }
-+ val = (val & DA7280_PS_SEQ_ID_MASK)
-+ >> DA7280_PS_SEQ_ID_SHIFT;
++ "failed to read register: %pE\n", ERR_PTR(error));
++ return error;
++ }
++ val = FIELD_GET(DA7280_PS_SEQ_ID_MASK, val);
+
+ return sprintf(buf, "ps_seq_id is %d\n", val);
+}
@@ -944,20 +1390,25 @@
+ size_t count)
+{
+ struct da7280_haptic *haptics = dev_get_drvdata(dev);
++ unsigned int set_val;
+ long val = 0xff;
-+ int ret;
++ int error;
++
++ if (haptics->enabled)
++ return -EBUSY;
+
+ if (kstrtol(&buf[0], 0, &val) < 0)
+ goto err;
+
-+ ret = regmap_update_bits(haptics->regmap,
-+ DA7280_SEQ_CTL2,
-+ DA7280_PS_SEQ_LOOP_MASK,
-+ (val & 0xF) << DA7280_PS_SEQ_LOOP_SHIFT);
-+ if (ret) {
++ set_val = FIELD_PREP(DA7280_PS_SEQ_LOOP_MASK, (val & 0xf));
++ error = regmap_update_bits(haptics->regmap,
++ DA7280_SEQ_CTL2,
++ DA7280_PS_SEQ_LOOP_MASK,
++ set_val);
++ if (error) {
+ dev_err(haptics->dev,
-+ "failed to update register : %d\n", ret);
-+ return ret;
++ "failed to update register: %pE\n", ERR_PTR(error));
++ return error;
+ }
+
+ haptics->ps_seq_loop = (val & 0xF);
@@ -973,239 +1424,192 @@
+ char *buf)
+{
+ struct da7280_haptic *haptics = dev_get_drvdata(dev);
-+ int ret;
+ unsigned int val;
-+
-+ ret = regmap_read(haptics->regmap, DA7280_SEQ_CTL2, &val);
-+ if (ret) {
++ int error;
++
++ error = regmap_read(haptics->regmap, DA7280_SEQ_CTL2, &val);
++ if (error) {
+ dev_err(haptics->dev,
-+ "failed to read register : %d\n", ret);
-+ return ret;
-+ }
-+ val = (val & DA7280_PS_SEQ_LOOP_MASK)
-+ >> DA7280_PS_SEQ_LOOP_SHIFT;
++ "failed to read register: %pE\n", ERR_PTR(error));
++ return error;
++ }
++
++ val = FIELD_GET(DA7280_PS_SEQ_LOOP_MASK, val);
+
+ return sprintf(buf, "ps_seq_loop is %d\n", val);
+}
+
+/* Valid format for GPIx_SEQUENCE_ID
-+ * echo X Y > gpi_seq_id
-+ * ex) echo 2 15 > /sys/class/..../gpi_seq_id
-+ * 0 <= X < 3, 0<= Y <= 15.
++ * echo X > ./gpi_seq_id0
++ * Range of X: 0 <= X <= 15
++ * ex)
++ * echo 1 > /sys/class/..../gpi_seq_id0
++ * echo 2 > /sys/class/..../gpi_seq_id1
++ * echo 3 > /sys/class/..../gpi_seq_id2
+ */
-+static ssize_t gpi_seq_id_store(struct device *dev,
++static ssize_t gpi_seq_id0_store(struct device *dev,
++ struct device_attribute *attr,
++ const char *buf,
++ size_t count)
++{
++ struct da7280_haptic *haptics = dev_get_drvdata(dev);
++ unsigned int set_val;
++ long val = 0xff;
++ int error;
++
++ if (haptics->enabled)
++ return -EBUSY;
++
++ if (kstrtol(&buf[0], 0, &val) < 0)
++ goto err;
++
++ set_val = FIELD_PREP(DA7280_GPI0_SEQUENCE_ID_MASK, (val & 0xf));
++ error = regmap_update_bits(haptics->regmap,
++ DA7280_GPI_0_CTL,
++ DA7280_GPI0_SEQUENCE_ID_MASK,
++ set_val);
++ if (error) {
++ dev_err(haptics->dev,
++ "failed to update register: %pE\n", ERR_PTR(error));
++ return error;
++ }
++
++ haptics->gpi_ctl[0].seq_id = val & 0xf;
++
++ return count;
++
++err:
++ dev_err(dev, "Invalid input\n");
++ return count;
++}
++
++static ssize_t gpi_seq_id0_show(struct device *dev,
+ struct device_attribute *attr,
-+ const char *buf,
-+ size_t count)
++ char *buf)
+{
+ struct da7280_haptic *haptics = dev_get_drvdata(dev);
-+ u8 gpi_num = 0xff;
-+ long seq_id = 0xff;
-+ int ret;
-+
-+ if (count < 4)
++ unsigned int val;
++ int error;
++
++ error = regmap_read(haptics->regmap, DA7280_GPI_0_CTL, &val);
++ if (error) {
++ dev_err(haptics->dev,
++ "failed to read register: %pE\n", ERR_PTR(error));
++ return error;
++ }
++ val = FIELD_GET(DA7280_GPI0_SEQUENCE_ID_MASK, val);
++
++ return sprintf(buf, "gpi_seq_id0 is %d\n", val);
++}
++
++static ssize_t gpi_seq_id1_store(struct device *dev,
++ struct device_attribute *attr,
++ const char *buf,
++ size_t count)
++{
++ struct da7280_haptic *haptics = dev_get_drvdata(dev);
++ unsigned int set_val;
++ long val = 0xff;
++ int error;
++
++ if (haptics->enabled)
++ return -EBUSY;
++
++ if (kstrtol(&buf[0], 0, &val) < 0)
+ goto err;
+
-+ if (buf[0] >= '0')
-+ gpi_num = buf[0] - '0';
-+ else
++ set_val = FIELD_PREP(DA7280_GPI1_SEQUENCE_ID_MASK, (val & 0xf));
++ error = regmap_update_bits(haptics->regmap,
++ DA7280_GPI_1_CTL,
++ DA7280_GPI1_SEQUENCE_ID_MASK,
++ set_val);
++ if (error) {
++ dev_err(haptics->dev,
++ "failed to update register: %pE\n", ERR_PTR(error));
++ return error;
++ }
++
++ haptics->gpi_ctl[1].seq_id = val & 0xf;
++
++ return count;
++
++err:
++ dev_err(dev, "Invalid input\n");
++ return count;
++}
++
++static ssize_t gpi_seq_id1_show(struct device *dev,
++ struct device_attribute *attr,
++ char *buf)
++{
++ struct da7280_haptic *haptics = dev_get_drvdata(dev);
++ unsigned int val;
++ int error;
++
++ error = regmap_read(haptics->regmap, DA7280_GPI_1_CTL, &val);
++ if (error) {
++ dev_err(haptics->dev,
++ "failed to read register: %pE\n", ERR_PTR(error));
++ return error;
++ }
++ val = FIELD_GET(DA7280_GPI1_SEQUENCE_ID_MASK, val);
++
++ return sprintf(buf, "gpi_seq_id1 is %d\n", val);
++}
++
++static ssize_t gpi_seq_id2_store(struct device *dev,
++ struct device_attribute *attr,
++ const char *buf,
++ size_t count)
++{
++ struct da7280_haptic *haptics = dev_get_drvdata(dev);
++ unsigned int set_val;
++ long val = 0xff;
++ int error;
++
++ if (haptics->enabled)
++ return -EBUSY;
++
++ if (kstrtol(&buf[0], 0, &val) < 0)
+ goto err;
+
-+ if (buf[1] != ' ')
-+ goto err;
-+
-+ if (kstrtol(&buf[2], 0, &seq_id) < 0)
-+ goto err;
-+
-+ if (gpi_num > 2 || seq_id > 0xf)
-+ goto err;
-+
-+ ret = regmap_update_bits(haptics->regmap,
-+ DA7280_GPI_0_CTL + gpi_num,
-+ DA7280_GPI0_SEQUENCE_ID_MASK,
-+ seq_id << DA7280_GPI0_SEQUENCE_ID_SHIFT);
-+ if (ret) {
++ set_val = FIELD_PREP(DA7280_GPI2_SEQUENCE_ID_MASK, (val & 0xf));
++ error = regmap_update_bits(haptics->regmap,
++ DA7280_GPI_2_CTL,
++ DA7280_GPI2_SEQUENCE_ID_MASK,
++ set_val);
++ if (error) {
+ dev_err(haptics->dev,
-+ "failed to update register : %d\n", ret);
-+ return ret;
-+ }
-+
-+ haptics->gpi_ctl[gpi_num].seq_id = seq_id;
++ "failed to update register: %pE\n", ERR_PTR(error));
++ return error;
++ }
++
++ haptics->gpi_ctl[2].seq_id = val & 0xf;
+
+ return count;
+
+err:
-+ dev_err(dev, "Invalid format or values!\n");
++ dev_err(dev, "Invalid input\n");
+ return count;
+}
+
-+static ssize_t gpi_seq_id_show(struct device *dev,
-+ struct device_attribute *attr,
-+ char *buf)
++static ssize_t gpi_seq_id2_show(struct device *dev,
++ struct device_attribute *attr,
++ char *buf)
+{
+ struct da7280_haptic *haptics = dev_get_drvdata(dev);
-+ int ret;
-+ unsigned int val, i;
-+
-+ for (i = 0; i < 3; i++) {
-+ ret = regmap_read(haptics->regmap,
-+ DA7280_GPI_0_CTL + i, &val);
-+ if (ret) {
-+ dev_err(haptics->dev,
-+ "failed to read register : %d\n", ret);
-+ return ret;
-+ }
-+ haptics->gpi_ctl[i].seq_id =
-+ (val & DA7280_GPI0_SEQUENCE_ID_MASK)
-+ >> DA7280_GPI0_SEQUENCE_ID_SHIFT;
-+ val = 0;
-+ }
-+
-+ return sprintf(buf,
-+ "Seq ID\nGPI0 : %d\nGPI1 : %d\nGPI2 : %d\n",
-+ haptics->gpi_ctl[0].seq_id,
-+ haptics->gpi_ctl[1].seq_id,
-+ haptics->gpi_ctl[2].seq_id);
-+}
-+
-+/* Valid format for GPIx_MODE
-+ * echo X Y > gpi_mode
-+ * ex) echo 2 1 > /sys/class/..../gpi_mode
-+ * 0 <= X < 3, 0<= Y <= 1.
-+ */
-+static ssize_t gpi_mode_store(struct device *dev,
-+ struct device_attribute *attr,
-+ const char *buf, size_t count)
-+{
-+ struct da7280_haptic *haptics = dev_get_drvdata(dev);
-+ u8 gpi_num = 0xff, gpi_mode = 0xff;
-+ int ret;
-+
-+ if (count < 3)
-+ goto err;
-+
-+ if (buf[0] >= '0')
-+ gpi_num = buf[0] - '0';
-+ if (buf[2] >= '0')
-+ gpi_mode = buf[2] - '0';
-+
-+ if (gpi_num > 2 || gpi_mode > 1)
-+ goto err;
-+
-+ ret = regmap_update_bits(haptics->regmap,
-+ DA7280_GPI_0_CTL + gpi_num,
-+ DA7280_GPI0_MODE_MASK,
-+ gpi_mode << DA7280_GPI0_MODE_SHIFT);
-+ if (ret) {
++ unsigned int val;
++ int error;
++
++ error = regmap_read(haptics->regmap, DA7280_GPI_2_CTL, &val);
++ if (error) {
+ dev_err(haptics->dev,
-+ "failed to update register : %d\n", ret);
-+ return ret;
-+ }
-+
-+ haptics->gpi_ctl[gpi_num].mode = gpi_mode;
-+
-+ return count;
-+
-+err:
-+ dev_err(dev, "Invalid format!\n");
-+ return count;
-+}
-+
-+static ssize_t gpi_mode_show(struct device *dev,
-+ struct device_attribute *attr,
-+ char *buf)
-+{
-+ struct da7280_haptic *haptics = dev_get_drvdata(dev);
-+ int ret;
-+ unsigned int val, i;
-+
-+ for (i = 0; i < 3; i++) {
-+ ret = regmap_read(haptics->regmap,
-+ DA7280_GPI_0_CTL + i, &val);
-+ if (ret) {
-+ dev_err(haptics->dev,
-+ "failed to read register : %d\n", ret);
-+ return ret;
-+ }
-+ haptics->gpi_ctl[i].mode =
-+ (val & DA7280_GPI0_MODE_MASK)
-+ >> DA7280_GPI0_MODE_SHIFT;
-+ val = 0;
-+ }
-+
-+ return sprintf(buf, "Mode\nGPI0 : %d\nGPI1 : %d\nGPI2 : %d\n",
-+ haptics->gpi_ctl[0].mode,
-+ haptics->gpi_ctl[1].mode,
-+ haptics->gpi_ctl[2].mode);
-+}
-+
-+/* Valid format for GPIx_MODE
-+ * echo X Y > gpi_pol
-+ * ex) echo 2 1 > /sys/class/..../gpi_pol
-+ * 0 <= X < 3, 0<= Y <= 2.
-+ */
-+static ssize_t gpi_pol_store(struct device *dev,
-+ struct device_attribute *attr,
-+ const char *buf,
-+ size_t count)
-+{
-+ struct da7280_haptic *haptics = dev_get_drvdata(dev);
-+ u8 gpi_pol = 0xff, gpi_num = 0xff;
-+ int ret;
-+
-+ if (count < 3)
-+ goto err;
-+
-+ if (buf[0] >= '0')
-+ gpi_num = buf[0] - '0';
-+ if (buf[2] >= '0')
-+ gpi_pol = buf[2] - '0';
-+
-+ if (gpi_num > 2 || gpi_pol > 2)
-+ goto err;
-+
-+ ret = regmap_update_bits(haptics->regmap,
-+ DA7280_GPI_0_CTL + gpi_num,
-+ DA7280_GPI0_POLARITY_MASK,
-+ gpi_pol << DA7280_GPI0_POLARITY_SHIFT);
-+ if (ret) {
-+ dev_err(haptics->dev,
-+ "failed to update register : %d\n", ret);
-+ return ret;
-+ }
-+
-+ haptics->gpi_ctl[gpi_num].polarity = gpi_pol;
-+
-+ return count;
-+
-+err:
-+ dev_err(dev, "Invalid format or input values!\n");
-+ return count;
-+}
-+
-+static ssize_t gpi_pol_show(struct device *dev,
-+ struct device_attribute *attr,
-+ char *buf)
-+{
-+ struct da7280_haptic *haptics = dev_get_drvdata(dev);
-+ int ret = 0;
-+ unsigned int val, i;
-+
-+ for (i = 0; i < 3; i++) {
-+ ret = regmap_read(haptics->regmap,
-+ DA7280_GPI_0_CTL + i, &val);
-+ if (ret)
-+ return ret;
-+ haptics->gpi_ctl[i].polarity =
-+ (val & DA7280_GPI0_POLARITY_MASK)
-+ >> DA7280_GPI0_POLARITY_SHIFT;
-+ val = 0;
-+ }
-+
-+ return sprintf(buf, "Polarity\nGPI0 : %d\nGPI1 : %d\nGPI2 : %d\n",
-+ haptics->gpi_ctl[0].polarity,
-+ haptics->gpi_ctl[1].polarity,
-+ haptics->gpi_ctl[2].polarity);
++ "failed to read register: %pE\n", ERR_PTR(error));
++ return error;
++ }
++ val = FIELD_GET(DA7280_GPI2_SEQUENCE_ID_MASK, val);
++
++ return sprintf(buf, "gpi_seq_id2 is %d\n", val);
+}
+
+#define MAX_PTN_REGS DA7280_SNP_MEM_SIZE
@@ -1219,10 +1623,10 @@
+ char *cmd, struct parse_data_t *ptn)
+{
+ struct da7280_haptic *haptics = dev_get_drvdata(dev);
-+ char *tok; /* used to separate tokens */
-+ const char ct[] = " \t"; /* space or tab delimits the tokens */
++ static const char ct[] = " \t"; /* space or tab delimits the tokens */
+ int tok_count = 0; /* total number of tokens parsed */
+ int i = 0, val;
++ char *tok; /* used to separate tokens */
+
+ ptn->len = 0;
+
@@ -1267,19 +1671,19 @@
+ size_t count)
+{
+ struct da7280_haptic *haptics = dev_get_drvdata(dev);
++ char cmd[MAX_USER_INPUT_LEN];
+ struct parse_data_t mem;
-+ char cmd[MAX_USER_INPUT_LEN];
+ unsigned int val;
-+ int ret;
-+
-+ ret = regmap_read(haptics->regmap, DA7280_MEM_CTL1, &val);
-+ if (ret)
-+ return ret;
++ int error;
++
++ error = regmap_read(haptics->regmap, DA7280_MEM_CTL1, &val);
++ if (error)
++ return error;
+
+ if (count > MAX_USER_INPUT_LEN)
-+ memcpy(cmd, buf, MAX_USER_INPUT_LEN);
-+ else
-+ memcpy(cmd, buf, count);
++ count = MAX_USER_INPUT_LEN;
++ memcpy(cmd, buf, count);
++
+ /* chop of '\n' introduced by echo at the end of the input */
+ if (cmd[count - 1] == '\n')
+ cmd[count - 1] = '\0';
@@ -1287,27 +1691,31 @@
+ if (da7280_parse_args(dev, cmd, &mem) < 0)
+ return -EINVAL;
+
++ if (mem.len > DA7280_SNP_MEM_SIZE)
++ return -EINVAL;
++
++ memset(haptics->snp_mem, 0, DA7280_SNP_MEM_SIZE);
+ memcpy(haptics->snp_mem, mem.val, mem.len);
+
-+ ret = da7280_haptic_mem_update(haptics);
-+ if (ret)
-+ return ret;
++ error = da7280_haptic_mem_update(haptics);
++ if (error)
++ return error;
+
+ return count;
+}
+
+static DEVICE_ATTR_RW(ps_seq_id);
+static DEVICE_ATTR_RW(ps_seq_loop);
-+static DEVICE_ATTR_RW(gpi_seq_id);
-+static DEVICE_ATTR_RW(gpi_mode);
-+static DEVICE_ATTR_RW(gpi_pol);
++static DEVICE_ATTR_RW(gpi_seq_id0);
++static DEVICE_ATTR_RW(gpi_seq_id1);
++static DEVICE_ATTR_RW(gpi_seq_id2);
+static DEVICE_ATTR_WO(patterns);
+static struct attribute *da7280_sysfs_attr[] = {
+ &dev_attr_ps_seq_id.attr,
+ &dev_attr_ps_seq_loop.attr,
-+ &dev_attr_gpi_seq_id.attr,
-+ &dev_attr_gpi_mode.attr,
-+ &dev_attr_gpi_pol.attr,
++ &dev_attr_gpi_seq_id0.attr,
++ &dev_attr_gpi_seq_id1.attr,
++ &dev_attr_gpi_seq_id2.attr,
+ &dev_attr_patterns.attr,
+ NULL,
+};
@@ -1316,18 +1724,15 @@
+ .attrs = da7280_sysfs_attr,
+};
+
-+static const struct attribute_group *da7280_attr_groups[] = {
-+ &da7280_attr_group,
-+ NULL,
-+};
-+
+static int da7280_probe(struct i2c_client *client,
+ const struct i2c_device_id *id)
+{
+ struct device *dev = &client->dev;
+ struct da7280_haptic *haptics;
-+ unsigned int period2freq;
-+ int ret;
++ struct input_dev *input_dev;
++ struct pwm_state state;
++ struct ff_device *ff;
++ int error;
+
+ haptics = devm_kzalloc(dev, sizeof(*haptics), GFP_KERNEL);
+ if (!haptics)
@@ -1339,134 +1744,153 @@
+ return -EINVAL;
+ }
+
-+ /* Handle DT data if provided */
-+ if (client->dev.of_node)
-+ da7280_of_to_pdata(&client->dev, haptics);
-+
-+ if (haptics->op_mode == DA7280_PWM_MODE) {
-+ /* Get pwm and regulatot for haptics device */
-+ haptics->pwm_dev = devm_pwm_get(&client->dev, NULL);
++ da7280_parse_properties(dev, haptics);
++
++ if (haptics->const_op_mode == DA7280_PWM_MODE) {
++ haptics->pwm_dev = devm_pwm_get(dev, NULL);
+ if (IS_ERR(haptics->pwm_dev)) {
-+ dev_err(dev, "failed to get PWM device\n");
-+ return PTR_ERR(haptics->pwm_dev);
-+ }
-+
-+ /*
-+ * FIXME: pwm_apply_args() should be removed when switching to
-+ * the atomic PWM API.
++ error = PTR_ERR(haptics->pwm_dev);
++ if (error != -EPROBE_DEFER)
++ dev_err(dev, "unable to request PWM: %pE\n",
++ ERR_PTR(error));
++ return error;
++ }
++
++ /* Sync up PWM state and ensure it is off. */
++ pwm_init_state(haptics->pwm_dev, &state);
++ state.enabled = false;
++ error = pwm_apply_state(haptics->pwm_dev, &state);
++ if (error) {
++ dev_err(dev,
++ "failed to apply initial PWM state: %pE\n",
++ ERR_PTR(error));
++ return error;
++ }
++
++ /* Check PWM period, PWM freq = 1000000 / state.period.
++ * The valid PWM freq range: 10k ~ 250kHz.
+ */
-+ pwm_apply_args(haptics->pwm_dev);
-+
-+ /* Check PWM Period, it must be in 10k ~ 250kHz */
-+ period2freq = 1000000 / pwm_get_period(haptics->pwm_dev);
-+ if (period2freq < DA7280_MIN_PWM_FREQ_KHZ ||
-+ period2freq > DA7280_MAX_PWM_FREQ_KHZ) {
-+ dev_err(dev, "Not supported PWM frequency(%d)\n",
-+ period2freq);
++ if (state.period > 100000 || state.period < 4000) {
++ dev_err(dev, "Unsupported PWM period (%u)\n",
++ state.period);
+ return -EINVAL;
+ }
+ }
+
-+ INIT_WORK(&haptics->work, da7280_haptic_work);
++ INIT_DELAYED_WORK(&haptics->work_duration, da7280_haptic_work_duration);
++ INIT_WORK(&haptics->work_playback, da7280_haptic_work_playback);
++ INIT_WORK(&haptics->work_setgain, da7280_haptic_work_setgain);
++
+ haptics->client = client;
+ i2c_set_clientdata(client, haptics);
+
+ haptics->regmap =
+ devm_regmap_init_i2c(client, &da7280_haptic_regmap_config);
+ if (IS_ERR(haptics->regmap)) {
-+ ret = PTR_ERR(haptics->regmap);
-+ dev_err(dev, "Failed to allocate register map : %d\n",
-+ ret);
-+ return ret;
-+ }
-+
-+ ret = devm_request_threaded_irq(dev, client->irq, NULL,
-+ da7280_irq_handler,
-+ IRQF_TRIGGER_LOW | IRQF_ONESHOT,
-+ "da7280-haptics", haptics);
-+ if (ret != 0) {
-+ dev_err(dev,
-+ "Failed to request IRQ : %d\n", client->irq);
-+ return ret;
-+ }
-+
-+ ret = da7280_init(haptics);
-+ if (ret) {
++ error = PTR_ERR(haptics->regmap);
++ dev_err(dev, "Failed to allocate register map: %pE\n",
++ ERR_PTR(error));
++ return error;
++ }
++
++ error = da7280_init(haptics);
++ if (error) {
+ dev_err(dev, "failed to initialize device\n");
-+ return ret;
++ return error;
+ }
+
+ /* Initialize input device for haptic device */
-+ haptics->input_dev = devm_input_allocate_device(dev);
-+ if (!haptics->input_dev) {
++ input_dev = devm_input_allocate_device(dev);
++ if (!input_dev) {
+ dev_err(dev, "failed to allocate input device\n");
+ return -ENOMEM;
+ }
+
-+ haptics->input_dev->name = "da7280-haptic";
-+ haptics->input_dev->dev.parent = client->dev.parent;
-+ haptics->input_dev->open = da7280_haptic_open;
-+ haptics->input_dev->close = da7280_haptic_close;
-+ input_set_drvdata(haptics->input_dev, haptics);
-+ input_set_capability(haptics->input_dev, EV_FF, FF_RUMBLE);
-+
-+ ret = input_ff_create_memless(haptics->input_dev, NULL,
-+ da7280_haptic_play);
-+ if (ret) {
-+ dev_err(dev, "failed to create force-feedback\n");
-+ return ret;
-+ }
-+
-+#ifdef CONFIG_SYSFS
-+ haptics->input_dev->dev.groups = da7280_attr_groups;
-+#endif
-+
-+ ret = input_register_device(haptics->input_dev);
-+ if (ret)
++ input_dev->name = "da7280-haptic";
++ input_dev->dev.parent = client->dev.parent;
++ input_dev->open = da7280_haptic_open;
++ input_dev->close = da7280_haptic_close;
++ input_set_drvdata(input_dev, haptics);
++ haptics->input_dev = input_dev;
++
++ input_set_capability(haptics->input_dev, EV_FF, FF_PERIODIC);
++ input_set_capability(haptics->input_dev, EV_FF, FF_CUSTOM);
++ input_set_capability(haptics->input_dev, EV_FF, FF_CONSTANT);
++ input_set_capability(haptics->input_dev, EV_FF, FF_GAIN);
++
++ error = input_ff_create(haptics->input_dev, DA7280_FF_EFFECT_COUNT_MAX);
++ if (error) {
++ dev_err(dev, "create FF input device failed: %pE\n",
++ ERR_PTR(error));
++ return error;
++ }
++
++ ff = input_dev->ff;
++ ff->upload = da7280_haptics_upload_effect;
++ ff->playback = da7280_haptics_playback;
++ ff->set_gain = da7280_haptics_set_gain;
++
++ error = input_register_device(input_dev);
++ if (error) {
+ dev_err(dev, "failed to register input device\n");
-+
-+ return ret;
++ return error;
++ }
++
++ error = devm_device_add_group(dev, &da7280_attr_group);
++ if (error) {
++ dev_err(dev, "Failed to create sysfs attributes: %pE\n",
++ ERR_PTR(error));
++ return error;
++ }
++
++ error = devm_request_threaded_irq(dev, client->irq, NULL,
++ da7280_irq_handler,
++ IRQF_ONESHOT,
++ "da7280-haptics", haptics);
++ if (error)
++ dev_err(dev, "Failed to request IRQ: %pE\n",
++ ERR_PTR(error));
++
++ return error;
+}
+
+static int __maybe_unused da7280_suspend(struct device *dev)
+{
+ struct da7280_haptic *haptics = dev_get_drvdata(dev);
-+ int ret = 0;
++ int error = 0;
+
+ mutex_lock(&haptics->input_dev->mutex);
-+ if (haptics->suspend_state == 0) {
-+ ret = regmap_update_bits(haptics->regmap,
-+ DA7280_TOP_CTL1,
-+ DA7280_STANDBY_EN_MASK, 0);
-+ if (ret)
-+ dev_err(haptics->dev,
-+ "I2C error : %d\n", ret);
-+ else
-+ haptics->suspend_state = 1;
-+ }
++
++ da7280_haptic_disable(haptics);
++
++ error = regmap_update_bits(haptics->regmap,
++ DA7280_TOP_CTL1,
++ DA7280_STANDBY_EN_MASK, 0);
++ if (error)
++ dev_err(haptics->dev,
++ "I2C error : %pE\n", ERR_PTR(error));
++
+ mutex_unlock(&haptics->input_dev->mutex);
-+ return ret;
++ return error;
+}
+
+static int __maybe_unused da7280_resume(struct device *dev)
+{
+ struct da7280_haptic *haptics = dev_get_drvdata(dev);
-+ int ret = 0;
++ int error = 0;
+
+ mutex_lock(&haptics->input_dev->mutex);
-+ if (haptics->suspend_state) {
-+ ret = regmap_update_bits(haptics->regmap,
-+ DA7280_TOP_CTL1,
-+ DA7280_STANDBY_EN_MASK,
-+ DA7280_STANDBY_EN_MASK);
-+ if (ret)
-+ dev_err(haptics->dev,
-+ "i2c error : %d\n", ret);
-+ else
-+ haptics->suspend_state = 0;
-+ }
++
++ error = regmap_update_bits(haptics->regmap,
++ DA7280_TOP_CTL1,
++ DA7280_STANDBY_EN_MASK,
++ DA7280_STANDBY_EN_MASK);
++ if (error)
++ dev_err(haptics->dev,
++ "i2c error : %pE\n", ERR_PTR(error));
++
+ mutex_unlock(&haptics->input_dev->mutex);
-+ return ret;
++ return error;
+}
+
+static const struct of_device_id da7280_of_match[] = {
@@ -1485,436 +1909,19 @@
+ da7280_suspend, da7280_resume);
+
+static struct i2c_driver da7280_driver = {
-+ .driver = {
-+ .name = "da7280",
++ .driver = {
++ .name = "da7280",
+ .of_match_table = of_match_ptr(da7280_of_match),
-+ .pm = &da7280_pm_ops,
++ .pm = &da7280_pm_ops,
+ },
-+ .probe = da7280_probe,
-+ .id_table = da7280_i2c_id,
++ .probe = da7280_probe,
++ .id_table = da7280_i2c_id,
+};
+module_i2c_driver(da7280_driver);
+
+MODULE_DESCRIPTION("DA7280 haptics driver");
+MODULE_AUTHOR("Roy Im <Roy.Im.Opensource@diasemi.com>");
+MODULE_LICENSE("GPL");
-diff --git a/drivers/input/misc/da7280.h b/drivers/input/misc/da7280.h
-new file mode 100644
-index 0000000..d9310b6
---- /dev/null
-+++ b/drivers/input/misc/da7280.h
-@@ -0,0 +1,412 @@
-+/* SPDX-License-Identifier: GPL-2.0+ */
-+/*
-+ * DA7280 Haptic device driver registers
-+ *
-+ * Copyright (c) 2017 Dialog Semiconductor.
-+ * Author: Roy Im <Roy.Im.Opensource@diasemi.com>
-+ */
-+
-+#ifndef _DA7280_REG_DEFS_H
-+#define _DA7280_REG_DEFS_H
-+
-+#include <linux/bitops.h>
-+
-+/* Registers */
-+
-+#define DA7280_CHIP_REV 0x00
-+#define DA7280_IRQ_EVENT1 0x03
-+#define DA7280_IRQ_EVENT_WARNING_DIAG 0x04
-+#define DA7280_IRQ_EVENT_SEQ_DIAG 0x05
-+#define DA7280_IRQ_STATUS1 0x06
-+#define DA7280_IRQ_MASK1 0x07
-+#define DA7280_CIF_I2C1 0x08
-+#define DA7280_FRQ_LRA_PER_H 0x0A
-+#define DA7280_FRQ_LRA_PER_L 0x0B
-+#define DA7280_ACTUATOR1 0x0C
-+#define DA7280_ACTUATOR2 0x0D
-+#define DA7280_ACTUATOR3 0x0E
-+#define DA7280_CALIB_V2I_H 0x0F
-+#define DA7280_CALIB_V2I_L 0x10
-+#define DA7280_CALIB_IMP_H 0x11
-+#define DA7280_CALIB_IMP_L 0x12
-+#define DA7280_TOP_CFG1 0x13
-+#define DA7280_TOP_CFG2 0x14
-+#define DA7280_TOP_CFG3 0x15
-+#define DA7280_TOP_CFG4 0x16
-+#define DA7280_TOP_INT_CFG1 0x17
-+#define DA7280_TOP_INT_CFG6_H 0x1C
-+#define DA7280_TOP_INT_CFG6_L 0x1D
-+#define DA7280_TOP_INT_CFG7_H 0x1E
-+#define DA7280_TOP_INT_CFG7_L 0x1F
-+#define DA7280_TOP_INT_CFG8 0x20
-+#define DA7280_TOP_CTL1 0x22
-+#define DA7280_TOP_CTL2 0x23
-+#define DA7280_SEQ_CTL1 0x24
-+#define DA7280_SWG_C1 0x25
-+#define DA7280_SWG_C2 0x26
-+#define DA7280_SWG_C3 0x27
-+#define DA7280_SEQ_CTL2 0x28
-+#define DA7280_GPI_0_CTL 0x29
-+#define DA7280_GPI_1_CTL 0x2A
-+#define DA7280_GPI_2_CTL 0x2B
-+#define DA7280_MEM_CTL1 0x2C
-+#define DA7280_MEM_CTL2 0x2D
-+#define DA7280_ADC_DATA_H1 0x2E
-+#define DA7280_ADC_DATA_L1 0x2F
-+#define DA7280_POLARITY 0x43
-+#define DA7280_LRA_AVR_H 0x44
-+#define DA7280_LRA_AVR_L 0x45
-+#define DA7280_FRQ_LRA_PER_ACT_H 0x46
-+#define DA7280_FRQ_LRA_PER_ACT_L 0x47
-+#define DA7280_FRQ_PHASE_H 0x48
-+#define DA7280_FRQ_PHASE_L 0x49
-+#define DA7280_FRQ_CTL 0x4C
-+#define DA7280_TRIM3 0x5F
-+#define DA7280_TRIM4 0x60
-+#define DA7280_TRIM6 0x62
-+#define DA7280_TOP_CFG5 0x6E
-+#define DA7280_IRQ_EVENT_ACTUATOR_FAULT 0x81
-+#define DA7280_IRQ_STATUS2 0x82
-+#define DA7280_IRQ_MASK2 0x83
-+#define DA7280_SNP_MEM_0 0x84
-+#define DA7280_SNP_MEM_99 0xE7
-+
-+/* DA7280_CHIP_REV (Address 0x00) */
-+#define DA7280_CHIP_REV_MAJOR_SHIFT 0
-+#define DA7280_CHIP_REV_MAJOR_MASK (15 << 0)
-+#define DA7280_CHIP_REV_MINOR_SHIFT 4
-+#define DA7280_CHIP_REV_MINOR_MASK (15 << 4)
-+
-+/* DA7280_IRQ_EVENT1 (Address 0x03) */
-+#define DA7280_E_SEQ_CONTINUE_SHIFT 0
-+#define DA7280_E_SEQ_CONTINUE_MASK BIT(0)
-+#define DA7280_E_UVLO_SHIFT 1
-+#define DA7280_E_UVLO_MASK BIT(1)
-+#define DA7280_E_SEQ_DONE_SHIFT 2
-+#define DA7280_E_SEQ_DONE_MASK BIT(2)
-+#define DA7280_E_OVERTEMP_CRIT_SHIFT 3
-+#define DA7280_E_OVERTEMP_CRIT_MASK BIT(3)
-+#define DA7280_E_SEQ_FAULT_SHIFT 4
-+#define DA7280_E_SEQ_FAULT_MASK BIT(4)
-+#define DA7280_E_WARNING_SHIFT 5
-+#define DA7280_E_WARNING_MASK BIT(5)
-+#define DA7280_E_ACTUATOR_FAULT_SHIFT 6
-+#define DA7280_E_ACTUATOR_FAULT_MASK BIT(6)
-+#define DA7280_E_OC_FAULT_SHIFT 7
-+#define DA7280_E_OC_FAULT_MASK BIT(7)
-+
-+/* DA7280_IRQ_EVENT_WARNING_DIAG (Address 0x04) */
-+#define DA7280_E_OVERTEMP_WARN_SHIFT 3
-+#define DA7280_E_OVERTEMP_WARN_MASK BIT(3)
-+#define DA7280_E_MEM_TYPE_SHIFT 4
-+#define DA7280_E_MEM_TYPE_MASK BIT(4)
-+#define DA7280_E_LIM_DRIVE_ACC_SHIFT 6
-+#define DA7280_E_LIM_DRIVE_ACC_MASK BIT(6)
-+#define DA7280_E_LIM_DRIVE_SHIFT 7
-+#define DA7280_E_LIM_DRIVE_MASK BIT(7)
-+
-+/* DA7280_IRQ_EVENT_PAT_DIAG (Address 0x05) */
-+#define DA7280_E_PWM_FAULT_SHIFT 5
-+#define DA7280_E_PWM_FAULT_MASK BIT(5)
-+#define DA7280_E_MEM_FAULT_SHIFT 6
-+#define DA7280_E_MEM_FAULT_MASK BIT(6)
-+#define DA7280_E_SEQ_ID_FAULT_SHIFT 7
-+#define DA7280_E_SEQ_ID_FAULT_MASK BIT(7)
-+
-+/* DA7280_IRQ_STATUS1 (Address 0x06) */
-+#define DA7280_STA_SEQ_CONTINUE_SHIFT 0
-+#define DA7280_STA_SEQ_CONTINUE_MASK BIT(0)
-+#define DA7280_STA_UVLO_VBAT_OK_SHIFT 1
-+#define DA7280_STA_UVLO_VBAT_OK_MASK BIT(1)
-+#define DA7280_STA_SEQ_DONE_SHIFT 2
-+#define DA7280_STA_SEQ_DONE_MASK BIT(2)
-+#define DA7280_STA_OVERTEMP_CRIT_SHIFT 3
-+#define DA7280_STA_OVERTEMP_CRIT_MASK BIT(3)
-+#define DA7280_STA_SEQ_FAULT_SHIFT 4
-+#define DA7280_STA_SEQ_FAULT_MASK BIT(4)
-+#define DA7280_STA_WARNING_SHIFT 5
-+#define DA7280_STA_WARNING_MASK BIT(5)
-+#define DA7280_STA_ACTUATOR_SHIFT 6
-+#define DA7280_STA_ACTUATOR_MASK BIT(6)
-+#define DA7280_STA_OC_SHIFT 7
-+#define DA7280_STA_OC_MASK BIT(7)
-+
-+/* DA7280_IRQ_MASK1 (Address 0x07) */
-+#define DA7280_SEQ_CONTINUE_M_SHIFT 0
-+#define DA7280_SEQ_CONTINUE_M_MASK BIT(0)
-+#define DA7280_E_UVLO_M_SHIFT 1
-+#define DA7280_E_UVLO_M_MASK BIT(1)
-+#define DA7280_SEQ_DONE_M_SHIFT 2
-+#define DA7280_SEQ_DONE_M_MASK BIT(2)
-+#define DA7280_OVERTEMP_CRIT_M_SHIFT 3
-+#define DA7280_OVERTEMP_CRIT_M_MASK BIT(3)
-+#define DA7280_SEQ_FAULT_M_SHIFT 4
-+#define DA7280_SEQ_FAULT_M_MASK BIT(4)
-+#define DA7280_WARNING_M_SHIFT 5
-+#define DA7280_WARNING_M_MASK BIT(5)
-+#define DA7280_ACTUATOR_M_SHIFT 6
-+#define DA7280_ACTUATOR_M_MASK BIT(6)
-+#define DA7280_OC_M_SHIFT 7
-+#define DA7280_OC_M_MASK BIT(7)
-+
-+/* DA7280_CIF_I2C1 (Address 0x08) */
-+#define DA7280_I2C_TO_ENABLE_SHIFT 6
-+#define DA7280_I2C_TO_ENABLE_MASK BIT(6)
-+#define DA7280_I2C_WR_MODE_SHIFT 7
-+#define DA7280_I2C_WR_MODE_MASK BIT(7)
-+
-+/* DA7280_FRQ_LRA_PER_H (Address 0x0a) */
-+#define DA7280_LRA_PER_H_SHIFT 0
-+#define DA7280_LRA_PER_H_MASK (255 << 0)
-+
-+/* DA7280_FRQ_LRA_PER_L (Address 0x0b) */
-+#define DA7280_LRA_PER_L_SHIFT 0
-+#define DA7280_LRA_PER_L_MASK (127 << 0)
-+
-+/* DA7280_ACTUATOR1 (Address 0x0c) */
-+#define DA7280_ACTUATOR_NOMMAX_SHIFT 0
-+#define DA7280_ACTUATOR_NOMMAX_MASK (255 << 0)
-+
-+/* DA7280_ACTUATOR2 (Address 0x0d) */
-+#define DA7280_ACTUATOR_ABSMAX_SHIFT 0
-+#define DA7280_ACTUATOR_ABSMAX_MASK (255 << 0)
-+
-+/* DA7280_ACTUATOR3 (Address 0x0e) */
-+#define DA7280_IMAX_SHIFT 0
-+#define DA7280_IMAX_MASK (31 << 0)
-+
-+/* DA7280_CALIB_V2I_H (Address 0x0f) */
-+#define DA7280_V2I_FACTOR_H_SHIFT 0
-+#define DA7280_V2I_FACTOR_H_MASK (255 << 0)
-+
-+/* DA7280_CALIB_V2I_L (Address 0x10) */
-+#define DA7280_V2I_FACTOR_L_SHIFT 0
-+#define DA7280_V2I_FACTOR_L_MASK (255 << 0)
-+
-+/* DA7280_CALIB_IMP_H (Address 0x11) */
-+#define DA7280_IMPEDANCE_H_SHIFT 0
-+#define DA7280_IMPEDANCE_H_MASK (255 << 0)
-+
-+/* DA7280_CALIB_IMP_L (Address 0x12) */
-+#define DA7280_IMPEDANCE_L_SHIFT 0
-+#define DA7280_IMPEDANCE_L_MASK (3 << 0)
-+
-+/* DA7280_TOP_CFG1 (Address 0x13) */
-+#define DA7280_AMP_PID_EN_SHIFT 0
-+#define DA7280_AMP_PID_EN_MASK BIT(0)
-+#define DA7280_RAPID_STOP_EN_SHIFT 1
-+#define DA7280_RAPID_STOP_EN_MASK BIT(1)
-+#define DA7280_ACCELERATION_EN_SHIFT 2
-+#define DA7280_ACCELERATION_EN_MASK BIT(2)
-+#define DA7280_FREQ_TRACK_EN_SHIFT 3
-+#define DA7280_FREQ_TRACK_EN_MASK BIT(3)
-+#define DA7280_BEMF_SENSE_EN_SHIFT 4
-+#define DA7280_BEMF_SENSE_EN_MASK BIT(4)
-+#define DA7280_ACTUATOR_TYPE_SHIFT 5
-+#define DA7280_ACTUATOR_TYPE_MASK BIT(5)
-+#define DA7280_EMBEDDED_MODE_SHIFT 7
-+#define DA7280_EMBEDDED_MODE_MASK BIT(7)
-+
-+/* DA7280_TOP_CFG2 (Address 0x14) */
-+#define DA7280_FULL_BRAKE_THR_SHIFT 0
-+#define DA7280_FULL_BRAKE_THR_MASK (15 << 0)
-+#define DA7280_MEM_DATA_SIGNED_SHIFT 4
-+#define DA7280_MEM_DATA_SIGNED_MASK BIT(4)
-+
-+/* DA7280_TOP_CFG3 (Address 0x15) */
-+#define DA7280_VDD_MARGIN_SHIFT 0
-+#define DA7280_VDD_MARGIN_MASK (15 << 0)
-+
-+/* DA7280_TOP_CFG4 (Address 0x16) */
-+#define DA7280_TST_CALIB_IMPEDANCE_DIS_SHIFT 6
-+#define DA7280_TST_CALIB_IMPEDANCE_DIS_MASK BIT(6)
-+#define DA7280_V2I_FACTOR_FREEZE_SHIFT 7
-+#define DA7280_V2I_FACTOR_FREEZE_MASK BIT(7)
-+
-+/* DA7280_TOP_INT_CFG1 (Address 0x17) */
-+#define DA7280_BEMF_FAULT_LIM_SHIFT 0
-+#define DA7280_BEMF_FAULT_LIM_MASK (3 << 0)
-+#define DA7280_FRQ_LOCKED_LIM_SHIFT 2
-+#define DA7280_FRQ_LOCKED_LIM_MASK (63 << 2)
-+
-+/* DA7280_TOP_INT_CFG6_H (Address 0x1c) */
-+#define DA7280_FRQ_PID_KP_H_SHIFT 0
-+#define DA7280_FRQ_PID_KP_H_MASK (255 << 0)
-+
-+/* DA7280_TOP_INT_CFG6_L (Address 0x1d) */
-+#define DA7280_FRQ_PID_KP_L_SHIFT 0
-+#define DA7280_FRQ_PID_KP_L_MASK (255 << 0)
-+
-+/* DA7280_TOP_INT_CFG7_H (Address 0x1e) */
-+#define DA7280_FRQ_PID_KI_H_SHIFT 0
-+#define DA7280_FRQ_PID_KI_H_MASK (255 << 0)
-+
-+/* DA7280_TOP_INT_CFG7_L (Address 0x1f) */
-+#define DA7280_FRQ_PID_KI_L_SHIFT 0
-+#define DA7280_FRQ_PID_KI_L_MASK (255 << 0)
-+
-+/* DA7280_TOP_INT_CFG8 (Address 0x20) */
-+#define DA7280_TST_FRQ_TRACK_BEMF_LIM_SHIFT 0
-+#define DA7280_TST_FRQ_TRACK_BEMF_LIM_MASK (15 << 0)
-+#define DA7280_TST_AMP_RAPID_STOP_LIM_SHIFT 4
-+#define DA7280_TST_AMP_RAPID_STOP_LIM_MASK (7 << 4)
-+
-+/* DA7280_TOP_CTL1 (Address 0x22) */
-+#define DA7280_OPERATION_MODE_SHIFT 0
-+#define DA7280_OPERATION_MODE_MASK (7 << 0)
-+#define DA7280_STANDBY_EN_SHIFT 3
-+#define DA7280_STANDBY_EN_MASK BIT(3)
-+#define DA7280_SEQ_START_SHIFT 4
-+#define DA7280_SEQ_START_MASK BIT(4)
-+
-+/* DA7280_TOP_CTL2 (Address 0x23) */
-+#define DA7280_OVERRIDE_VAL_SHIFT 0
-+#define DA7280_OVERRIDE_VAL_MASK (255 << 0)
-+
-+/* DA7280_SEQ_CTL1 (Address 0x24) */
-+#define DA7280_SEQ_CONTINUE_SHIFT 0
-+#define DA7280_SEQ_CONTINUE_MASK BIT(0)
-+#define DA7280_WAVEGEN_MODE_SHIFT 1
-+#define DA7280_WAVEGEN_MODE_MASK BIT(1)
-+#define DA7280_FREQ_WAVEFORM_TIMEBASE_SHIFT 2
-+#define DA7280_FREQ_WAVEFORM_TIMEBASE_MASK BIT(2)
-+
-+/* DA7280_SWG_C1 (Address 0x25) */
-+#define DA7280_CUSTOM_WAVE_GEN_COEFF1_SHIFT 0
-+#define DA7280_CUSTOM_WAVE_GEN_COEFF1_MASK (255 << 0)
-+
-+/* DA7280_SWG_C2 (Address 0x26) */
-+#define DA7280_CUSTOM_WAVE_GEN_COEFF2_SHIFT 0
-+#define DA7280_CUSTOM_WAVE_GEN_COEFF2_MASK (255 << 0)
-+
-+/* DA7280_SWG_C3 (Address 0x27) */
-+#define DA7280_CUSTOM_WAVE_GEN_COEFF3_SHIFT 0
-+#define DA7280_CUSTOM_WAVE_GEN_COEFF3_MASK (255 << 0)
-+
-+/* DA7280_SEQ_CTL2 (Address 0x28) */
-+#define DA7280_PS_SEQ_ID_SHIFT 0
-+#define DA7280_PS_SEQ_ID_MASK (15 << 0)
-+#define DA7280_PS_SEQ_LOOP_SHIFT 4
-+#define DA7280_PS_SEQ_LOOP_MASK (15 << 4)
-+
-+/* DA7280_GPIO_0_CTL (Address 0x29) */
-+#define DA7280_GPI0_POLARITY_SHIFT 0
-+#define DA7280_GPI0_POLARITY_MASK (3 << 0)
-+#define DA7280_GPI0_MODE_SHIFT 2
-+#define DA7280_GPI0_MODE_MASK BIT(2)
-+#define DA7280_GPI0_SEQUENCE_ID_SHIFT 3
-+#define DA7280_GPI0_SEQUENCE_ID_MASK (15 << 3)
-+
-+/* DA7280_GPIO_1_CTL (Address 0x2a) */
-+#define DA7280_GPI1_POLARITY_SHIFT 0
-+#define DA7280_GPI1_POLARITY_MASK (3 << 0)
-+#define DA7280_GPI1_MODE_SHIFT 2
-+#define DA7280_GPI1_MODE_MASK BIT(2)
-+#define DA7280_GPI1_SEQUENCE_ID_SHIFT 3
-+#define DA7280_GPI1_SEQUENCE_ID_MASK (15 << 3)
-+
-+/* DA7280_GPIO_2_CTL (Address 0x2b) */
-+#define DA7280_GPI2_POLARITY_SHIFT 0
-+#define DA7280_GPI2_POLARITY_MASK (3 << 0)
-+#define DA7280_GPI2_MODE_SHIFT 2
-+#define DA7280_GPI2_MODE_MASK BIT(2)
-+#define DA7280_GPI2_SEQUENCE_ID_SHIFT 3
-+#define DA7280_GPI2_SEQUENCE_ID_MASK (15 << 3)
-+
-+/* DA7280_MEM_CTL1 (Address 0x2c) */
-+#define DA7280_WAV_MEM_BASE_ADDR_SHIFT 0
-+#define DA7280_WAV_MEM_BASE_ADDR_MASK (255 << 0)
-+
-+/* DA7280_MEM_CTL2 (Address 0x2d) */
-+#define DA7280_WAV_MEM_LOCK_SHIFT 7
-+#define DA7280_WAV_MEM_LOCK_MASK BIT(7)
-+
-+/* DA7280_ADC_DATA_H1 (Address 0x2e) */
-+#define DA7280_ADC_VDD_H_SHIFT 0
-+#define DA7280_ADC_VDD_H_MASK (255 << 0)
-+
-+/* DA7280_ADC_DATA_L1 (Address 0x2f) */
-+#define DA7280_ADC_VDD_L_SHIFT 0
-+#define DA7280_ADC_VDD_L_MASK (127 << 0)
-+
-+/* DA7280_POLARITY (Address 0x43) */
-+#define DA7280_POLARITY_SHIFT 0
-+#define DA7280_POLARITY_MASK BIT(0)
-+
-+/* DA7280_LRA_AVR_H (Address 0x44) */
-+#define DA7280_LRA_PER_AVERAGE_H_SHIFT 0
-+#define DA7280_LRA_PER_AVERAGE_H_MASK (255 << 0)
-+
-+/* DA7280_LRA_AVR_L (Address 0x45) */
-+#define DA7280_LRA_PER_AVERAGE_L_SHIFT 0
-+#define DA7280_LRA_PER_AVERAGE_L_MASK (127 << 0)
-+
-+/* DA7280_FRQ_LRA_PER_ACT_H (Address 0x46) */
-+#define DA7280_LRA_PER_ACTUAL_H_SHIFT 0
-+#define DA7280_LRA_PER_ACTUAL_H_MASK (255 << 0)
-+
-+/* DA7280_FRQ_LRA_PER_ACT_L (Address 0x47) */
-+#define DA7280_LRA_PER_ACTUAL_L_SHIFT 0
-+#define DA7280_LRA_PER_ACTUAL_L_MASK (127 << 0)
-+
-+/* DA7280_FRQ_PHASE_H (Address 0x48) */
-+#define DA7280_PHASE_DELAY_H_SHIFT 0
-+#define DA7280_PHASE_DELAY_H_MASK (255 << 0)
-+
-+/* DA7280_FRQ_PHASE_L (Address 0x49) */
-+#define DA7280_DELAY_SHIFT_L_SHIFT 0
-+#define DA7280_DELAY_SHIFT_L_MASK (7 << 0)
-+#define DA7280_DELAY_SHIFT_FREEZE_SHIFT 7
-+#define DA7280_DELAY_SHIFT_FREEZE_MASK BIT(7)
-+
-+/* DA7280_FRQ_CTL (Address 0x4c) */
-+#define DA7280_FREQ_TRACKING_FORCE_ON_SHIFT 0
-+#define DA7280_FREQ_TRACKING_FORCE_ON_MASK BIT(0)
-+#define DA7280_FREQ_TRACKING_AUTO_ADJ_SHIFT 1
-+#define DA7280_FREQ_TRACKING_AUTO_ADJ_MASK BIT(1)
-+
-+/* DA7280_TRIM3 (Address 0x5f) */
-+#define DA7280_REF_UVLO_THRES_SHIFT 3
-+#define DA7280_REF_UVLO_THRES_MASK (3 << 3)
-+#define DA7280_LOOP_FILT_LOW_BW_SHIFT 5
-+#define DA7280_LOOP_FILT_LOW_BW_MASK BIT(5)
-+#define DA7280_LOOP_IDAC_DOUBLE_RANGE_SHIFT 6
-+#define DA7280_LOOP_IDAC_DOUBLE_RANGE_MASK BIT(6)
-+
-+/* DA7280_TRIM4 (Address 0x60) */
-+#define DA7280_LOOP_FILT_RES_TRIM_SHIFT 0
-+#define DA7280_LOOP_FILT_RES_TRIM_MASK (3 << 0)
-+#define DA7280_LOOP_FILT_CAP_TRIM_SHIFT 2
-+#define DA7280_LOOP_FILT_CAP_TRIM_MASK (3 << 2)
-+
-+/* DA7280_TRIM6 (Address 0x62) */
-+#define DA7280_HBRIDGE_ERC_HS_TRIM_SHIFT 0
-+#define DA7280_HBRIDGE_ERC_HS_TRIM_MASK (3 << 0)
-+#define DA7280_HBRIDGE_ERC_LS_TRIM_SHIFT 2
-+#define DA7280_HBRIDGE_ERC_LS_TRIM_MASK (3 << 2)
-+
-+/* DA7280_TOP_CFG5 (Address 0x6e) */
-+#define DA7280_V2I_FACTOR_OFFSET_EN_SHIFT 0
-+#define DA7280_V2I_FACTOR_OFFSET_EN_MASK BIT(0)
-+#define DA7280_FRQ_PAUSE_ON_POLARITY_CHANGE_SHIFT 1
-+#define DA7280_FRQ_PAUSE_ON_POLARITY_CHANGE_MASK BIT(1)
-+#define DA7280_DELAY_BYPASS_SHIFT 2
-+#define DA7280_DELAY_BYPASS_MASK BIT(2)
-+
-+/* DA7280_IRQ_EVENT_ACTUATOR_FAULT (Address 0x81) */
-+#define DA7280_ADC_SAT_FAULT_SHIFT 2
-+#define DA7280_ADC_SAT_FAULT_MASK BIT(2)
-+
-+/* DA7280_IRQ_STATUS2 (Address 0x82) */
-+#define DA7280_STA_ADC_SAT_SHIFT 7
-+#define DA7280_STA_ADC_SAT_MASK BIT(7)
-+
-+/* DA7280_IRQ_MASK2 (Address 0x83) */
-+#define DA7280_ADC_SAT_M_SHIFT 7
-+#define DA7280_ADC_SAT_M_MASK BIT(7)
-+
-+/* DA7280_SNP_MEM_XX (Address 0x84 ~ 0xe7) */
-+#define DA7280_SNP_MEM_SHIFT 0
-+#define DA7280_SNP_MEM_MASK (255 << 0)
-+
-+#endif
--
-end-of-patch for PATCH V5
+end-of-patch for PATCH v16
+