diff options
author | Mauro Carvalho Chehab | 2012-08-14 17:13:30 +0200 |
---|---|---|
committer | Mauro Carvalho Chehab | 2012-08-15 21:36:22 +0200 |
commit | b285192a43f0432d82c2c10974204e78af0da596 (patch) | |
tree | 618aa87e760c9c949eca9e4df6ae0eeffa11dcfc /drivers/media/video/cx23885/netup-eeprom.c | |
parent | [media] bt8xx: move analog TV part to be together with DTV one (diff) | |
download | kernel-qcow2-linux-b285192a43f0432d82c2c10974204e78af0da596.tar.gz kernel-qcow2-linux-b285192a43f0432d82c2c10974204e78af0da596.tar.xz kernel-qcow2-linux-b285192a43f0432d82c2c10974204e78af0da596.zip |
[media] rename most media/video pci drivers to media/pci
Rename all PCI drivers with their own directory under
drivers/media/video into drivers/media/pci and update the
building system.
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/cx23885/netup-eeprom.c')
-rw-r--r-- | drivers/media/video/cx23885/netup-eeprom.c | 107 |
1 files changed, 0 insertions, 107 deletions
diff --git a/drivers/media/video/cx23885/netup-eeprom.c b/drivers/media/video/cx23885/netup-eeprom.c deleted file mode 100644 index 98a48f500684..000000000000 --- a/drivers/media/video/cx23885/netup-eeprom.c +++ /dev/null @@ -1,107 +0,0 @@ - -/* - * netup-eeprom.c - * - * 24LC02 EEPROM driver in conjunction with NetUP Dual DVB-S2 CI card - * - * Copyright (C) 2009 NetUP Inc. - * Copyright (C) 2009 Abylay Ospan <aospan@netup.ru> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -# -#include "cx23885.h" -#include "netup-eeprom.h" - -#define EEPROM_I2C_ADDR 0x50 - -int netup_eeprom_read(struct i2c_adapter *i2c_adap, u8 addr) -{ - int ret; - unsigned char buf[2]; - - /* Read from EEPROM */ - struct i2c_msg msg[] = { - { - .addr = EEPROM_I2C_ADDR, - .flags = 0, - .buf = &buf[0], - .len = 1 - }, { - .addr = EEPROM_I2C_ADDR, - .flags = I2C_M_RD, - .buf = &buf[1], - .len = 1 - } - - }; - - buf[0] = addr; - buf[1] = 0x0; - - ret = i2c_transfer(i2c_adap, msg, 2); - - if (ret != 2) { - printk(KERN_ERR "eeprom i2c read error, status=%d\n", ret); - return -1; - } - - return buf[1]; -}; - -int netup_eeprom_write(struct i2c_adapter *i2c_adap, u8 addr, u8 data) -{ - int ret; - unsigned char bufw[2]; - - /* Write into EEPROM */ - struct i2c_msg msg[] = { - { - .addr = EEPROM_I2C_ADDR, - .flags = 0, - .buf = &bufw[0], - .len = 2 - } - }; - - bufw[0] = addr; - bufw[1] = data; - - ret = i2c_transfer(i2c_adap, msg, 1); - - if (ret != 1) { - printk(KERN_ERR "eeprom i2c write error, status=%d\n", ret); - return -1; - } - - mdelay(10); /* prophylactic delay, datasheet write cycle time = 5 ms */ - return 0; -}; - -void netup_get_card_info(struct i2c_adapter *i2c_adap, - struct netup_card_info *cinfo) -{ - int i, j; - - cinfo->rev = netup_eeprom_read(i2c_adap, 63); - - for (i = 64, j = 0; i < 70; i++, j++) - cinfo->port[0].mac[j] = netup_eeprom_read(i2c_adap, i); - - for (i = 70, j = 0; i < 76; i++, j++) - cinfo->port[1].mac[j] = netup_eeprom_read(i2c_adap, i); -}; |