| Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 1 | Upstream-Status: Backport |
| 2 | Signed-off-by: Ross Burton <ross.burton@intel.com> |
| 3 | |
| 4 | From 226bc03acca44cf4b300597308064c44676b6f4b Mon Sep 17 00:00:00 2001 |
| 5 | From: Jean Delvare <jdelvare@suse.de> |
| 6 | Date: Tue, 23 Jan 2018 14:24:16 +0100 |
| 7 | Subject: Delete duplicate i2c-dev.h |
| 8 | |
| 9 | The <linux/i2c-dev.h> header file is provided by the kernel, so drop |
| 10 | our own copy of this file. |
| 11 | |
| 12 | Signed-off-by: Jean Delvare <jdelvare@suse.de> |
| 13 | Acked-by: Wolfram Sang <wsa@the-dreams.de> |
| 14 | --- |
| 15 | include/linux/i2c-dev.h | 72 ------------------------------------------------- |
| 16 | 1 file changed, 72 deletions(-) |
| 17 | delete mode 100644 include/linux/i2c-dev.h |
| 18 | |
| 19 | diff --git a/include/linux/i2c-dev.h b/include/linux/i2c-dev.h |
| 20 | deleted file mode 100644 |
| 21 | index 839d25a..0000000 |
| 22 | --- a/include/linux/i2c-dev.h |
| 23 | +++ /dev/null |
| 24 | @@ -1,72 +0,0 @@ |
| 25 | -/* |
| 26 | - i2c-dev.h - i2c-bus driver, char device interface |
| 27 | - |
| 28 | - Copyright (C) 1995-97 Simon G. Vogl |
| 29 | - Copyright (C) 1998-99 Frodo Looijaard <frodol@dds.nl> |
| 30 | - |
| 31 | - This program is free software; you can redistribute it and/or modify |
| 32 | - it under the terms of the GNU General Public License as published by |
| 33 | - the Free Software Foundation; either version 2 of the License, or |
| 34 | - (at your option) any later version. |
| 35 | - |
| 36 | - This program is distributed in the hope that it will be useful, |
| 37 | - but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 38 | - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| 39 | - GNU General Public License for more details. |
| 40 | - |
| 41 | - You should have received a copy of the GNU General Public License |
| 42 | - along with this program; if not, write to the Free Software |
| 43 | - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, |
| 44 | - MA 02110-1301 USA. |
| 45 | -*/ |
| 46 | - |
| 47 | -#ifndef _LINUX_I2C_DEV_H |
| 48 | -#define _LINUX_I2C_DEV_H |
| 49 | - |
| 50 | -#include <linux/types.h> |
| 51 | - |
| 52 | - |
| 53 | -/* /dev/i2c-X ioctl commands. The ioctl's parameter is always an |
| 54 | - * unsigned long, except for: |
| 55 | - * - I2C_FUNCS, takes pointer to an unsigned long |
| 56 | - * - I2C_RDWR, takes pointer to struct i2c_rdwr_ioctl_data |
| 57 | - * - I2C_SMBUS, takes pointer to struct i2c_smbus_ioctl_data |
| 58 | - */ |
| 59 | -#define I2C_RETRIES 0x0701 /* number of times a device address should |
| 60 | - be polled when not acknowledging */ |
| 61 | -#define I2C_TIMEOUT 0x0702 /* set timeout in units of 10 ms */ |
| 62 | - |
| 63 | -/* NOTE: Slave address is 7 or 10 bits, but 10-bit addresses |
| 64 | - * are NOT supported! (due to code brokenness) |
| 65 | - */ |
| 66 | -#define I2C_SLAVE 0x0703 /* Use this slave address */ |
| 67 | -#define I2C_SLAVE_FORCE 0x0706 /* Use this slave address, even if it |
| 68 | - is already in use by a driver! */ |
| 69 | -#define I2C_TENBIT 0x0704 /* 0 for 7 bit addrs, != 0 for 10 bit */ |
| 70 | - |
| 71 | -#define I2C_FUNCS 0x0705 /* Get the adapter functionality mask */ |
| 72 | - |
| 73 | -#define I2C_RDWR 0x0707 /* Combined R/W transfer (one STOP only) */ |
| 74 | - |
| 75 | -#define I2C_PEC 0x0708 /* != 0 to use PEC with SMBus */ |
| 76 | -#define I2C_SMBUS 0x0720 /* SMBus transfer */ |
| 77 | - |
| 78 | - |
| 79 | -/* This is the structure as used in the I2C_SMBUS ioctl call */ |
| 80 | -struct i2c_smbus_ioctl_data { |
| 81 | - __u8 read_write; |
| 82 | - __u8 command; |
| 83 | - __u32 size; |
| 84 | - union i2c_smbus_data *data; |
| 85 | -}; |
| 86 | - |
| 87 | -/* This is the structure as used in the I2C_RDWR ioctl call */ |
| 88 | -struct i2c_rdwr_ioctl_data { |
| 89 | - struct i2c_msg *msgs; /* pointers to i2c_msgs */ |
| 90 | - __u32 nmsgs; /* number of i2c_msgs */ |
| 91 | -}; |
| 92 | - |
| 93 | -#define I2C_RDRW_IOCTL_MAX_MSGS 42 |
| 94 | - |
| 95 | - |
| 96 | -#endif /* _LINUX_I2C_DEV_H */ |
| 97 | -- |
| 98 | cgit v1.1 |