mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 03:27:44 -04:00
Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
* 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging: therm_windtunnel: Convert to a new-style i2c driver therm_adt746x: Convert to a new-style i2c driver windfarm: Convert to new-style i2c drivers therm_pm72: Convert to a new-style i2c driver i2c-viapro: Add new PCI device ID for VX855 i2c/chips: Move max6875 to drivers/misc/eeprom i2c: Do not give adapters a default parent i2c: Do not probe for TV chips on Voodoo3 adapters i2c: Retry automatically on arbitration loss i2c: Remove void casts
This commit is contained in:
Linus Torvalds
commit
4858704da7
20 changed files with 403 additions and 341 deletions
|
|
@ -211,7 +211,7 @@ config I2C_VIA
|
|||
will be called i2c-via.
|
||||
|
||||
config I2C_VIAPRO
|
||||
tristate "VIA VT82C596/82C686/82xx and CX700/VX800/VX820"
|
||||
tristate "VIA VT82C596/82C686/82xx and CX700/VX8xx"
|
||||
depends on PCI
|
||||
help
|
||||
If you say yes to this option, support will be included for the VIA
|
||||
|
|
@ -225,8 +225,8 @@ config I2C_VIAPRO
|
|||
VT8237R/A/S
|
||||
VT8251
|
||||
CX700
|
||||
VX800
|
||||
VX820
|
||||
VX800/VX820
|
||||
VX855/VX875
|
||||
|
||||
This driver can also be built as a module. If so, the module
|
||||
will be called i2c-viapro.
|
||||
|
|
|
|||
|
|
@ -37,6 +37,7 @@
|
|||
VT8251 0x3287 yes
|
||||
CX700 0x8324 yes
|
||||
VX800/VX820 0x8353 yes
|
||||
VX855/VX875 0x8409 yes
|
||||
|
||||
Note: we assume there can only be one device, with one SMBus interface.
|
||||
*/
|
||||
|
|
@ -404,6 +405,7 @@ found:
|
|||
switch (pdev->device) {
|
||||
case PCI_DEVICE_ID_VIA_CX700:
|
||||
case PCI_DEVICE_ID_VIA_VX800:
|
||||
case PCI_DEVICE_ID_VIA_VX855:
|
||||
case PCI_DEVICE_ID_VIA_8251:
|
||||
case PCI_DEVICE_ID_VIA_8237:
|
||||
case PCI_DEVICE_ID_VIA_8237A:
|
||||
|
|
@ -469,6 +471,8 @@ static struct pci_device_id vt596_ids[] = {
|
|||
.driver_data = SMBBA3 },
|
||||
{ PCI_DEVICE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_VX800),
|
||||
.driver_data = SMBBA3 },
|
||||
{ PCI_DEVICE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_VX855),
|
||||
.driver_data = SMBBA3 },
|
||||
{ 0, }
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -163,7 +163,6 @@ static struct i2c_algo_bit_data voo_i2c_bit_data = {
|
|||
|
||||
static struct i2c_adapter voodoo3_i2c_adapter = {
|
||||
.owner = THIS_MODULE,
|
||||
.class = I2C_CLASS_TV_ANALOG,
|
||||
.name = "I2C Voodoo3/Banshee adapter",
|
||||
.algo_data = &voo_i2c_bit_data,
|
||||
};
|
||||
|
|
|
|||
|
|
@ -64,21 +64,6 @@ config SENSORS_PCA9539
|
|||
This driver is deprecated and will be dropped soon. Use
|
||||
drivers/gpio/pca953x.c instead.
|
||||
|
||||
config SENSORS_MAX6875
|
||||
tristate "Maxim MAX6875 Power supply supervisor"
|
||||
depends on EXPERIMENTAL
|
||||
help
|
||||
If you say yes here you get support for the Maxim MAX6875
|
||||
EEPROM-programmable, quad power-supply sequencer/supervisor.
|
||||
|
||||
This provides an interface to program the EEPROM and reset the chip.
|
||||
|
||||
This driver also supports the Maxim MAX6874 hex power-supply
|
||||
sequencer/supervisor if found at a compatible address.
|
||||
|
||||
This driver can also be built as a module. If so, the module
|
||||
will be called max6875.
|
||||
|
||||
config SENSORS_TSL2550
|
||||
tristate "Taos TSL2550 ambient light sensor"
|
||||
depends on EXPERIMENTAL
|
||||
|
|
|
|||
|
|
@ -11,7 +11,6 @@
|
|||
#
|
||||
|
||||
obj-$(CONFIG_DS1682) += ds1682.o
|
||||
obj-$(CONFIG_SENSORS_MAX6875) += max6875.o
|
||||
obj-$(CONFIG_SENSORS_PCA9539) += pca9539.o
|
||||
obj-$(CONFIG_SENSORS_PCF8574) += pcf8574.o
|
||||
obj-$(CONFIG_PCF8575) += pcf8575.o
|
||||
|
|
|
|||
|
|
@ -1,246 +0,0 @@
|
|||
/*
|
||||
max6875.c - driver for MAX6874/MAX6875
|
||||
|
||||
Copyright (C) 2005 Ben Gardner <bgardner@wabtec.com>
|
||||
|
||||
Based on i2c/chips/eeprom.c
|
||||
|
||||
The MAX6875 has a bank of registers and two banks of EEPROM.
|
||||
Address ranges are defined as follows:
|
||||
* 0x0000 - 0x0046 = configuration registers
|
||||
* 0x8000 - 0x8046 = configuration EEPROM
|
||||
* 0x8100 - 0x82FF = user EEPROM
|
||||
|
||||
This driver makes the user EEPROM available for read.
|
||||
|
||||
The registers & config EEPROM should be accessed via i2c-dev.
|
||||
|
||||
The MAX6875 ignores the lowest address bit, so each chip responds to
|
||||
two addresses - 0x50/0x51 and 0x52/0x53.
|
||||
|
||||
Note that the MAX6875 uses i2c_smbus_write_byte_data() to set the read
|
||||
address, so this driver is destructive if loaded for the wrong EEPROM chip.
|
||||
|
||||
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; version 2 of the License.
|
||||
*/
|
||||
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/init.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/slab.h>
|
||||
#include <linux/i2c.h>
|
||||
#include <linux/mutex.h>
|
||||
|
||||
/* Do not scan - the MAX6875 access method will write to some EEPROM chips */
|
||||
static const unsigned short normal_i2c[] = { I2C_CLIENT_END };
|
||||
|
||||
/* Insmod parameters */
|
||||
I2C_CLIENT_INSMOD_1(max6875);
|
||||
|
||||
/* The MAX6875 can only read/write 16 bytes at a time */
|
||||
#define SLICE_SIZE 16
|
||||
#define SLICE_BITS 4
|
||||
|
||||
/* USER EEPROM is at addresses 0x8100 - 0x82FF */
|
||||
#define USER_EEPROM_BASE 0x8100
|
||||
#define USER_EEPROM_SIZE 0x0200
|
||||
#define USER_EEPROM_SLICES 32
|
||||
|
||||
/* MAX6875 commands */
|
||||
#define MAX6875_CMD_BLK_READ 0x84
|
||||
|
||||
/* Each client has this additional data */
|
||||
struct max6875_data {
|
||||
struct i2c_client *fake_client;
|
||||
struct mutex update_lock;
|
||||
|
||||
u32 valid;
|
||||
u8 data[USER_EEPROM_SIZE];
|
||||
unsigned long last_updated[USER_EEPROM_SLICES];
|
||||
};
|
||||
|
||||
static void max6875_update_slice(struct i2c_client *client, int slice)
|
||||
{
|
||||
struct max6875_data *data = i2c_get_clientdata(client);
|
||||
int i, j, addr;
|
||||
u8 *buf;
|
||||
|
||||
if (slice >= USER_EEPROM_SLICES)
|
||||
return;
|
||||
|
||||
mutex_lock(&data->update_lock);
|
||||
|
||||
buf = &data->data[slice << SLICE_BITS];
|
||||
|
||||
if (!(data->valid & (1 << slice)) ||
|
||||
time_after(jiffies, data->last_updated[slice])) {
|
||||
|
||||
dev_dbg(&client->dev, "Starting update of slice %u\n", slice);
|
||||
|
||||
data->valid &= ~(1 << slice);
|
||||
|
||||
addr = USER_EEPROM_BASE + (slice << SLICE_BITS);
|
||||
|
||||
/* select the eeprom address */
|
||||
if (i2c_smbus_write_byte_data(client, addr >> 8, addr & 0xFF)) {
|
||||
dev_err(&client->dev, "address set failed\n");
|
||||
goto exit_up;
|
||||
}
|
||||
|
||||
if (i2c_check_functionality(client->adapter,
|
||||
I2C_FUNC_SMBUS_READ_I2C_BLOCK)) {
|
||||
if (i2c_smbus_read_i2c_block_data(client,
|
||||
MAX6875_CMD_BLK_READ,
|
||||
SLICE_SIZE,
|
||||
buf) != SLICE_SIZE) {
|
||||
goto exit_up;
|
||||
}
|
||||
} else {
|
||||
for (i = 0; i < SLICE_SIZE; i++) {
|
||||
j = i2c_smbus_read_byte(client);
|
||||
if (j < 0) {
|
||||
goto exit_up;
|
||||
}
|
||||
buf[i] = j;
|
||||
}
|
||||
}
|
||||
data->last_updated[slice] = jiffies;
|
||||
data->valid |= (1 << slice);
|
||||
}
|
||||
exit_up:
|
||||
mutex_unlock(&data->update_lock);
|
||||
}
|
||||
|
||||
static ssize_t max6875_read(struct kobject *kobj,
|
||||
struct bin_attribute *bin_attr,
|
||||
char *buf, loff_t off, size_t count)
|
||||
{
|
||||
struct i2c_client *client = kobj_to_i2c_client(kobj);
|
||||
struct max6875_data *data = i2c_get_clientdata(client);
|
||||
int slice, max_slice;
|
||||
|
||||
if (off > USER_EEPROM_SIZE)
|
||||
return 0;
|
||||
|
||||
if (off + count > USER_EEPROM_SIZE)
|
||||
count = USER_EEPROM_SIZE - off;
|
||||
|
||||
/* refresh slices which contain requested bytes */
|
||||
max_slice = (off + count - 1) >> SLICE_BITS;
|
||||
for (slice = (off >> SLICE_BITS); slice <= max_slice; slice++)
|
||||
max6875_update_slice(client, slice);
|
||||
|
||||
memcpy(buf, &data->data[off], count);
|
||||
|
||||
return count;
|
||||
}
|
||||
|
||||
static struct bin_attribute user_eeprom_attr = {
|
||||
.attr = {
|
||||
.name = "eeprom",
|
||||
.mode = S_IRUGO,
|
||||
},
|
||||
.size = USER_EEPROM_SIZE,
|
||||
.read = max6875_read,
|
||||
};
|
||||
|
||||
/* Return 0 if detection is successful, -ENODEV otherwise */
|
||||
static int max6875_detect(struct i2c_client *client, int kind,
|
||||
struct i2c_board_info *info)
|
||||
{
|
||||
struct i2c_adapter *adapter = client->adapter;
|
||||
|
||||
if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_WRITE_BYTE_DATA
|
||||
| I2C_FUNC_SMBUS_READ_BYTE))
|
||||
return -ENODEV;
|
||||
|
||||
/* Only check even addresses */
|
||||
if (client->addr & 1)
|
||||
return -ENODEV;
|
||||
|
||||
strlcpy(info->type, "max6875", I2C_NAME_SIZE);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int max6875_probe(struct i2c_client *client,
|
||||
const struct i2c_device_id *id)
|
||||
{
|
||||
struct max6875_data *data;
|
||||
int err;
|
||||
|
||||
if (!(data = kzalloc(sizeof(struct max6875_data), GFP_KERNEL)))
|
||||
return -ENOMEM;
|
||||
|
||||
/* A fake client is created on the odd address */
|
||||
data->fake_client = i2c_new_dummy(client->adapter, client->addr + 1);
|
||||
if (!data->fake_client) {
|
||||
err = -ENOMEM;
|
||||
goto exit_kfree;
|
||||
}
|
||||
|
||||
/* Init real i2c_client */
|
||||
i2c_set_clientdata(client, data);
|
||||
mutex_init(&data->update_lock);
|
||||
|
||||
err = sysfs_create_bin_file(&client->dev.kobj, &user_eeprom_attr);
|
||||
if (err)
|
||||
goto exit_remove_fake;
|
||||
|
||||
return 0;
|
||||
|
||||
exit_remove_fake:
|
||||
i2c_unregister_device(data->fake_client);
|
||||
exit_kfree:
|
||||
kfree(data);
|
||||
return err;
|
||||
}
|
||||
|
||||
static int max6875_remove(struct i2c_client *client)
|
||||
{
|
||||
struct max6875_data *data = i2c_get_clientdata(client);
|
||||
|
||||
i2c_unregister_device(data->fake_client);
|
||||
|
||||
sysfs_remove_bin_file(&client->dev.kobj, &user_eeprom_attr);
|
||||
kfree(data);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static const struct i2c_device_id max6875_id[] = {
|
||||
{ "max6875", 0 },
|
||||
{ }
|
||||
};
|
||||
|
||||
static struct i2c_driver max6875_driver = {
|
||||
.driver = {
|
||||
.name = "max6875",
|
||||
},
|
||||
.probe = max6875_probe,
|
||||
.remove = max6875_remove,
|
||||
.id_table = max6875_id,
|
||||
|
||||
.detect = max6875_detect,
|
||||
.address_data = &addr_data,
|
||||
};
|
||||
|
||||
static int __init max6875_init(void)
|
||||
{
|
||||
return i2c_add_driver(&max6875_driver);
|
||||
}
|
||||
|
||||
static void __exit max6875_exit(void)
|
||||
{
|
||||
i2c_del_driver(&max6875_driver);
|
||||
}
|
||||
|
||||
|
||||
MODULE_AUTHOR("Ben Gardner <[email protected]>");
|
||||
MODULE_DESCRIPTION("MAX6875 driver");
|
||||
MODULE_LICENSE("GPL");
|
||||
|
||||
module_init(max6875_init);
|
||||
module_exit(max6875_exit);
|
||||
|
|
@ -29,7 +29,6 @@
|
|||
#include <linux/i2c.h>
|
||||
#include <linux/init.h>
|
||||
#include <linux/idr.h>
|
||||
#include <linux/platform_device.h>
|
||||
#include <linux/mutex.h>
|
||||
#include <linux/completion.h>
|
||||
#include <linux/hardirq.h>
|
||||
|
|
@ -451,16 +450,6 @@ static int i2c_register_adapter(struct i2c_adapter *adap)
|
|||
|
||||
mutex_lock(&core_lock);
|
||||
|
||||
/* Add the adapter to the driver core.
|
||||
* If the parent pointer is not set up,
|
||||
* we add this adapter to the host bus.
|
||||
*/
|
||||
if (adap->dev.parent == NULL) {
|
||||
adap->dev.parent = &platform_bus;
|
||||
pr_debug("I2C adapter driver [%s] forgot to specify "
|
||||
"physical device\n", adap->name);
|
||||
}
|
||||
|
||||
/* Set default timeout to 1 second if not already set */
|
||||
if (adap->timeout == 0)
|
||||
adap->timeout = HZ;
|
||||
|
|
@ -1022,7 +1011,8 @@ module_exit(i2c_exit);
|
|||
*/
|
||||
int i2c_transfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num)
|
||||
{
|
||||
int ret;
|
||||
unsigned long orig_jiffies;
|
||||
int ret, try;
|
||||
|
||||
/* REVISIT the fault reporting model here is weak:
|
||||
*
|
||||
|
|
@ -1060,7 +1050,15 @@ int i2c_transfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num)
|
|||
mutex_lock_nested(&adap->bus_lock, adap->level);
|
||||
}
|
||||
|
||||
ret = adap->algo->master_xfer(adap,msgs,num);
|
||||
/* Retry automatically on arbitration loss */
|
||||
orig_jiffies = jiffies;
|
||||
for (ret = 0, try = 0; try <= adap->retries; try++) {
|
||||
ret = adap->algo->master_xfer(adap, msgs, num);
|
||||
if (ret != -EAGAIN)
|
||||
break;
|
||||
if (time_after(jiffies, orig_jiffies + adap->timeout))
|
||||
break;
|
||||
}
|
||||
mutex_unlock(&adap->bus_lock);
|
||||
|
||||
return ret;
|
||||
|
|
@ -1509,7 +1507,7 @@ struct i2c_adapter* i2c_get_adapter(int id)
|
|||
struct i2c_adapter *adapter;
|
||||
|
||||
mutex_lock(&core_lock);
|
||||
adapter = (struct i2c_adapter *)idr_find(&i2c_adapter_idr, id);
|
||||
adapter = idr_find(&i2c_adapter_idr, id);
|
||||
if (adapter && !try_module_get(adapter->owner))
|
||||
adapter = NULL;
|
||||
|
||||
|
|
@ -1995,14 +1993,27 @@ s32 i2c_smbus_xfer(struct i2c_adapter *adapter, u16 addr, unsigned short flags,
|
|||
char read_write, u8 command, int protocol,
|
||||
union i2c_smbus_data *data)
|
||||
{
|
||||
unsigned long orig_jiffies;
|
||||
int try;
|
||||
s32 res;
|
||||
|
||||
flags &= I2C_M_TEN | I2C_CLIENT_PEC;
|
||||
|
||||
if (adapter->algo->smbus_xfer) {
|
||||
mutex_lock(&adapter->bus_lock);
|
||||
res = adapter->algo->smbus_xfer(adapter,addr,flags,read_write,
|
||||
command, protocol, data);
|
||||
|
||||
/* Retry automatically on arbitration loss */
|
||||
orig_jiffies = jiffies;
|
||||
for (res = 0, try = 0; try <= adapter->retries; try++) {
|
||||
res = adapter->algo->smbus_xfer(adapter, addr, flags,
|
||||
read_write, command,
|
||||
protocol, data);
|
||||
if (res != -EAGAIN)
|
||||
break;
|
||||
if (time_after(jiffies,
|
||||
orig_jiffies + adapter->timeout))
|
||||
break;
|
||||
}
|
||||
mutex_unlock(&adapter->bus_lock);
|
||||
} else
|
||||
res = i2c_smbus_xfer_emulated(adapter,addr,flags,read_write,
|
||||
|
|
|
|||
Loading…
Reference in a new issue