Skip to content

fingerprint: Update fingerprint drivers [4/4] #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
agsola wants to merge 1 commit into
base: cm-13.0
Choose a base branch
from
Open

fingerprint: Update fingerprint drivers [4/4] #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 36 additions & 8 deletions drivers/fingerprint/vfs61xx.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,7 @@ unsigned int freqTable[] = {
struct spi_device *gDevSpi;
struct class *vfsSpiDevClass;
int gpio_irq;
static int vfsspi_majorno = VFSSPI_MAJOR;

static DECLARE_WAIT_QUEUE_HEAD(wq);
static LIST_HEAD(deviceList);
Expand All @@ -166,6 +167,18 @@ static int dataToRead;

int vfsspi_enable_irq(struct vfsspi_devData *vfsSpiDev)
{
#if defined(CONFIG_MACH_TRLTE_EUR)
unsigned long flags;

if (vfsSpiDev->drdy_irq_flag == DRDY_IRQ_ENABLE)
return -EINVAL;

spin_lock_irqsave(&vfsSpiDev->irq_lock,flags);
enable_irq(gpio_irq);
vfsSpiDev->drdy_irq_flag = DRDY_IRQ_ENABLE;
spin_unlock_irqrestore(&vfsSpiDev->irq_lock,flags);
pr_info("%s\n", __func__);
#else
if (vfsSpiDev->drdy_irq_flag == DRDY_IRQ_ENABLE)
return -EINVAL;

Expand All @@ -175,11 +188,24 @@ int vfsspi_enable_irq(struct vfsspi_devData *vfsSpiDev)
spin_unlock(&vfsSpiDev->irq_lock);
pr_info("%s\n", __func__);

#endif
return 0;
}

int vfsspi_disable_irq(struct vfsspi_devData *vfsSpiDev)
{
#if defined(CONFIG_MACH_TRLTE_EUR)
unsigned long flags;

if (vfsSpiDev->drdy_irq_flag == DRDY_IRQ_DISABLE)
return -EINVAL;

spin_lock_irqsave(&vfsSpiDev->irq_lock,flags);
disable_irq_nosync(gpio_irq);
vfsSpiDev->drdy_irq_flag = DRDY_IRQ_DISABLE;
spin_unlock_irqrestore(&vfsSpiDev->irq_lock,flags);
pr_info("%s\n", __func__);
#else
if (vfsSpiDev->drdy_irq_flag == DRDY_IRQ_DISABLE)
return -EINVAL;

Expand All @@ -189,6 +215,7 @@ int vfsspi_disable_irq(struct vfsspi_devData *vfsSpiDev)
spin_unlock(&vfsSpiDev->irq_lock);
pr_info("%s\n", __func__);

#endif
return 0;
}

Expand Down Expand Up @@ -1590,7 +1617,7 @@ int vfsspi_probe(struct spi_device *spi)
mutex_lock(&deviceListMutex);

/* Create device node */
vfsSpiDev->devt = MKDEV(VFSSPI_MAJOR, 0);
vfsSpiDev->devt = MKDEV(vfsspi_majorno, 0);
dev =
device_create(vfsSpiDevClass, &spi->dev,
vfsSpiDev->devt, vfsSpiDev, "vfsspi");
Expand Down Expand Up @@ -1866,20 +1893,20 @@ static int __init vfsspi_init(void)
pr_info("%s\n", __func__);

/* register major number for character device */
status =
register_chrdev(VFSSPI_MAJOR, "validity_fingerprint", &vfsspi_fops);
vfsspi_majorno =
register_chrdev(0, "validity_fingerprint", &vfsspi_fops);

if (status < 0) {
if (vfsspi_majorno < 0) {
pr_err("%s register_chrdev failed\n", __func__);
return status;
return vfsspi_majorno;
}

vfsSpiDevClass = class_create(THIS_MODULE, "validity_fingerprint");

if (IS_ERR(vfsSpiDevClass)) {
pr_err
("%s vfsspi_init: class_create() is failed\n", __func__);
unregister_chrdev(VFSSPI_MAJOR, vfsspi_spi.driver.name);
unregister_chrdev(vfsspi_majorno, vfsspi_spi.driver.name);
return PTR_ERR(vfsSpiDevClass);
}

Expand All @@ -1888,7 +1915,7 @@ static int __init vfsspi_init(void)
if (status < 0) {
pr_err("%s : register spi drv is failed\n", __func__);
class_destroy(vfsSpiDevClass);
unregister_chrdev(VFSSPI_MAJOR, vfsspi_spi.driver.name);
unregister_chrdev(vfsspi_majorno, vfsspi_spi.driver.name);
return status;
}
pr_info("%s init is successful\n", __func__);
Expand All @@ -1903,7 +1930,8 @@ static void __exit vfsspi_exit(void)
spi_unregister_driver(&vfsspi_spi);
class_destroy(vfsSpiDevClass);

unregister_chrdev(VFSSPI_MAJOR, vfsspi_spi.driver.name);
if (vfsspi_majorno >= 0)
unregister_chrdev(vfsspi_majorno, vfsspi_spi.driver.name);
}

module_init(vfsspi_init);
Expand Down