forked from Minki/linux
at24: enable ACPI device found on Galileo Gen2
There is a 24c08 chip connected to i2c bus on Intel Galileo Gen2 board. Enable it via ACPI ID INT3499. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
This commit is contained in:
parent
6ebe21c1cf
commit
3861841d22
@ -21,6 +21,7 @@
|
|||||||
#include <linux/bitops.h>
|
#include <linux/bitops.h>
|
||||||
#include <linux/jiffies.h>
|
#include <linux/jiffies.h>
|
||||||
#include <linux/of.h>
|
#include <linux/of.h>
|
||||||
|
#include <linux/acpi.h>
|
||||||
#include <linux/i2c.h>
|
#include <linux/i2c.h>
|
||||||
#include <linux/platform_data/at24.h>
|
#include <linux/platform_data/at24.h>
|
||||||
|
|
||||||
@ -131,6 +132,12 @@ static const struct i2c_device_id at24_ids[] = {
|
|||||||
};
|
};
|
||||||
MODULE_DEVICE_TABLE(i2c, at24_ids);
|
MODULE_DEVICE_TABLE(i2c, at24_ids);
|
||||||
|
|
||||||
|
static const struct acpi_device_id at24_acpi_ids[] = {
|
||||||
|
{ "INT3499", AT24_DEVICE_MAGIC(8192 / 8, 0) },
|
||||||
|
{ }
|
||||||
|
};
|
||||||
|
MODULE_DEVICE_TABLE(acpi, at24_acpi_ids);
|
||||||
|
|
||||||
/*-------------------------------------------------------------------------*/
|
/*-------------------------------------------------------------------------*/
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@ -467,21 +474,29 @@ static void at24_get_ofdata(struct i2c_client *client,
|
|||||||
static int at24_probe(struct i2c_client *client, const struct i2c_device_id *id)
|
static int at24_probe(struct i2c_client *client, const struct i2c_device_id *id)
|
||||||
{
|
{
|
||||||
struct at24_platform_data chip;
|
struct at24_platform_data chip;
|
||||||
|
kernel_ulong_t magic = 0;
|
||||||
bool writable;
|
bool writable;
|
||||||
int use_smbus = 0;
|
int use_smbus = 0;
|
||||||
int use_smbus_write = 0;
|
int use_smbus_write = 0;
|
||||||
struct at24_data *at24;
|
struct at24_data *at24;
|
||||||
int err;
|
int err;
|
||||||
unsigned i, num_addresses;
|
unsigned i, num_addresses;
|
||||||
kernel_ulong_t magic;
|
|
||||||
|
|
||||||
if (client->dev.platform_data) {
|
if (client->dev.platform_data) {
|
||||||
chip = *(struct at24_platform_data *)client->dev.platform_data;
|
chip = *(struct at24_platform_data *)client->dev.platform_data;
|
||||||
} else {
|
} else {
|
||||||
if (!id->driver_data)
|
if (id) {
|
||||||
|
magic = id->driver_data;
|
||||||
|
} else {
|
||||||
|
const struct acpi_device_id *aid;
|
||||||
|
|
||||||
|
aid = acpi_match_device(at24_acpi_ids, &client->dev);
|
||||||
|
if (aid)
|
||||||
|
magic = aid->driver_data;
|
||||||
|
}
|
||||||
|
if (!magic)
|
||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
|
|
||||||
magic = id->driver_data;
|
|
||||||
chip.byte_len = BIT(magic & AT24_BITMASK(AT24_SIZE_BYTELEN));
|
chip.byte_len = BIT(magic & AT24_BITMASK(AT24_SIZE_BYTELEN));
|
||||||
magic >>= AT24_SIZE_BYTELEN;
|
magic >>= AT24_SIZE_BYTELEN;
|
||||||
chip.flags = magic & AT24_BITMASK(AT24_SIZE_FLAGS);
|
chip.flags = magic & AT24_BITMASK(AT24_SIZE_FLAGS);
|
||||||
@ -661,6 +676,7 @@ static int at24_remove(struct i2c_client *client)
|
|||||||
static struct i2c_driver at24_driver = {
|
static struct i2c_driver at24_driver = {
|
||||||
.driver = {
|
.driver = {
|
||||||
.name = "at24",
|
.name = "at24",
|
||||||
|
.acpi_match_table = ACPI_PTR(at24_acpi_ids),
|
||||||
},
|
},
|
||||||
.probe = at24_probe,
|
.probe = at24_probe,
|
||||||
.remove = at24_remove,
|
.remove = at24_remove,
|
||||||
|
Loading…
Reference in New Issue
Block a user