mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 03:27:44 -04:00
mfd: Rename all twl4030_i2c*
This patch renames function names like twl4030_i2c_write_u8, twl4030_i2c_read_u8 to twl_i2c_write_u8, twl_i2c_read_u8 and also common variable in twl-core.c Signed-off-by: Rajendra Nayak <[email protected]> Signed-off-by: Balaji T K <[email protected]> Signed-off-by: Santosh Shilimkar <[email protected]> Acked-by: Kevin Hilman <[email protected]> Signed-off-by: Samuel Ortiz <[email protected]>
This commit is contained in:
Balaji T K
Samuel Ortiz
parent
b07682b605
commit
fc7b92fca4
13 changed files with 187 additions and 160 deletions
|
|
@ -1,5 +1,6 @@
|
|||
/*
|
||||
* twl4030_core.c - driver for TWL4030/TPS659x0 PM and audio CODEC devices
|
||||
* twl_core.c - driver for TWL4030/TWL5030/TWL60X0/TPS659x0 PM
|
||||
* and audio CODEC devices
|
||||
*
|
||||
* Copyright (C) 2005-2006 Texas Instruments, Inc.
|
||||
*
|
||||
|
|
@ -55,7 +56,7 @@
|
|||
* (and associated registers).
|
||||
*/
|
||||
|
||||
#define DRIVER_NAME "twl4030"
|
||||
#define DRIVER_NAME "twl"
|
||||
|
||||
#if defined(CONFIG_TWL4030_BCI_BATTERY) || \
|
||||
defined(CONFIG_TWL4030_BCI_BATTERY_MODULE)
|
||||
|
|
@ -125,7 +126,7 @@
|
|||
/* Last - for index max*/
|
||||
#define TWL4030_MODULE_LAST TWL4030_MODULE_SECURED_REG
|
||||
|
||||
#define TWL4030_NUM_SLAVES 4
|
||||
#define TWL_NUM_SLAVES 4
|
||||
|
||||
#if defined(CONFIG_INPUT_TWL4030_PWRBUTTON) \
|
||||
|| defined(CONFIG_INPUT_TWL4030_PWBUTTON_MODULE)
|
||||
|
|
@ -134,6 +135,13 @@
|
|||
#define twl_has_pwrbutton() false
|
||||
#endif
|
||||
|
||||
#define SUB_CHIP_ID0 0
|
||||
#define SUB_CHIP_ID1 1
|
||||
#define SUB_CHIP_ID2 2
|
||||
#define SUB_CHIP_ID3 3
|
||||
|
||||
#define TWL_MODULE_LAST TWL4030_MODULE_LAST
|
||||
|
||||
/* Base Address defns for twl4030_map[] */
|
||||
|
||||
/* subchip/slave 0 - USB ID */
|
||||
|
|
@ -201,7 +209,7 @@
|
|||
static bool inuse;
|
||||
|
||||
/* Structure for each TWL4030 Slave */
|
||||
struct twl4030_client {
|
||||
struct twl_client {
|
||||
struct i2c_client *client;
|
||||
u8 address;
|
||||
|
||||
|
|
@ -212,16 +220,16 @@ struct twl4030_client {
|
|||
struct mutex xfer_lock;
|
||||
};
|
||||
|
||||
static struct twl4030_client twl4030_modules[TWL4030_NUM_SLAVES];
|
||||
static struct twl_client twl_modules[TWL_NUM_SLAVES];
|
||||
|
||||
|
||||
/* mapping the module id to slave id and base address */
|
||||
struct twl4030mapping {
|
||||
struct twl_mapping {
|
||||
unsigned char sid; /* Slave ID */
|
||||
unsigned char base; /* base address */
|
||||
};
|
||||
|
||||
static struct twl4030mapping twl4030_map[TWL4030_MODULE_LAST + 1] = {
|
||||
static struct twl_mapping twl4030_map[TWL4030_MODULE_LAST + 1] = {
|
||||
/*
|
||||
* NOTE: don't change this table without updating the
|
||||
* <linux/i2c/twl4030.h> defines for TWL4030_MODULE_*
|
||||
|
|
@ -262,7 +270,7 @@ static struct twl4030mapping twl4030_map[TWL4030_MODULE_LAST + 1] = {
|
|||
/* Exported Functions */
|
||||
|
||||
/**
|
||||
* twl4030_i2c_write - Writes a n bit register in TWL4030
|
||||
* twl_i2c_write - Writes a n bit register in TWL4030/TWL5030/TWL60X0
|
||||
* @mod_no: module number
|
||||
* @value: an array of num_bytes+1 containing data to write
|
||||
* @reg: register address (just offset will do)
|
||||
|
|
@ -273,19 +281,19 @@ static struct twl4030mapping twl4030_map[TWL4030_MODULE_LAST + 1] = {
|
|||
*
|
||||
* Returns the result of operation - 0 is success
|
||||
*/
|
||||
int twl4030_i2c_write(u8 mod_no, u8 *value, u8 reg, unsigned num_bytes)
|
||||
int twl_i2c_write(u8 mod_no, u8 *value, u8 reg, unsigned num_bytes)
|
||||
{
|
||||
int ret;
|
||||
int sid;
|
||||
struct twl4030_client *twl;
|
||||
struct twl_client *twl;
|
||||
struct i2c_msg *msg;
|
||||
|
||||
if (unlikely(mod_no > TWL4030_MODULE_LAST)) {
|
||||
if (unlikely(mod_no > TWL_MODULE_LAST)) {
|
||||
pr_err("%s: invalid module number %d\n", DRIVER_NAME, mod_no);
|
||||
return -EPERM;
|
||||
}
|
||||
sid = twl4030_map[mod_no].sid;
|
||||
twl = &twl4030_modules[sid];
|
||||
twl = &twl_modules[sid];
|
||||
|
||||
if (unlikely(!inuse)) {
|
||||
pr_err("%s: client %d is not initialized\n", DRIVER_NAME, sid);
|
||||
|
|
@ -318,10 +326,10 @@ int twl4030_i2c_write(u8 mod_no, u8 *value, u8 reg, unsigned num_bytes)
|
|||
return 0;
|
||||
}
|
||||
}
|
||||
EXPORT_SYMBOL(twl4030_i2c_write);
|
||||
EXPORT_SYMBOL(twl_i2c_write);
|
||||
|
||||
/**
|
||||
* twl4030_i2c_read - Reads a n bit register in TWL4030
|
||||
* twl_i2c_read - Reads a n bit register in TWL4030/TWL5030/TWL60X0
|
||||
* @mod_no: module number
|
||||
* @value: an array of num_bytes containing data to be read
|
||||
* @reg: register address (just offset will do)
|
||||
|
|
@ -329,20 +337,20 @@ EXPORT_SYMBOL(twl4030_i2c_write);
|
|||
*
|
||||
* Returns result of operation - num_bytes is success else failure.
|
||||
*/
|
||||
int twl4030_i2c_read(u8 mod_no, u8 *value, u8 reg, unsigned num_bytes)
|
||||
int twl_i2c_read(u8 mod_no, u8 *value, u8 reg, unsigned num_bytes)
|
||||
{
|
||||
int ret;
|
||||
u8 val;
|
||||
int sid;
|
||||
struct twl4030_client *twl;
|
||||
struct twl_client *twl;
|
||||
struct i2c_msg *msg;
|
||||
|
||||
if (unlikely(mod_no > TWL4030_MODULE_LAST)) {
|
||||
if (unlikely(mod_no > TWL_MODULE_LAST)) {
|
||||
pr_err("%s: invalid module number %d\n", DRIVER_NAME, mod_no);
|
||||
return -EPERM;
|
||||
}
|
||||
sid = twl4030_map[mod_no].sid;
|
||||
twl = &twl4030_modules[sid];
|
||||
twl = &twl_modules[sid];
|
||||
|
||||
if (unlikely(!inuse)) {
|
||||
pr_err("%s: client %d is not initialized\n", DRIVER_NAME, sid);
|
||||
|
|
@ -377,40 +385,40 @@ int twl4030_i2c_read(u8 mod_no, u8 *value, u8 reg, unsigned num_bytes)
|
|||
return 0;
|
||||
}
|
||||
}
|
||||
EXPORT_SYMBOL(twl4030_i2c_read);
|
||||
EXPORT_SYMBOL(twl_i2c_read);
|
||||
|
||||
/**
|
||||
* twl4030_i2c_write_u8 - Writes a 8 bit register in TWL4030
|
||||
* twl_i2c_write_u8 - Writes a 8 bit register in TWL4030/TWL5030/TWL60X0
|
||||
* @mod_no: module number
|
||||
* @value: the value to be written 8 bit
|
||||
* @reg: register address (just offset will do)
|
||||
*
|
||||
* Returns result of operation - 0 is success
|
||||
*/
|
||||
int twl4030_i2c_write_u8(u8 mod_no, u8 value, u8 reg)
|
||||
int twl_i2c_write_u8(u8 mod_no, u8 value, u8 reg)
|
||||
{
|
||||
|
||||
/* 2 bytes offset 1 contains the data offset 0 is used by i2c_write */
|
||||
u8 temp_buffer[2] = { 0 };
|
||||
/* offset 1 contains the data */
|
||||
temp_buffer[1] = value;
|
||||
return twl4030_i2c_write(mod_no, temp_buffer, reg, 1);
|
||||
return twl_i2c_write(mod_no, temp_buffer, reg, 1);
|
||||
}
|
||||
EXPORT_SYMBOL(twl4030_i2c_write_u8);
|
||||
EXPORT_SYMBOL(twl_i2c_write_u8);
|
||||
|
||||
/**
|
||||
* twl4030_i2c_read_u8 - Reads a 8 bit register from TWL4030
|
||||
* twl_i2c_read_u8 - Reads a 8 bit register from TWL4030/TWL5030/TWL60X0
|
||||
* @mod_no: module number
|
||||
* @value: the value read 8 bit
|
||||
* @reg: register address (just offset will do)
|
||||
*
|
||||
* Returns result of operation - 0 is success
|
||||
*/
|
||||
int twl4030_i2c_read_u8(u8 mod_no, u8 *value, u8 reg)
|
||||
int twl_i2c_read_u8(u8 mod_no, u8 *value, u8 reg)
|
||||
{
|
||||
return twl4030_i2c_read(mod_no, value, reg, 1);
|
||||
return twl_i2c_read(mod_no, value, reg, 1);
|
||||
}
|
||||
EXPORT_SYMBOL(twl4030_i2c_read_u8);
|
||||
EXPORT_SYMBOL(twl_i2c_read_u8);
|
||||
|
||||
/*----------------------------------------------------------------------*/
|
||||
|
||||
|
|
@ -420,7 +428,7 @@ add_numbered_child(unsigned chip, const char *name, int num,
|
|||
bool can_wakeup, int irq0, int irq1)
|
||||
{
|
||||
struct platform_device *pdev;
|
||||
struct twl4030_client *twl = &twl4030_modules[chip];
|
||||
struct twl_client *twl = &twl_modules[chip];
|
||||
int status;
|
||||
|
||||
pdev = platform_device_alloc(name, num);
|
||||
|
|
@ -515,23 +523,24 @@ add_children(struct twl4030_platform_data *pdata, unsigned long features)
|
|||
pdata->bci, sizeof(*pdata->bci),
|
||||
false,
|
||||
/* irq0 = CHG_PRES, irq1 = BCI */
|
||||
pdata->irq_base + 8 + 1, pdata->irq_base + 2);
|
||||
pdata->irq_base + BCI_PRES_INTR_OFFSET,
|
||||
pdata->irq_base + BCI_INTR_OFFSET);
|
||||
if (IS_ERR(child))
|
||||
return PTR_ERR(child);
|
||||
}
|
||||
|
||||
if (twl_has_gpio() && pdata->gpio) {
|
||||
child = add_child(1, "twl4030_gpio",
|
||||
child = add_child(SUB_CHIP_ID1, "twl4030_gpio",
|
||||
pdata->gpio, sizeof(*pdata->gpio),
|
||||
false, pdata->irq_base + 0, 0);
|
||||
false, pdata->irq_base + GPIO_INTR_OFFSET, 0);
|
||||
if (IS_ERR(child))
|
||||
return PTR_ERR(child);
|
||||
}
|
||||
|
||||
if (twl_has_keypad() && pdata->keypad) {
|
||||
child = add_child(2, "twl4030_keypad",
|
||||
child = add_child(SUB_CHIP_ID2, "twl4030_keypad",
|
||||
pdata->keypad, sizeof(*pdata->keypad),
|
||||
true, pdata->irq_base + 1, 0);
|
||||
true, pdata->irq_base + KEYPAD_INTR_OFFSET, 0);
|
||||
if (IS_ERR(child))
|
||||
return PTR_ERR(child);
|
||||
}
|
||||
|
|
@ -539,7 +548,7 @@ add_children(struct twl4030_platform_data *pdata, unsigned long features)
|
|||
if (twl_has_madc() && pdata->madc) {
|
||||
child = add_child(2, "twl4030_madc",
|
||||
pdata->madc, sizeof(*pdata->madc),
|
||||
true, pdata->irq_base + 3, 0);
|
||||
true, pdata->irq_base + MADC_INTR_OFFSET, 0);
|
||||
if (IS_ERR(child))
|
||||
return PTR_ERR(child);
|
||||
}
|
||||
|
|
@ -554,7 +563,7 @@ add_children(struct twl4030_platform_data *pdata, unsigned long features)
|
|||
*/
|
||||
child = add_child(3, "twl4030_rtc",
|
||||
NULL, 0,
|
||||
true, pdata->irq_base + 8 + 3, 0);
|
||||
true, pdata->irq_base + RTC_INTR_OFFSET, 0);
|
||||
if (IS_ERR(child))
|
||||
return PTR_ERR(child);
|
||||
}
|
||||
|
|
@ -604,7 +613,8 @@ add_children(struct twl4030_platform_data *pdata, unsigned long features)
|
|||
pdata->usb, sizeof(*pdata->usb),
|
||||
true,
|
||||
/* irq0 = USB_PRES, irq1 = USB */
|
||||
pdata->irq_base + 8 + 2, pdata->irq_base + 4);
|
||||
pdata->irq_base + USB_PRES_INTR_OFFSET,
|
||||
pdata->irq_base + USB_INTR_OFFSET);
|
||||
|
||||
if (IS_ERR(child))
|
||||
return PTR_ERR(child);
|
||||
|
|
@ -724,7 +734,7 @@ static inline int __init protect_pm_master(void)
|
|||
{
|
||||
int e = 0;
|
||||
|
||||
e = twl4030_i2c_write_u8(TWL4030_MODULE_PM_MASTER, KEY_LOCK,
|
||||
e = twl_i2c_write_u8(TWL_MODULE_PM_MASTER, KEY_LOCK,
|
||||
R_PROTECT_KEY);
|
||||
return e;
|
||||
}
|
||||
|
|
@ -733,9 +743,9 @@ static inline int __init unprotect_pm_master(void)
|
|||
{
|
||||
int e = 0;
|
||||
|
||||
e |= twl4030_i2c_write_u8(TWL4030_MODULE_PM_MASTER, KEY_UNLOCK1,
|
||||
e |= twl_i2c_write_u8(TWL_MODULE_PM_MASTER, KEY_UNLOCK1,
|
||||
R_PROTECT_KEY);
|
||||
e |= twl4030_i2c_write_u8(TWL4030_MODULE_PM_MASTER, KEY_UNLOCK2,
|
||||
e |= twl_i2c_write_u8(TWL_MODULE_PM_MASTER, KEY_UNLOCK2,
|
||||
R_PROTECT_KEY);
|
||||
return e;
|
||||
}
|
||||
|
|
@ -755,7 +765,7 @@ static void clocks_init(struct device *dev,
|
|||
osc = clk_get(dev, "osc_sys_ck");
|
||||
|
||||
if (IS_ERR(osc)) {
|
||||
printk(KERN_WARNING "Skipping twl4030 internal clock init and "
|
||||
printk(KERN_WARNING "Skipping twl internal clock init and "
|
||||
"using bootloader value (unknown osc rate)\n");
|
||||
return;
|
||||
}
|
||||
|
|
@ -769,7 +779,7 @@ static void clocks_init(struct device *dev,
|
|||
*/
|
||||
osc = ERR_PTR(-EIO);
|
||||
|
||||
printk(KERN_WARNING "Skipping twl4030 internal clock init and "
|
||||
printk(KERN_WARNING "Skipping twl internal clock init and "
|
||||
"using bootloader value (unknown osc rate)\n");
|
||||
|
||||
return;
|
||||
|
|
@ -793,7 +803,7 @@ static void clocks_init(struct device *dev,
|
|||
|
||||
e |= unprotect_pm_master();
|
||||
/* effect->MADC+USB ck en */
|
||||
e |= twl4030_i2c_write_u8(TWL4030_MODULE_PM_MASTER, ctrl, R_CFG_BOOT);
|
||||
e |= twl_i2c_write_u8(TWL_MODULE_PM_MASTER, ctrl, R_CFG_BOOT);
|
||||
e |= protect_pm_master();
|
||||
|
||||
if (e < 0)
|
||||
|
|
@ -806,7 +816,7 @@ int twl_init_irq(int irq_num, unsigned irq_base, unsigned irq_end);
|
|||
int twl_exit_irq(void);
|
||||
int twl_init_chip_irq(const char *chip);
|
||||
|
||||
static int twl4030_remove(struct i2c_client *client)
|
||||
static int twl_remove(struct i2c_client *client)
|
||||
{
|
||||
unsigned i;
|
||||
int status;
|
||||
|
|
@ -815,12 +825,12 @@ static int twl4030_remove(struct i2c_client *client)
|
|||
if (status < 0)
|
||||
return status;
|
||||
|
||||
for (i = 0; i < TWL4030_NUM_SLAVES; i++) {
|
||||
struct twl4030_client *twl = &twl4030_modules[i];
|
||||
for (i = 0; i < TWL_NUM_SLAVES; i++) {
|
||||
struct twl_client *twl = &twl_modules[i];
|
||||
|
||||
if (twl->client && twl->client != client)
|
||||
i2c_unregister_device(twl->client);
|
||||
twl4030_modules[i].client = NULL;
|
||||
twl_modules[i].client = NULL;
|
||||
}
|
||||
inuse = false;
|
||||
return 0;
|
||||
|
|
@ -828,7 +838,7 @@ static int twl4030_remove(struct i2c_client *client)
|
|||
|
||||
/* NOTE: this driver only handles a single twl4030/tps659x0 chip */
|
||||
static int __init
|
||||
twl4030_probe(struct i2c_client *client, const struct i2c_device_id *id)
|
||||
twl_probe(struct i2c_client *client, const struct i2c_device_id *id)
|
||||
{
|
||||
int status;
|
||||
unsigned i;
|
||||
|
|
@ -849,8 +859,8 @@ twl4030_probe(struct i2c_client *client, const struct i2c_device_id *id)
|
|||
return -EBUSY;
|
||||
}
|
||||
|
||||
for (i = 0; i < TWL4030_NUM_SLAVES; i++) {
|
||||
struct twl4030_client *twl = &twl4030_modules[i];
|
||||
for (i = 0; i < TWL_NUM_SLAVES; i++) {
|
||||
struct twl_client *twl = &twl_modules[i];
|
||||
|
||||
twl->address = client->addr + i;
|
||||
if (i == 0)
|
||||
|
|
@ -889,11 +899,11 @@ twl4030_probe(struct i2c_client *client, const struct i2c_device_id *id)
|
|||
status = add_children(pdata, id->driver_data);
|
||||
fail:
|
||||
if (status < 0)
|
||||
twl4030_remove(client);
|
||||
twl_remove(client);
|
||||
return status;
|
||||
}
|
||||
|
||||
static const struct i2c_device_id twl4030_ids[] = {
|
||||
static const struct i2c_device_id twl_ids[] = {
|
||||
{ "twl4030", TWL4030_VAUX2 }, /* "Triton 2" */
|
||||
{ "twl5030", 0 }, /* T2 updated */
|
||||
{ "twl5031", TWL5031 }, /* TWL5030 updated */
|
||||
|
|
@ -902,28 +912,28 @@ static const struct i2c_device_id twl4030_ids[] = {
|
|||
{ "tps65920", TPS_SUBSET }, /* fewer LDOs; no codec or charger */
|
||||
{ /* end of list */ },
|
||||
};
|
||||
MODULE_DEVICE_TABLE(i2c, twl4030_ids);
|
||||
MODULE_DEVICE_TABLE(i2c, twl_ids);
|
||||
|
||||
/* One Client Driver , 4 Clients */
|
||||
static struct i2c_driver twl4030_driver = {
|
||||
static struct i2c_driver twl_driver = {
|
||||
.driver.name = DRIVER_NAME,
|
||||
.id_table = twl4030_ids,
|
||||
.probe = twl4030_probe,
|
||||
.remove = twl4030_remove,
|
||||
.id_table = twl_ids,
|
||||
.probe = twl_probe,
|
||||
.remove = twl_remove,
|
||||
};
|
||||
|
||||
static int __init twl4030_init(void)
|
||||
static int __init twl_init(void)
|
||||
{
|
||||
return i2c_add_driver(&twl4030_driver);
|
||||
return i2c_add_driver(&twl_driver);
|
||||
}
|
||||
subsys_initcall(twl4030_init);
|
||||
subsys_initcall(twl_init);
|
||||
|
||||
static void __exit twl4030_exit(void)
|
||||
static void __exit twl_exit(void)
|
||||
{
|
||||
i2c_del_driver(&twl4030_driver);
|
||||
i2c_del_driver(&twl_driver);
|
||||
}
|
||||
module_exit(twl4030_exit);
|
||||
module_exit(twl_exit);
|
||||
|
||||
MODULE_AUTHOR("Texas Instruments, Inc.");
|
||||
MODULE_DESCRIPTION("I2C Core interface for TWL4030");
|
||||
MODULE_DESCRIPTION("I2C Core interface for TWL");
|
||||
MODULE_LICENSE("GPL");
|
||||
|
|
|
|||
|
|
@ -296,7 +296,7 @@ static int twl4030_irq_thread(void *data)
|
|||
/* Wait for IRQ, then read PIH irq status (also blocking) */
|
||||
wait_for_completion_interruptible(&irq_event);
|
||||
|
||||
ret = twl4030_i2c_read_u8(TWL4030_MODULE_PIH, &pih_isr,
|
||||
ret = twl_i2c_read_u8(TWL4030_MODULE_PIH, &pih_isr,
|
||||
REG_PIH_ISR_P1);
|
||||
if (ret) {
|
||||
pr_warning("twl4030: I2C error %d reading PIH ISR\n",
|
||||
|
|
@ -396,7 +396,7 @@ static int twl4030_init_sih_modules(unsigned line)
|
|||
if (sih->irq_lines <= line)
|
||||
continue;
|
||||
|
||||
status = twl4030_i2c_write(sih->module, buf,
|
||||
status = twl_i2c_write(sih->module, buf,
|
||||
sih->mask[line].imr_offset, sih->bytes_ixr);
|
||||
if (status < 0)
|
||||
pr_err("twl4030: err %d initializing %s %s\n",
|
||||
|
|
@ -410,7 +410,7 @@ static int twl4030_init_sih_modules(unsigned line)
|
|||
* And for PWR_INT it's not documented...
|
||||
*/
|
||||
if (sih->set_cor) {
|
||||
status = twl4030_i2c_write_u8(sih->module,
|
||||
status = twl_i2c_write_u8(sih->module,
|
||||
TWL4030_SIH_CTRL_COR_MASK,
|
||||
sih->control_offset);
|
||||
if (status < 0)
|
||||
|
|
@ -438,14 +438,14 @@ static int twl4030_init_sih_modules(unsigned line)
|
|||
* uncommon with PWR_INT.PWRON.
|
||||
*/
|
||||
for (j = 0; j < 2; j++) {
|
||||
status = twl4030_i2c_read(sih->module, rxbuf,
|
||||
status = twl_i2c_read(sih->module, rxbuf,
|
||||
sih->mask[line].isr_offset, sih->bytes_ixr);
|
||||
if (status < 0)
|
||||
pr_err("twl4030: err %d initializing %s %s\n",
|
||||
status, sih->name, "ISR");
|
||||
|
||||
if (!sih->set_cor)
|
||||
status = twl4030_i2c_write(sih->module, buf,
|
||||
status = twl_i2c_write(sih->module, buf,
|
||||
sih->mask[line].isr_offset,
|
||||
sih->bytes_ixr);
|
||||
/* else COR=1 means read sufficed.
|
||||
|
|
@ -514,7 +514,7 @@ static void twl4030_sih_do_mask(struct work_struct *work)
|
|||
return;
|
||||
|
||||
/* write the whole mask ... simpler than subsetting it */
|
||||
status = twl4030_i2c_write(sih->module, imr.bytes,
|
||||
status = twl_i2c_write(sih->module, imr.bytes,
|
||||
sih->mask[irq_line].imr_offset, sih->bytes_ixr);
|
||||
if (status)
|
||||
pr_err("twl4030: %s, %s --> %d\n", __func__,
|
||||
|
|
@ -545,7 +545,7 @@ static void twl4030_sih_do_edge(struct work_struct *work)
|
|||
* any processor on the other IRQ line, EDR registers are
|
||||
* shared.
|
||||
*/
|
||||
status = twl4030_i2c_read(sih->module, bytes + 1,
|
||||
status = twl_i2c_read(sih->module, bytes + 1,
|
||||
sih->edr_offset, sih->bytes_edr);
|
||||
if (status) {
|
||||
pr_err("twl4030: %s, %s --> %d\n", __func__,
|
||||
|
|
@ -579,7 +579,7 @@ static void twl4030_sih_do_edge(struct work_struct *work)
|
|||
}
|
||||
|
||||
/* Write */
|
||||
status = twl4030_i2c_write(sih->module, bytes,
|
||||
status = twl_i2c_write(sih->module, bytes,
|
||||
sih->edr_offset, sih->bytes_edr);
|
||||
if (status)
|
||||
pr_err("twl4030: %s, %s --> %d\n", __func__,
|
||||
|
|
@ -664,7 +664,7 @@ static inline int sih_read_isr(const struct sih *sih)
|
|||
/* FIXME need retry-on-error ... */
|
||||
|
||||
isr.word = 0;
|
||||
status = twl4030_i2c_read(sih->module, isr.bytes,
|
||||
status = twl_i2c_read(sih->module, isr.bytes,
|
||||
sih->mask[irq_line].isr_offset, sih->bytes_ixr);
|
||||
|
||||
return (status < 0) ? status : le32_to_cpu(isr.word);
|
||||
|
|
|
|||
|
|
@ -131,11 +131,11 @@ static int __init twl4030_write_script_byte(u8 address, u8 byte)
|
|||
{
|
||||
int err;
|
||||
|
||||
err = twl4030_i2c_write_u8(TWL4030_MODULE_PM_MASTER, address,
|
||||
err = twl_i2c_write_u8(TWL4030_MODULE_PM_MASTER, address,
|
||||
R_MEMORY_ADDRESS);
|
||||
if (err)
|
||||
goto out;
|
||||
err = twl4030_i2c_write_u8(TWL4030_MODULE_PM_MASTER, byte,
|
||||
err = twl_i2c_write_u8(TWL4030_MODULE_PM_MASTER, byte,
|
||||
R_MEMORY_DATA);
|
||||
out:
|
||||
return err;
|
||||
|
|
@ -192,18 +192,18 @@ static int __init twl4030_config_wakeup3_sequence(u8 address)
|
|||
u8 data;
|
||||
|
||||
/* Set SLEEP to ACTIVE SEQ address for P3 */
|
||||
err = twl4030_i2c_write_u8(TWL4030_MODULE_PM_MASTER, address,
|
||||
err = twl_i2c_write_u8(TWL4030_MODULE_PM_MASTER, address,
|
||||
R_SEQ_ADD_S2A3);
|
||||
if (err)
|
||||
goto out;
|
||||
|
||||
/* P3 LVL_WAKEUP should be on LEVEL */
|
||||
err = twl4030_i2c_read_u8(TWL4030_MODULE_PM_MASTER, &data,
|
||||
err = twl_i2c_read_u8(TWL4030_MODULE_PM_MASTER, &data,
|
||||
R_P3_SW_EVENTS);
|
||||
if (err)
|
||||
goto out;
|
||||
data |= LVL_WAKEUP;
|
||||
err = twl4030_i2c_write_u8(TWL4030_MODULE_PM_MASTER, data,
|
||||
err = twl_i2c_write_u8(TWL4030_MODULE_PM_MASTER, data,
|
||||
R_P3_SW_EVENTS);
|
||||
out:
|
||||
if (err)
|
||||
|
|
@ -217,42 +217,42 @@ static int __init twl4030_config_wakeup12_sequence(u8 address)
|
|||
u8 data;
|
||||
|
||||
/* Set SLEEP to ACTIVE SEQ address for P1 and P2 */
|
||||
err = twl4030_i2c_write_u8(TWL4030_MODULE_PM_MASTER, address,
|
||||
err = twl_i2c_write_u8(TWL4030_MODULE_PM_MASTER, address,
|
||||
R_SEQ_ADD_S2A12);
|
||||
if (err)
|
||||
goto out;
|
||||
|
||||
/* P1/P2 LVL_WAKEUP should be on LEVEL */
|
||||
err = twl4030_i2c_read_u8(TWL4030_MODULE_PM_MASTER, &data,
|
||||
err = twl_i2c_read_u8(TWL4030_MODULE_PM_MASTER, &data,
|
||||
R_P1_SW_EVENTS);
|
||||
if (err)
|
||||
goto out;
|
||||
|
||||
data |= LVL_WAKEUP;
|
||||
err = twl4030_i2c_write_u8(TWL4030_MODULE_PM_MASTER, data,
|
||||
err = twl_i2c_write_u8(TWL4030_MODULE_PM_MASTER, data,
|
||||
R_P1_SW_EVENTS);
|
||||
if (err)
|
||||
goto out;
|
||||
|
||||
err = twl4030_i2c_read_u8(TWL4030_MODULE_PM_MASTER, &data,
|
||||
err = twl_i2c_read_u8(TWL4030_MODULE_PM_MASTER, &data,
|
||||
R_P2_SW_EVENTS);
|
||||
if (err)
|
||||
goto out;
|
||||
|
||||
data |= LVL_WAKEUP;
|
||||
err = twl4030_i2c_write_u8(TWL4030_MODULE_PM_MASTER, data,
|
||||
err = twl_i2c_write_u8(TWL4030_MODULE_PM_MASTER, data,
|
||||
R_P2_SW_EVENTS);
|
||||
if (err)
|
||||
goto out;
|
||||
|
||||
if (machine_is_omap_3430sdp() || machine_is_omap_ldp()) {
|
||||
/* Disabling AC charger effect on sleep-active transitions */
|
||||
err = twl4030_i2c_read_u8(TWL4030_MODULE_PM_MASTER, &data,
|
||||
err = twl_i2c_read_u8(TWL4030_MODULE_PM_MASTER, &data,
|
||||
R_CFG_P1_TRANSITION);
|
||||
if (err)
|
||||
goto out;
|
||||
data &= ~(1<<1);
|
||||
err = twl4030_i2c_write_u8(TWL4030_MODULE_PM_MASTER, data ,
|
||||
err = twl_i2c_write_u8(TWL4030_MODULE_PM_MASTER, data ,
|
||||
R_CFG_P1_TRANSITION);
|
||||
if (err)
|
||||
goto out;
|
||||
|
|
@ -270,7 +270,7 @@ static int __init twl4030_config_sleep_sequence(u8 address)
|
|||
int err;
|
||||
|
||||
/* Set ACTIVE to SLEEP SEQ address in T2 memory*/
|
||||
err = twl4030_i2c_write_u8(TWL4030_MODULE_PM_MASTER, address,
|
||||
err = twl_i2c_write_u8(TWL4030_MODULE_PM_MASTER, address,
|
||||
R_SEQ_ADD_A2S);
|
||||
|
||||
if (err)
|
||||
|
|
@ -285,41 +285,41 @@ static int __init twl4030_config_warmreset_sequence(u8 address)
|
|||
u8 rd_data;
|
||||
|
||||
/* Set WARM RESET SEQ address for P1 */
|
||||
err = twl4030_i2c_write_u8(TWL4030_MODULE_PM_MASTER, address,
|
||||
err = twl_i2c_write_u8(TWL4030_MODULE_PM_MASTER, address,
|
||||
R_SEQ_ADD_WARM);
|
||||
if (err)
|
||||
goto out;
|
||||
|
||||
/* P1/P2/P3 enable WARMRESET */
|
||||
err = twl4030_i2c_read_u8(TWL4030_MODULE_PM_MASTER, &rd_data,
|
||||
err = twl_i2c_read_u8(TWL4030_MODULE_PM_MASTER, &rd_data,
|
||||
R_P1_SW_EVENTS);
|
||||
if (err)
|
||||
goto out;
|
||||
|
||||
rd_data |= ENABLE_WARMRESET;
|
||||
err = twl4030_i2c_write_u8(TWL4030_MODULE_PM_MASTER, rd_data,
|
||||
err = twl_i2c_write_u8(TWL4030_MODULE_PM_MASTER, rd_data,
|
||||
R_P1_SW_EVENTS);
|
||||
if (err)
|
||||
goto out;
|
||||
|
||||
err = twl4030_i2c_read_u8(TWL4030_MODULE_PM_MASTER, &rd_data,
|
||||
err = twl_i2c_read_u8(TWL4030_MODULE_PM_MASTER, &rd_data,
|
||||
R_P2_SW_EVENTS);
|
||||
if (err)
|
||||
goto out;
|
||||
|
||||
rd_data |= ENABLE_WARMRESET;
|
||||
err = twl4030_i2c_write_u8(TWL4030_MODULE_PM_MASTER, rd_data,
|
||||
err = twl_i2c_write_u8(TWL4030_MODULE_PM_MASTER, rd_data,
|
||||
R_P2_SW_EVENTS);
|
||||
if (err)
|
||||
goto out;
|
||||
|
||||
err = twl4030_i2c_read_u8(TWL4030_MODULE_PM_MASTER, &rd_data,
|
||||
err = twl_i2c_read_u8(TWL4030_MODULE_PM_MASTER, &rd_data,
|
||||
R_P3_SW_EVENTS);
|
||||
if (err)
|
||||
goto out;
|
||||
|
||||
rd_data |= ENABLE_WARMRESET;
|
||||
err = twl4030_i2c_write_u8(TWL4030_MODULE_PM_MASTER, rd_data,
|
||||
err = twl_i2c_write_u8(TWL4030_MODULE_PM_MASTER, rd_data,
|
||||
R_P3_SW_EVENTS);
|
||||
out:
|
||||
if (err)
|
||||
|
|
@ -344,8 +344,8 @@ static int __init twl4030_configure_resource(struct twl4030_resconfig *rconfig)
|
|||
rconfig_addr = res_config_addrs[rconfig->resource];
|
||||
|
||||
/* Set resource group */
|
||||
err = twl4030_i2c_read_u8(TWL4030_MODULE_PM_RECEIVER, &grp,
|
||||
rconfig_addr + DEV_GRP_OFFSET);
|
||||
err = twl_i2c_read_u8(TWL4030_MODULE_PM_RECEIVER, &grp,
|
||||
rconfig_addr + DEV_GRP_OFFSET);
|
||||
if (err) {
|
||||
pr_err("TWL4030 Resource %d group could not be read\n",
|
||||
rconfig->resource);
|
||||
|
|
@ -355,8 +355,8 @@ static int __init twl4030_configure_resource(struct twl4030_resconfig *rconfig)
|
|||
if (rconfig->devgroup != TWL4030_RESCONFIG_UNDEF) {
|
||||
grp &= ~DEV_GRP_MASK;
|
||||
grp |= rconfig->devgroup << DEV_GRP_SHIFT;
|
||||
err = twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER,
|
||||
grp, rconfig_addr + DEV_GRP_OFFSET);
|
||||
err = twl_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER,
|
||||
grp, rconfig_addr + DEV_GRP_OFFSET);
|
||||
if (err < 0) {
|
||||
pr_err("TWL4030 failed to program devgroup\n");
|
||||
return err;
|
||||
|
|
@ -364,7 +364,7 @@ static int __init twl4030_configure_resource(struct twl4030_resconfig *rconfig)
|
|||
}
|
||||
|
||||
/* Set resource types */
|
||||
err = twl4030_i2c_read_u8(TWL4030_MODULE_PM_RECEIVER, &type,
|
||||
err = twl_i2c_read_u8(TWL4030_MODULE_PM_RECEIVER, &type,
|
||||
rconfig_addr + TYPE_OFFSET);
|
||||
if (err < 0) {
|
||||
pr_err("TWL4030 Resource %d type could not be read\n",
|
||||
|
|
@ -382,7 +382,7 @@ static int __init twl4030_configure_resource(struct twl4030_resconfig *rconfig)
|
|||
type |= rconfig->type2 << TYPE2_SHIFT;
|
||||
}
|
||||
|
||||
err = twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER,
|
||||
err = twl_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER,
|
||||
type, rconfig_addr + TYPE_OFFSET);
|
||||
if (err < 0) {
|
||||
pr_err("TWL4030 failed to program resource type\n");
|
||||
|
|
@ -390,8 +390,8 @@ static int __init twl4030_configure_resource(struct twl4030_resconfig *rconfig)
|
|||
}
|
||||
|
||||
/* Set remap states */
|
||||
err = twl4030_i2c_read_u8(TWL4030_MODULE_PM_RECEIVER, &remap,
|
||||
rconfig_addr + REMAP_OFFSET);
|
||||
err = twl_i2c_read_u8(TWL4030_MODULE_PM_RECEIVER, &remap,
|
||||
rconfig_addr + REMAP_OFFSET);
|
||||
if (err < 0) {
|
||||
pr_err("TWL4030 Resource %d remap could not be read\n",
|
||||
rconfig->resource);
|
||||
|
|
@ -408,9 +408,9 @@ static int __init twl4030_configure_resource(struct twl4030_resconfig *rconfig)
|
|||
remap |= rconfig->remap_off << SLEEP_STATE_SHIFT;
|
||||
}
|
||||
|
||||
err = twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER,
|
||||
remap,
|
||||
rconfig_addr + REMAP_OFFSET);
|
||||
err = twl_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER,
|
||||
remap,
|
||||
rconfig_addr + REMAP_OFFSET);
|
||||
if (err < 0) {
|
||||
pr_err("TWL4030 failed to program remap\n");
|
||||
return err;
|
||||
|
|
@ -468,12 +468,12 @@ void __init twl4030_power_init(struct twl4030_power_data *twl4030_scripts)
|
|||
struct twl4030_resconfig *resconfig;
|
||||
u8 address = twl4030_start_script_address;
|
||||
|
||||
err = twl4030_i2c_write_u8(TWL4030_MODULE_PM_MASTER, R_KEY_1,
|
||||
err = twl_i2c_write_u8(TWL4030_MODULE_PM_MASTER, R_KEY_1,
|
||||
R_PROTECT_KEY);
|
||||
if (err)
|
||||
goto unlock;
|
||||
|
||||
err = twl4030_i2c_write_u8(TWL4030_MODULE_PM_MASTER, R_KEY_2,
|
||||
err = twl_i2c_write_u8(TWL4030_MODULE_PM_MASTER, R_KEY_2,
|
||||
R_PROTECT_KEY);
|
||||
if (err)
|
||||
goto unlock;
|
||||
|
|
@ -496,7 +496,7 @@ void __init twl4030_power_init(struct twl4030_power_data *twl4030_scripts)
|
|||
}
|
||||
}
|
||||
|
||||
err = twl4030_i2c_write_u8(TWL4030_MODULE_PM_MASTER, 0, R_PROTECT_KEY);
|
||||
err = twl_i2c_write_u8(TWL4030_MODULE_PM_MASTER, 0, R_PROTECT_KEY);
|
||||
if (err)
|
||||
pr_err("TWL4030 Unable to relock registers\n");
|
||||
return;
|
||||
|
|
|
|||
Loading…
Reference in a new issue