diff --git a/cst816d_driver/cst816d.c b/cst816d_driver/cst816d.c index aac5fa5..0fc260b 100644 --- a/cst816d_driver/cst816d.c +++ b/cst816d_driver/cst816d.c @@ -14,73 +14,54 @@ #include #include #include - +#include +#include +#include #include /*------------------字符设备内容----------------------*/ #define DEV_NAME "cst816d" #define DEV_CNT (1) -//定义字符设备的设备号 -static dev_t cst816d_devno; -//定义字符设备结构体chr_dev -static struct cdev cst816d_chr_dev; + struct class *class_cst816d; //保存创建的类 struct device *device; // 保存创建的设备 struct device_node *cst816d_device_node; //cst816d的设备树节点 int io_cst816d_reset; // 保存获取得到引脚编号 - -/*字符设备操作函数集,open函数*/ -static int cst816d_chr_dev_open(struct inode *inode, struct file *filp) -{ - printk("open \n"); - return 0; -} - -/*字符设备操作函数集,write函数*/ -static ssize_t cst816d_chr_dev_write(struct file *filp, const char __user *buf, size_t cnt, loff_t *offt) -{ - - unsigned char write_data; //用于保存接收到的数据 - - int error = copy_from_user(&write_data, buf, cnt); - if(error < 0) { - printk("cst816d_test write faicst816d \n"); - return -1; - } - - /*设置GPIO 输出电平 具体引脚根据板卡原理图*/ - if(write_data) - { - gpio_direction_output(io_cst816d_reset, 1); // 引脚输出高电平,红灯灭 - } - else - { - gpio_direction_output(io_cst816d_reset, 0); // 引脚输出底电平,红灯亮 - } - - return 0; -} - - -/*字符设备操作函数集*/ -static struct file_operations cst816d_chr_dev_fops = -{ - .owner = THIS_MODULE, - .open = cst816d_chr_dev_open, - .write = cst816d_chr_dev_write, +struct cst816x_priv { + struct i2c_client *client; + struct gpio_desc *reset; + struct input_dev *input; + // struct cst816x_event_map event_map[16]; }; +// static void cst816x_reset(struct cst816x_priv *priv) +// { +// gpiod_set_value_cansleep(priv->reset, 1); +// msleep(50); +// gpiod_set_value_cansleep(priv->reset, 0); +// msleep(100); +// } + + + /*----------------平台驱动函数集-----------------*/ -static int cst816d_probe(struct platform_device *pdv) +static int cst816d_probe(struct i2c_client *client, const struct i2c_device_id *id) { - - int ret = 0; //用于保存申请设备号的结果 + struct cst816x_priv *priv; + struct device *dev = &client->dev; + // int ret = 0; //用于保存申请设备号的结果 printk("match successed\n"); + priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); + if (!priv) + return -ENOMEM; + + priv->client = client; + /*获取RGB的设备树节点*/ cst816d_device_node = of_find_node_by_path("/cst816t@15"); if(cst816d_device_node == NULL) @@ -96,94 +77,76 @@ static int cst816d_probe(struct platform_device *pdv) /*设置gpio输出高电平*/ gpio_direction_output(io_cst816d_reset, 1); + + // if (priv->reset) + // cst816x_reset(priv); + /*---------------------注册 字符设备部分-----------------*/ - //第一步 - //采用动态分配的方式,获取设备编号,次设备号为0, - //DEV_CNT为1,当前只申请一个设备编号 - ret = alloc_chrdev_region(&cst816d_devno, 0, DEV_CNT, DEV_NAME); - if(ret < 0){ - printk("fail to alloc cst816d_devno\n"); - goto alloc_err; - } - //第二步 - //关联字符设备结构体cdev与文件操作结构体file_operations - cst816d_chr_dev.owner = THIS_MODULE; - cdev_init(&cst816d_chr_dev, &cst816d_chr_dev_fops); - //第三步 - //添加设备至cdev_map散列表中 - ret = cdev_add(&cst816d_chr_dev, cst816d_devno, DEV_CNT); - if(ret < 0) - { - printk("fail to add cdev\n"); - goto add_err; - } +// //第一步 +// //采用动态分配的方式,获取设备编号,次设备号为0, +// //DEV_CNT为1,当前只申请一个设备编号 +// ret = alloc_chrdev_region(&cst816d_devno, 0, DEV_CNT, DEV_NAME); +// if(ret < 0){ +// printk("fail to alloc cst816d_devno\n"); +// goto alloc_err; +// } +// //第二步 +// //关联字符设备结构体cdev与文件操作结构体file_operations +// cst816d_chr_dev.owner = THIS_MODULE; +// cdev_init(&cst816d_chr_dev, &cst816d_chr_dev_fops); +// //第三步 +// //添加设备至cdev_map散列表中 +// ret = cdev_add(&cst816d_chr_dev, cst816d_devno, DEV_CNT); +// if(ret < 0) +// { +// printk("fail to add cdev\n"); +// goto add_err; +// } - //第四步 - /*创建类 */ - class_cst816d = class_create(THIS_MODULE, DEV_NAME); +// //第四步 +// /*创建类 */ +// class_cst816d = class_create(THIS_MODULE, DEV_NAME); - /*创建设备*/ - device = device_create(class_cst816d, NULL, cst816d_devno, NULL, DEV_NAME); +// /*创建设备*/ +// device = device_create(class_cst816d, NULL, cst816d_devno, NULL, DEV_NAME); - return 0; +// return 0; -add_err: - //添加设备失败时,需要注销设备号 - unregister_chrdev_region(cst816d_devno, DEV_CNT); - printk("\n error! \n"); -alloc_err: +// add_err: +// //添加设备失败时,需要注销设备号 +// unregister_chrdev_region(cst816d_devno, DEV_CNT); +// printk("\n error! \n"); +// alloc_err: return -1; } -static const struct of_device_id cst816d_ids[] = { +static const struct of_device_id cst816x_of_match[] = { { .compatible = "Yura,cst816t"}, { /* sentinel */ } }; +static const struct i2c_device_id cst816x_id[] = { + { .name = "cst816s", 0 }, + { } +}; +MODULE_DEVICE_TABLE(i2c, cst816x_id); /*定义平台设备结构体*/ -struct platform_driver cst816d_platform_driver = { - .probe = cst816d_probe, +static struct i2c_driver cst816d_driver = { + .driver = { - .name = "cst816ds-platform", - .owner = THIS_MODULE, - .of_match_table = cst816d_ids, - } + .name = "cst816x", + .of_match_table = cst816x_of_match, + }, + .id_table = cst816x_id, + .probe = cst816d_probe, }; -/* -*驱动初始化函数 -*/ -static int __init cst816d_platform_driver_init(void) -{ - int DriverState; - - DriverState = platform_driver_register(&cst816d_platform_driver); - - printk(KERN_EMERG "\tDriverState is %d\n",DriverState); - return 0; -} -/* -*驱动注销函数 -*/ -static void __exit cst816d_platform_driver_exit(void) -{ - printk(KERN_EMERG "cst816d_test exit!\n"); - /*删除设备*/ - device_destroy(class_cst816d, cst816d_devno); //清除设备 - class_destroy(class_cst816d); //清除类 - cdev_del(&cst816d_chr_dev); //清除设备号 - unregister_chrdev_region(cst816d_devno, DEV_CNT); //取消注册字符设备 - - platform_driver_unregister(&cst816d_platform_driver); -} +module_i2c_driver(cst816d_driver); -module_init(cst816d_platform_driver_init); -module_exit(cst816d_platform_driver_exit); - MODULE_LICENSE("GPL"); diff --git a/cst816d_driver/cst816d.ko b/cst816d_driver/cst816d.ko index f9acaa0..b7bb100 100644 Binary files a/cst816d_driver/cst816d.ko and b/cst816d_driver/cst816d.ko differ