mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-09 13:49:24 -04:00
Revert "(CR) Sensors:add capsense sx933x usb and headset calibrate"
This reverts commit f1f464c061c8d1da51017f76a5ae8b5d5b9468fc. CC [M] ../../motorola/kernel/modules/drivers/misc/sx933x/sx933x_sar.o /localrepo/a22472/5g/kernel/msm-4.14/../../motorola/kernel/modules/drivers/misc/sx933x/sx933x_sar.c:410:2: error: unknown field 'class_attrs' specified in initializer .class_attrs = capsense_class_attributes, ^ Change-Id: I3795dddd352884c037fb02c50613511a3281b74b Reviewed-on: https://gerrit.mot.com/1229396 SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Tested-by: Jira Key Reviewed-by: Yin-Jun Chen <a7301c@motorola.com> Submit-Approved: Jira Key
This commit is contained in:
Dharmesh Patel
Dharmeshkumar Patel
parent
198874112b
commit
ff4f01d8a8
3 changed files with 95 additions and 214 deletions
|
|
@ -2,10 +2,6 @@
|
|||
EXTRA_CFLAGS += -Wall
|
||||
EXTRA_CFLAGS += -I$(TOP)/motorola/kernel/modules/include
|
||||
|
||||
ifneq (,$(filter river%,$(TARGET_PRODUCT)))
|
||||
EXTRA_CFLAGS += -DCONFIG_CAPSENSE_USB_CAL
|
||||
endif
|
||||
|
||||
KBUILD_EXTRA_SYMBOLS += $(CURDIR)/$(KBUILD_EXTMOD)/../../sensors/Module.symvers
|
||||
|
||||
sx932x_sar-y := sx933x_sar.o
|
||||
|
|
|
|||
|
|
@ -28,9 +28,6 @@
|
|||
#include <linux/gpio.h>
|
||||
#include <linux/regulator/consumer.h>
|
||||
#include <linux/of_gpio.h>
|
||||
#include <linux/notifier.h>
|
||||
#include <linux/usb.h>
|
||||
#include <linux/power_supply.h>
|
||||
#include <linux/sensors.h>
|
||||
#include <linux/input/sx933x.h> /* main struct, interrupt,init,pointers */
|
||||
|
||||
|
|
@ -244,6 +241,76 @@ static int manual_offset_calibration(psx93XX_t this)
|
|||
/*! \brief sysfs show function for manual calibration which currently just
|
||||
* returns register value.
|
||||
*/
|
||||
static ssize_t manual_offset_calibration_show(struct device *dev,
|
||||
struct device_attribute *attr, char *buf)
|
||||
{
|
||||
u32 reg_value = 0;
|
||||
psx93XX_t this = dev_get_drvdata(dev);
|
||||
|
||||
LOG_DBG("Reading IRQSTAT_REG\n");
|
||||
sx933x_i2c_read_16bit(this,SX933X_HOSTIRQSRC_REG,®_value);
|
||||
return sprintf(buf, "%d\n", reg_value);
|
||||
}
|
||||
|
||||
|
||||
static ssize_t manual_offset_calibration_store(struct device *dev,
|
||||
struct device_attribute *attr, const char *buf, size_t count)
|
||||
{
|
||||
unsigned long val;
|
||||
psx93XX_t this = dev_get_drvdata(dev);
|
||||
|
||||
if (kstrtoul(buf, 10, &val)) //(strict_strtoul(buf, 10, &val)) {
|
||||
{
|
||||
LOG_DBG(" %s - Invalid Argument\n", __func__);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
if (val)
|
||||
manual_offset_calibration(this);
|
||||
|
||||
return count;
|
||||
}
|
||||
|
||||
/****************************************************************************/
|
||||
static ssize_t sx933x_register_write_store(struct device *dev,
|
||||
struct device_attribute *attr, const char *buf, size_t count)
|
||||
{
|
||||
u32 reg_address = 0, val = 0;
|
||||
psx93XX_t this = dev_get_drvdata(dev);
|
||||
|
||||
if (sscanf(buf, "%x,%x", ®_address, &val) != 2)
|
||||
{
|
||||
LOG_DBG("%s - The number of data are wrong\n",__func__);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
sx933x_i2c_write_16bit(this, reg_address, val);
|
||||
|
||||
LOG_DBG("%s - Register(0x%x) data(0x%x)\n",__func__, reg_address, val);
|
||||
return count;
|
||||
}
|
||||
|
||||
static ssize_t sx933x_register_read_store(struct device *dev,
|
||||
struct device_attribute *attr, const char *buf, size_t count)
|
||||
{
|
||||
u32 val=0;
|
||||
int regist = 0;
|
||||
int nirq_state = 0;
|
||||
psx93XX_t this = dev_get_drvdata(dev);
|
||||
|
||||
if (sscanf(buf, "%x", ®ist) != 1)
|
||||
{
|
||||
LOG_DBG("%s - The number of data are wrong\n",__func__);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
sx933x_i2c_read_16bit(this, regist, &val);
|
||||
nirq_state = sx933x_get_nirq_state();
|
||||
|
||||
LOG_DBG("%s - Register(0x%2x) data(0x%4x) nirq_state(%d)\n",__func__, regist, val, nirq_state);
|
||||
return count;
|
||||
}
|
||||
|
||||
static void read_rawData(psx93XX_t this)
|
||||
{
|
||||
u8 csx, index;
|
||||
|
|
@ -274,28 +341,7 @@ static void read_rawData(psx93XX_t this)
|
|||
}
|
||||
}
|
||||
|
||||
static ssize_t capsense_reset_store(struct class *class,
|
||||
struct class_attribute *attr,
|
||||
const char *buf, size_t count)
|
||||
{
|
||||
u32 temp = 0;
|
||||
sx933x_i2c_read_16bit(global_sx933x, SX933X_GNRLCTRL2_REG, &temp);
|
||||
if (!count)
|
||||
return -EINVAL;
|
||||
|
||||
if (!strncmp(buf, "reset", 5) || !strncmp(buf, "1", 1)) {
|
||||
if (temp & 0x0000001F) {
|
||||
LOG_DBG("Going to refresh baseline\n");
|
||||
manual_offset_calibration(global_sx933x);
|
||||
}
|
||||
}
|
||||
|
||||
return count;
|
||||
}
|
||||
|
||||
static ssize_t capsense_raw_data_show(struct class *class,
|
||||
struct class_attribute *attr,
|
||||
char *buf)
|
||||
static ssize_t sx933x_raw_data_show(struct device *dev, struct device_attribute *attr, char *buf)
|
||||
{
|
||||
char *p = buf;
|
||||
int csx;
|
||||
|
|
@ -303,7 +349,7 @@ static ssize_t capsense_raw_data_show(struct class *class,
|
|||
u32 uData;
|
||||
u16 offset;
|
||||
|
||||
psx93XX_t this = global_sx933x;
|
||||
psx93XX_t this = dev_get_drvdata(dev);
|
||||
if(this) {
|
||||
for(csx =0; csx<5; csx++) {
|
||||
sx933x_i2c_read_16bit(this, SX933X_USEPH0_REG + csx*4, &uData);
|
||||
|
|
@ -321,91 +367,22 @@ static ssize_t capsense_raw_data_show(struct class *class,
|
|||
return (p-buf);
|
||||
}
|
||||
|
||||
static ssize_t sx933x_register_write_store(struct class *class,
|
||||
struct class_attribute *attr,
|
||||
const char *buf, size_t count)
|
||||
static DEVICE_ATTR(manual_calibrate, 0664, manual_offset_calibration_show,manual_offset_calibration_store);
|
||||
static DEVICE_ATTR(register_write, 0664, NULL,sx933x_register_write_store);
|
||||
static DEVICE_ATTR(register_read,0664, NULL,sx933x_register_read_store);
|
||||
static DEVICE_ATTR(raw_data,0664,sx933x_raw_data_show,NULL);
|
||||
|
||||
static struct attribute *sx933x_attributes[] =
|
||||
{
|
||||
u32 reg_address = 0, val = 0;
|
||||
psx93XX_t this = global_sx933x;
|
||||
|
||||
if (sscanf(buf, "%x,%x", ®_address, &val) != 2)
|
||||
{
|
||||
LOG_DBG("%s - The number of data are wrong\n",__func__);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
sx933x_i2c_write_16bit(this, reg_address, val);
|
||||
|
||||
LOG_DBG("%s - Register(0x%x) data(0x%x)\n",__func__, reg_address, val);
|
||||
return count;
|
||||
}
|
||||
|
||||
static ssize_t sx933x_register_read_store(struct class *class,
|
||||
struct class_attribute *attr,
|
||||
const char *buf, size_t count)
|
||||
{
|
||||
u32 val=0;
|
||||
int regist = 0;
|
||||
int nirq_state = 0;
|
||||
psx93XX_t this = global_sx933x;
|
||||
|
||||
if (sscanf(buf, "%x", ®ist) != 1)
|
||||
{
|
||||
LOG_DBG("%s - The number of data are wrong\n",__func__);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
sx933x_i2c_read_16bit(this, regist, &val);
|
||||
nirq_state = sx933x_get_nirq_state();
|
||||
|
||||
LOG_DBG("%s - Register(0x%2x) data(0x%4x) nirq_state(%d)\n",__func__, regist, val, nirq_state);
|
||||
return count;
|
||||
}
|
||||
|
||||
static ssize_t manual_offset_calibration_show(struct class *class,
|
||||
struct class_attribute *attr,
|
||||
char *buf)
|
||||
{
|
||||
u32 reg_value = 0;
|
||||
psx93XX_t this = global_sx933x;
|
||||
|
||||
LOG_DBG("Reading IRQSTAT_REG\n");
|
||||
sx933x_i2c_read_16bit(this,SX933X_HOSTIRQSRC_REG,®_value);
|
||||
return sprintf(buf, "%d\n", reg_value);
|
||||
}
|
||||
|
||||
|
||||
static ssize_t manual_offset_calibration_store(struct class *class,
|
||||
struct class_attribute *attr,
|
||||
const char *buf, size_t count)
|
||||
{
|
||||
unsigned long val;
|
||||
psx93XX_t this = global_sx933x;
|
||||
|
||||
if (kstrtoul(buf, 10, &val)) //(strict_strtoul(buf, 10, &val)) {
|
||||
{
|
||||
LOG_DBG(" %s - Invalid Argument\n", __func__);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
if (val)
|
||||
manual_offset_calibration(this);
|
||||
|
||||
return count;
|
||||
}
|
||||
static struct class_attribute capsense_class_attributes[] = {
|
||||
__ATTR(reset, 0660, NULL, capsense_reset_store),
|
||||
__ATTR(raw_data, 0660, capsense_raw_data_show, NULL),
|
||||
__ATTR(register_write, 0660, NULL,sx933x_register_write_store),
|
||||
__ATTR(register_read,0660, NULL,sx933x_register_read_store),
|
||||
__ATTR(manual_calibrate, 0660, manual_offset_calibration_show,manual_offset_calibration_store),
|
||||
__ATTR_NULL,
|
||||
&dev_attr_manual_calibrate.attr,
|
||||
&dev_attr_register_write.attr,
|
||||
&dev_attr_register_read.attr,
|
||||
&dev_attr_raw_data.attr,
|
||||
NULL,
|
||||
};
|
||||
|
||||
struct class capsense_class = {
|
||||
.name = "capsense",
|
||||
.owner = THIS_MODULE,
|
||||
.class_attrs = capsense_class_attributes,
|
||||
static struct attribute_group sx933x_attr_group =
|
||||
{
|
||||
.attrs = sx933x_attributes,
|
||||
};
|
||||
|
||||
/**************************************/
|
||||
|
|
@ -749,66 +726,6 @@ static int capsensor_set_enable(struct sensors_classdev *sensors_cdev,
|
|||
return 0;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_CAPSENSE_USB_CAL
|
||||
static void ps_notify_callback_work(struct work_struct *work)
|
||||
{
|
||||
u32 temp = 0;
|
||||
sx933x_i2c_read_16bit(global_sx933x, SX933X_GNRLCTRL2_REG, &temp);
|
||||
if (temp & 0x0000001F) {
|
||||
LOG_DBG("USB state change, Going to force calibrate\n");
|
||||
manual_offset_calibration(global_sx933x);
|
||||
}
|
||||
}
|
||||
|
||||
static int ps_get_state(struct power_supply *psy, bool *present)
|
||||
{
|
||||
union power_supply_propval pval = {0};
|
||||
int retval;
|
||||
|
||||
retval = power_supply_get_property(psy, POWER_SUPPLY_PROP_PRESENT,
|
||||
&pval);
|
||||
if (retval) {
|
||||
LOG_DBG("%s psy get property failed\n", psy->desc->name);
|
||||
return retval;
|
||||
}
|
||||
*present = (pval.intval) ? true : false;
|
||||
LOG_INFO("%s is %s\n", psy->desc->name,
|
||||
(*present) ? "present" : "not present");
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int ps_notify_callback(struct notifier_block *self,
|
||||
unsigned long event, void *p)
|
||||
{
|
||||
struct sx933x_platform_data *data =
|
||||
container_of(self, struct sx933x_platform_data, ps_notif);
|
||||
struct power_supply *psy = p;
|
||||
bool present;
|
||||
int retval;
|
||||
|
||||
if ((event == PSY_EVENT_PROP_ADDED || event == PSY_EVENT_PROP_CHANGED)
|
||||
&& psy && psy->desc->get_property && psy->desc->name &&
|
||||
!strncmp(psy->desc->name, "usb", sizeof("usb")) && data) {
|
||||
LOG_INFO("ps notification: event = %lu\n", event);
|
||||
retval = ps_get_state(psy, &present);
|
||||
if (retval) {
|
||||
return retval;
|
||||
}
|
||||
|
||||
if (event == PSY_EVENT_PROP_CHANGED) {
|
||||
if (data->ps_is_present == present) {
|
||||
LOG_INFO("ps present state not change\n");
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
data->ps_is_present = present;
|
||||
schedule_work(&data->ps_notify_work);
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
|
||||
/*! \fn static int sx933x_probe(struct i2c_client *client, const struct i2c_device_id *id)
|
||||
* \brief Probe function
|
||||
* \param client pointer to i2c_client
|
||||
|
|
@ -823,13 +740,10 @@ static int sx933x_probe(struct i2c_client *client, const struct i2c_device_id *i
|
|||
psx93XX_t this = 0;
|
||||
psx933x_t pDevice = 0;
|
||||
psx933x_platform_data_t pplatData = 0;
|
||||
#ifdef CONFIG_CAPSENSE_USB_CAL
|
||||
struct power_supply *psy = NULL;
|
||||
#endif
|
||||
struct totalButtonInformation *pButtonInformationData = NULL;
|
||||
struct i2c_adapter *adapter = to_i2c_adapter(client->dev.parent);
|
||||
|
||||
LOG_DBG("sx933x_probe()\n");
|
||||
LOG_DBG("sx933x_probe()\n");
|
||||
|
||||
if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_READ_WORD_DATA))
|
||||
{
|
||||
|
|
@ -894,7 +808,7 @@ static int sx933x_probe(struct i2c_client *client, const struct i2c_device_id *i
|
|||
this->statusFunc[1] = 0; /* UNUSED */
|
||||
this->statusFunc[2] = touchProcess; /* body&table */
|
||||
this->statusFunc[3] = read_rawData; /* CONV_STAT */
|
||||
this->statusFunc[4] = touchProcess; /* COMP_STAT */
|
||||
this->statusFunc[4] = 0; /* COMP_STAT */
|
||||
this->statusFunc[5] = touchProcess; /* RELEASE_STAT */
|
||||
this->statusFunc[6] = touchProcess; /* TOUCH_STAT */
|
||||
this->statusFunc[7] = 0; /* RESET_STAT */
|
||||
|
|
@ -914,11 +828,8 @@ static int sx933x_probe(struct i2c_client *client, const struct i2c_device_id *i
|
|||
if (pDevice)
|
||||
{
|
||||
/* for accessing items in user data (e.g. calibrate) */
|
||||
err = class_register(&capsense_class);
|
||||
if (err < 0) {
|
||||
LOG_DBG("Create fsys class failed (%d)\n", err);
|
||||
return err;
|
||||
}
|
||||
err = sysfs_create_group(&client->dev.kobj, &sx933x_attr_group);
|
||||
//sysfs_create_group(client, &sx933x_attr_group);
|
||||
|
||||
/* Add Pointer to main platform data struct */
|
||||
pDevice->hw = pplatData;
|
||||
|
|
@ -963,7 +874,7 @@ static int sx933x_probe(struct i2c_client *client, const struct i2c_device_id *i
|
|||
pButtonInformationData->buttons[i].sensors_capsensor_cdev.delay_msec = 100;
|
||||
pButtonInformationData->buttons[i].sensors_capsensor_cdev.enabled = 0;
|
||||
pButtonInformationData->buttons[i].enabled = false;
|
||||
|
||||
|
||||
err = sensors_classdev_register(&pButtonInformationData->buttons[i].input_dev->dev, &pButtonInformationData->buttons[i].sensors_capsensor_cdev);
|
||||
if (err < 0)
|
||||
LOG_DBG("create %d cap sensor_class file failed (%d)\n", i, err);
|
||||
|
|
@ -986,31 +897,13 @@ static int sx933x_probe(struct i2c_client *client, const struct i2c_device_id *i
|
|||
LOG_DBG("%s: Error %d enable regulator\n",
|
||||
__func__, err);
|
||||
return err;
|
||||
}
|
||||
}
|
||||
pplatData->cap_vdd_en = true;
|
||||
LOG_DBG("cap_vdd regulator is %s\n",
|
||||
regulator_is_enabled(pplatData->cap_vdd) ?
|
||||
"on" : "off");
|
||||
}
|
||||
|
||||
#ifdef CONFIG_CAPSENSE_USB_CAL
|
||||
/*notify usb state*/
|
||||
INIT_WORK(&pplatData->ps_notify_work, ps_notify_callback_work);
|
||||
pplatData->ps_notif.notifier_call = ps_notify_callback;
|
||||
err = power_supply_reg_notifier(&pplatData->ps_notif);
|
||||
if (err)
|
||||
LOG_DBG("Unable to register ps_notifier: %d\n", err);
|
||||
|
||||
psy = power_supply_get_by_name("usb");
|
||||
if (psy) {
|
||||
err = ps_get_state(psy, &pplatData->ps_is_present);
|
||||
if (err) {
|
||||
LOG_DBG("psy get property failed rc=%d\n", err);
|
||||
power_supply_unreg_notifier(&pplatData->ps_notif);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
sx93XX_IRQ_init(this);
|
||||
/* call init function pointer (this should initialize all registers */
|
||||
if (this->init) {
|
||||
|
|
@ -1041,6 +934,7 @@ static int sx933x_probe(struct i2c_client *client, const struct i2c_device_id *i
|
|||
* \param client Pointer to i2c_client struct
|
||||
* \return Value 0
|
||||
*/
|
||||
//static int __devexit sx933x_remove(struct i2c_client *client)
|
||||
static int sx933x_remove(struct i2c_client *client)
|
||||
{
|
||||
psx933x_platform_data_t pplatData =0;
|
||||
|
|
@ -1050,16 +944,12 @@ static int sx933x_remove(struct i2c_client *client)
|
|||
psx93XX_t this = i2c_get_clientdata(client);
|
||||
LOG_DBG("sx933x_remove");
|
||||
if (this && (pDevice = this->pDevice))
|
||||
{
|
||||
pplatData = client->dev.platform_data;
|
||||
{
|
||||
free_irq(this->irq, this);
|
||||
cancel_delayed_work_sync(&(this->dworker));
|
||||
|
||||
class_unregister(&capsense_class);
|
||||
#ifdef CONFIG_CAPSENSE_USB_CAL
|
||||
cancel_work_sync(&pplatData->ps_notify_work);
|
||||
power_supply_unreg_notifier(&pplatData->ps_notif);
|
||||
#endif
|
||||
sysfs_remove_group(&client->dev.kobj, &sx933x_attr_group);
|
||||
pplatData = client->dev.platform_data;
|
||||
if (pplatData && pplatData->exit_platform_hw)
|
||||
pplatData->exit_platform_hw(client);
|
||||
|
||||
|
|
|
|||
|
|
@ -690,11 +690,6 @@ struct sx933x_platform_data
|
|||
bool cap_vdd_en;
|
||||
struct smtc_reg_data *pi2c_reg;
|
||||
int irq_gpio;
|
||||
#ifdef CONFIG_CAPSENSE_USB_CAL
|
||||
struct work_struct ps_notify_work;
|
||||
struct notifier_block ps_notif;
|
||||
bool ps_is_present;
|
||||
#endif
|
||||
pbuttonInformation_t pbuttonInformation;
|
||||
|
||||
int (*get_is_nirq_low)(void);
|
||||
|
|
|
|||
Loading…
Reference in a new issue