mirror of
https://github.com/Fishwaldo/linux-bl808.git
synced 2025-06-17 20:25:19 +00:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6: (22 commits) regulator: Remove default DEBUG define from TPS6586x regulator: tps6507x - add missing platform_set_drvdata in tps6507x_pmic_probe regulator: tps6586x - add regulator_unregister() in tps6586x_regulator_remove() mfd: max8998 - fix incorrect kfree(i2c) in i2c_driver probe callback handler regulator: lp3971 - remove unnecessary ret value checking in lp3971_i2c_write() regulator: max8660 - fix a memory leak in max8660_remove() regulator: max1586 - fix a memory leak in max1586_pmic_remove() regulator: Default GPIO controlled WM8994 regulators to disabled regulator: lp3971 - remove unnecessary ret value checking in lp3971_i2c_write() max8998: fix off-by-one value range checking regulator: tps6586x: fix millivolt return values and SM2 table regulator: tps6586x: add dependancy on MFD_TPS6585x regulator: add TPS6586X regulator driver regulator: MAX8998: set_voltage bugfix. ramp_up delay and min/max voltage regulator: add support for regulators on the ab8500 MFD ab8500-mfd: add regulator support to ab8500 mfd device tps65023: Allow registering similar TPS65021 drivers: regulators: depend on MFD_MAX8998 drivers: regulator: add Maxim 8998 driver ISL6271A voltage regulator support. ...
This commit is contained in:
Linus Torvalds
commit
580287628c
21 changed files with 2431 additions and 22 deletions
|
|
@ -76,6 +76,8 @@
|
|||
#define AB8500_NR_IRQS 104
|
||||
#define AB8500_NUM_IRQ_REGS 13
|
||||
|
||||
#define AB8500_NUM_REGULATORS 15
|
||||
|
||||
/**
|
||||
* struct ab8500 - ab8500 internal structure
|
||||
* @dev: parent device
|
||||
|
|
@ -108,14 +110,18 @@ struct ab8500 {
|
|||
u8 oldmask[AB8500_NUM_IRQ_REGS];
|
||||
};
|
||||
|
||||
struct regulator_init_data;
|
||||
|
||||
/**
|
||||
* struct ab8500_platform_data - AB8500 platform data
|
||||
* @irq_base: start of AB8500 IRQs, AB8500_NR_IRQS will be used
|
||||
* @init: board-specific initialization after detection of ab8500
|
||||
* @regulator: machine-specific constraints for regulators
|
||||
*/
|
||||
struct ab8500_platform_data {
|
||||
int irq_base;
|
||||
void (*init) (struct ab8500 *);
|
||||
struct regulator_init_data *regulator[AB8500_NUM_REGULATORS];
|
||||
};
|
||||
|
||||
extern int ab8500_write(struct ab8500 *a8500, u16 addr, u8 data);
|
||||
|
|
|
|||
112
include/linux/mfd/max8998-private.h
Normal file
112
include/linux/mfd/max8998-private.h
Normal file
|
|
@ -0,0 +1,112 @@
|
|||
/*
|
||||
* max8698.h - Voltage regulator driver for the Maxim 8998
|
||||
*
|
||||
* Copyright (C) 2009-2010 Samsung Electrnoics
|
||||
* Kyungmin Park <kyungmin.park@samsung.com>
|
||||
* Marek Szyprowski <m.szyprowski@samsung.com>
|
||||
*
|
||||
* 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*/
|
||||
|
||||
#ifndef __LINUX_MFD_MAX8998_PRIV_H
|
||||
#define __LINUX_MFD_MAX8998_PRIV_H
|
||||
|
||||
/* MAX 8998 registers */
|
||||
enum {
|
||||
MAX8998_REG_IRQ1,
|
||||
MAX8998_REG_IRQ2,
|
||||
MAX8998_REG_IRQ3,
|
||||
MAX8998_REG_IRQ4,
|
||||
MAX8998_REG_IRQM1,
|
||||
MAX8998_REG_IRQM2,
|
||||
MAX8998_REG_IRQM3,
|
||||
MAX8998_REG_IRQM4,
|
||||
MAX8998_REG_STATUS1,
|
||||
MAX8998_REG_STATUS2,
|
||||
MAX8998_REG_STATUSM1,
|
||||
MAX8998_REG_STATUSM2,
|
||||
MAX8998_REG_CHGR1,
|
||||
MAX8998_REG_CHGR2,
|
||||
MAX8998_REG_LDO_ACTIVE_DISCHARGE1,
|
||||
MAX8998_REG_LDO_ACTIVE_DISCHARGE2,
|
||||
MAX8998_REG_BUCK_ACTIVE_DISCHARGE3,
|
||||
MAX8998_REG_ONOFF1,
|
||||
MAX8998_REG_ONOFF2,
|
||||
MAX8998_REG_ONOFF3,
|
||||
MAX8998_REG_ONOFF4,
|
||||
MAX8998_REG_BUCK1_DVSARM1,
|
||||
MAX8998_REG_BUCK1_DVSARM2,
|
||||
MAX8998_REG_BUCK1_DVSARM3,
|
||||
MAX8998_REG_BUCK1_DVSARM4,
|
||||
MAX8998_REG_BUCK2_DVSINT1,
|
||||
MAX8998_REG_BUCK2_DVSINT2,
|
||||
MAX8998_REG_BUCK3,
|
||||
MAX8998_REG_BUCK4,
|
||||
MAX8998_REG_LDO2_LDO3,
|
||||
MAX8998_REG_LDO4,
|
||||
MAX8998_REG_LDO5,
|
||||
MAX8998_REG_LDO6,
|
||||
MAX8998_REG_LDO7,
|
||||
MAX8998_REG_LDO8_LDO9,
|
||||
MAX8998_REG_LDO10_LDO11,
|
||||
MAX8998_REG_LDO12,
|
||||
MAX8998_REG_LDO13,
|
||||
MAX8998_REG_LDO14,
|
||||
MAX8998_REG_LDO15,
|
||||
MAX8998_REG_LDO16,
|
||||
MAX8998_REG_LDO17,
|
||||
MAX8998_REG_BKCHR,
|
||||
MAX8998_REG_LBCNFG1,
|
||||
MAX8998_REG_LBCNFG2,
|
||||
};
|
||||
|
||||
/**
|
||||
* struct max8998_dev - max8998 master device for sub-drivers
|
||||
* @dev: master device of the chip (can be used to access platform data)
|
||||
* @i2c_client: i2c client private data
|
||||
* @dev_read(): chip register read function
|
||||
* @dev_write(): chip register write function
|
||||
* @dev_update(): chip register update function
|
||||
* @iolock: mutex for serializing io access
|
||||
*/
|
||||
|
||||
struct max8998_dev {
|
||||
struct device *dev;
|
||||
struct i2c_client *i2c_client;
|
||||
int (*dev_read)(struct max8998_dev *max8998, u8 reg, u8 *dest);
|
||||
int (*dev_write)(struct max8998_dev *max8998, u8 reg, u8 val);
|
||||
int (*dev_update)(struct max8998_dev *max8998, u8 reg, u8 val, u8 mask);
|
||||
struct mutex iolock;
|
||||
};
|
||||
|
||||
static inline int max8998_read_reg(struct max8998_dev *max8998, u8 reg,
|
||||
u8 *value)
|
||||
{
|
||||
return max8998->dev_read(max8998, reg, value);
|
||||
}
|
||||
|
||||
static inline int max8998_write_reg(struct max8998_dev *max8998, u8 reg,
|
||||
u8 value)
|
||||
{
|
||||
return max8998->dev_write(max8998, reg, value);
|
||||
}
|
||||
|
||||
static inline int max8998_update_reg(struct max8998_dev *max8998, u8 reg,
|
||||
u8 value, u8 mask)
|
||||
{
|
||||
return max8998->dev_update(max8998, reg, value, mask);
|
||||
}
|
||||
|
||||
#endif /* __LINUX_MFD_MAX8998_PRIV_H */
|
||||
78
include/linux/mfd/max8998.h
Normal file
78
include/linux/mfd/max8998.h
Normal file
|
|
@ -0,0 +1,78 @@
|
|||
/*
|
||||
* max8698.h - Voltage regulator driver for the Maxim 8998
|
||||
*
|
||||
* Copyright (C) 2009-2010 Samsung Electrnoics
|
||||
* Kyungmin Park <kyungmin.park@samsung.com>
|
||||
* Marek Szyprowski <m.szyprowski@samsung.com>
|
||||
*
|
||||
* 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*/
|
||||
|
||||
#ifndef __LINUX_MFD_MAX8998_H
|
||||
#define __LINUX_MFD_MAX8998_H
|
||||
|
||||
#include <linux/regulator/machine.h>
|
||||
|
||||
/* MAX 8998 regulator ids */
|
||||
enum {
|
||||
MAX8998_LDO2 = 2,
|
||||
MAX8998_LDO3,
|
||||
MAX8998_LDO4,
|
||||
MAX8998_LDO5,
|
||||
MAX8998_LDO6,
|
||||
MAX8998_LDO7,
|
||||
MAX8998_LDO8,
|
||||
MAX8998_LDO9,
|
||||
MAX8998_LDO10,
|
||||
MAX8998_LDO11,
|
||||
MAX8998_LDO12,
|
||||
MAX8998_LDO13,
|
||||
MAX8998_LDO14,
|
||||
MAX8998_LDO15,
|
||||
MAX8998_LDO16,
|
||||
MAX8998_LDO17,
|
||||
MAX8998_BUCK1,
|
||||
MAX8998_BUCK2,
|
||||
MAX8998_BUCK3,
|
||||
MAX8998_BUCK4,
|
||||
MAX8998_EN32KHZ_AP,
|
||||
MAX8998_EN32KHZ_CP,
|
||||
MAX8998_ENVICHG,
|
||||
MAX8998_ESAFEOUT1,
|
||||
MAX8998_ESAFEOUT2,
|
||||
};
|
||||
|
||||
/**
|
||||
* max8998_regulator_data - regulator data
|
||||
* @id: regulator id
|
||||
* @initdata: regulator init data (contraints, supplies, ...)
|
||||
*/
|
||||
struct max8998_regulator_data {
|
||||
int id;
|
||||
struct regulator_init_data *initdata;
|
||||
};
|
||||
|
||||
/**
|
||||
* struct max8998_board - packages regulator init data
|
||||
* @num_regulators: number of regultors used
|
||||
* @regulators: array of defined regulators
|
||||
*/
|
||||
|
||||
struct max8998_platform_data {
|
||||
int num_regulators;
|
||||
struct max8998_regulator_data *regulators;
|
||||
};
|
||||
|
||||
#endif /* __LINUX_MFD_MAX8998_H */
|
||||
Loading…
Add table
Add a link
Reference in a new issue