Skip to content

L
linux
Commit bc1aadc1 authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Mark Brown
Browse files
Options

drivers: max77843: Switch to common max77693 state container 

Switch to the same definition of state container as in MAX77693 drivers.
This will allow usage of one regulator driver in both devices: MAX77693
and MAX77843.
Signed-off-by: default avatarKrzysztof Kozlowski <k.kozlowski.k@gmail.com>
Acked-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
Acked-by: default avatarLee Jones <lee.jones@linaro.org>
Acked-by: default avatarChanwoo Choi <cw00.choi@samsung.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 61b305cd
Show whitespace changes
Inline Side-by-side
Showing with 31 additions and 40 deletions
drivers/extcon/extcon-max77843.c
View file @ bc1aadc1
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/mfd/max77693-common.h>
#include <linux/mfd/max77843-private.h> #include <linux/mfd/max77843-private.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
...@@ -32,7 +33,7 @@ enum max77843_muic_status { ...@@ -32,7 +33,7 @@ enum max77843_muic_status {
struct max77843_muic_info { struct max77843_muic_info {
struct device *dev; struct device *dev;
struct max77843 *max77843; struct max77693_dev *max77843;
struct extcon_dev *edev; struct extcon_dev *edev;
struct mutex mutex; struct mutex mutex;
...@@ -198,7 +199,7 @@ static const struct regmap_irq_chip max77843_muic_irq_chip = { ...@@ -198,7 +199,7 @@ static const struct regmap_irq_chip max77843_muic_irq_chip = {
static int max77843_muic_set_path(struct max77843_muic_info *info, static int max77843_muic_set_path(struct max77843_muic_info *info,
u8 val, bool attached) u8 val, bool attached)
{ {
struct max77843 *max77843 = info->max77843; struct max77693_dev *max77843 = info->max77843;
int ret = 0; int ret = 0;
unsigned int ctrl1, ctrl2; unsigned int ctrl1, ctrl2;
...@@ -539,7 +540,7 @@ static void max77843_muic_irq_work(struct work_struct *work) ...@@ -539,7 +540,7 @@ static void max77843_muic_irq_work(struct work_struct *work)
{ {
struct max77843_muic_info *info = container_of(work, struct max77843_muic_info *info = container_of(work,
struct max77843_muic_info, irq_work); struct max77843_muic_info, irq_work);
struct max77843 *max77843 = info->max77843; struct max77693_dev *max77843 = info->max77843;
int ret = 0; int ret = 0;
mutex_lock(&info->mutex); mutex_lock(&info->mutex);
...@@ -615,7 +616,7 @@ static void max77843_muic_detect_cable_wq(struct work_struct *work) ...@@ -615,7 +616,7 @@ static void max77843_muic_detect_cable_wq(struct work_struct *work)
{ {
struct max77843_muic_info *info = container_of(to_delayed_work(work), struct max77843_muic_info *info = container_of(to_delayed_work(work),
struct max77843_muic_info, wq_detcable); struct max77843_muic_info, wq_detcable);
struct max77843 *max77843 = info->max77843; struct max77693_dev *max77843 = info->max77843;
int chg_type, adc, ret; int chg_type, adc, ret;
bool attached; bool attached;
...@@ -656,7 +657,7 @@ static void max77843_muic_detect_cable_wq(struct work_struct *work) ...@@ -656,7 +657,7 @@ static void max77843_muic_detect_cable_wq(struct work_struct *work)
static int max77843_muic_set_debounce_time(struct max77843_muic_info *info, static int max77843_muic_set_debounce_time(struct max77843_muic_info *info,
enum max77843_muic_adc_debounce_time time) enum max77843_muic_adc_debounce_time time)
{ {
struct max77843 *max77843 = info->max77843; struct max77693_dev *max77843 = info->max77843;
int ret; int ret;
switch (time) { switch (time) {
...@@ -681,7 +682,7 @@ static int max77843_muic_set_debounce_time(struct max77843_muic_info *info, ...@@ -681,7 +682,7 @@ static int max77843_muic_set_debounce_time(struct max77843_muic_info *info,
return 0; return 0;
} }
static int max77843_init_muic_regmap(struct max77843 *max77843) static int max77843_init_muic_regmap(struct max77693_dev *max77843)
{ {
int ret; int ret;
...@@ -720,7 +721,7 @@ static int max77843_init_muic_regmap(struct max77843 *max77843) ...@@ -720,7 +721,7 @@ static int max77843_init_muic_regmap(struct max77843 *max77843)
static int max77843_muic_probe(struct platform_device *pdev) static int max77843_muic_probe(struct platform_device *pdev)
{ {
struct max77843 *max77843 = dev_get_drvdata(pdev->dev.parent); struct max77693_dev *max77843 = dev_get_drvdata(pdev->dev.parent);
struct max77843_muic_info *info; struct max77843_muic_info *info;
unsigned int id; unsigned int id;
int i, ret; int i, ret;
...@@ -821,7 +822,7 @@ static int max77843_muic_probe(struct platform_device *pdev) ...@@ -821,7 +822,7 @@ static int max77843_muic_probe(struct platform_device *pdev)
static int max77843_muic_remove(struct platform_device *pdev) static int max77843_muic_remove(struct platform_device *pdev)
{ {
struct max77843_muic_info *info = platform_get_drvdata(pdev); struct max77843_muic_info *info = platform_get_drvdata(pdev);
struct max77843 *max77843 = info->max77843; struct max77693_dev *max77843 = info->max77843;
cancel_work_sync(&info->irq_work); cancel_work_sync(&info->irq_work);
regmap_del_irq_chip(max77843->irq, max77843->irq_data_muic); regmap_del_irq_chip(max77843->irq, max77843->irq_data_muic);
......
drivers/input/misc/max77843-haptic.c
View file @ bc1aadc1
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/input.h> #include <linux/input.h>
#include <linux/mfd/max77693-common.h>
#include <linux/mfd/max77843-private.h> #include <linux/mfd/max77843-private.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
...@@ -243,7 +244,7 @@ static void max77843_haptic_close(struct input_dev *dev) ...@@ -243,7 +244,7 @@ static void max77843_haptic_close(struct input_dev *dev)
static int max77843_haptic_probe(struct platform_device *pdev) static int max77843_haptic_probe(struct platform_device *pdev)
{ {
struct max77843 *max77843 = dev_get_drvdata(pdev->dev.parent); struct max77693_dev *max77843 = dev_get_drvdata(pdev->dev.parent);
struct max77843_haptic *haptic; struct max77843_haptic *haptic;
int error; int error;
......
drivers/mfd/max77843.c
View file @ bc1aadc1
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/mfd/core.h> #include <linux/mfd/core.h>
#include <linux/mfd/max77693-common.h>
#include <linux/mfd/max77843-private.h> #include <linux/mfd/max77843-private.h>
#include <linux/of_device.h> #include <linux/of_device.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
...@@ -71,7 +72,7 @@ static const struct regmap_irq_chip max77843_irq_chip = { ...@@ -71,7 +72,7 @@ static const struct regmap_irq_chip max77843_irq_chip = {
}; };
/* Charger and Charger regulator use same regmap. */ /* Charger and Charger regulator use same regmap. */
static int max77843_chg_init(struct max77843 *max77843) static int max77843_chg_init(struct max77693_dev *max77843)
{ {
int ret; int ret;
...@@ -101,7 +102,7 @@ static int max77843_chg_init(struct max77843 *max77843) ...@@ -101,7 +102,7 @@ static int max77843_chg_init(struct max77843 *max77843)
static int max77843_probe(struct i2c_client *i2c, static int max77843_probe(struct i2c_client *i2c,
const struct i2c_device_id *id) const struct i2c_device_id *id)
{ {
struct max77843 *max77843; struct max77693_dev *max77843;
unsigned int reg_data; unsigned int reg_data;
int ret; int ret;
...@@ -113,6 +114,7 @@ static int max77843_probe(struct i2c_client *i2c, ...@@ -113,6 +114,7 @@ static int max77843_probe(struct i2c_client *i2c,
max77843->dev = &i2c->dev; max77843->dev = &i2c->dev;
max77843->i2c = i2c; max77843->i2c = i2c;
max77843->irq = i2c->irq; max77843->irq = i2c->irq;
max77843->type = id->driver_data;
max77843->regmap = devm_regmap_init_i2c(i2c, max77843->regmap = devm_regmap_init_i2c(i2c,
&max77843_regmap_config); &max77843_regmap_config);
...@@ -123,7 +125,7 @@ static int max77843_probe(struct i2c_client *i2c, ...@@ -123,7 +125,7 @@ static int max77843_probe(struct i2c_client *i2c,
ret = regmap_add_irq_chip(max77843->regmap, max77843->irq, ret = regmap_add_irq_chip(max77843->regmap, max77843->irq,
IRQF_TRIGGER_LOW | IRQF_ONESHOT | IRQF_SHARED, IRQF_TRIGGER_LOW | IRQF_ONESHOT | IRQF_SHARED,
0, &max77843_irq_chip, &max77843->irq_data); 0, &max77843_irq_chip, &max77843->irq_data_topsys);
if (ret) { if (ret) {
dev_err(&i2c->dev, "Failed to add TOPSYS IRQ chip\n"); dev_err(&i2c->dev, "Failed to add TOPSYS IRQ chip\n");
return ret; return ret;
...@@ -164,18 +166,18 @@ static int max77843_probe(struct i2c_client *i2c, ...@@ -164,18 +166,18 @@ static int max77843_probe(struct i2c_client *i2c,
return 0; return 0;
err_pmic_id: err_pmic_id:
regmap_del_irq_chip(max77843->irq, max77843->irq_data); regmap_del_irq_chip(max77843->irq, max77843->irq_data_topsys);
return ret; return ret;
} }
static int max77843_remove(struct i2c_client *i2c) static int max77843_remove(struct i2c_client *i2c)
{ {
struct max77843 *max77843 = i2c_get_clientdata(i2c); struct max77693_dev *max77843 = i2c_get_clientdata(i2c);
mfd_remove_devices(max77843->dev); mfd_remove_devices(max77843->dev);
regmap_del_irq_chip(max77843->irq, max77843->irq_data); regmap_del_irq_chip(max77843->irq, max77843->irq_data_topsys);
i2c_unregister_device(max77843->i2c_chg); i2c_unregister_device(max77843->i2c_chg);
...@@ -188,7 +190,7 @@ static const struct of_device_id max77843_dt_match[] = { ...@@ -188,7 +190,7 @@ static const struct of_device_id max77843_dt_match[] = {
}; };
static const struct i2c_device_id max77843_id[] = { static const struct i2c_device_id max77843_id[] = {
{ "max77843", }, { "max77843", TYPE_MAX77843, },
{ }, { },
}; };
MODULE_DEVICE_TABLE(i2c, max77843_id); MODULE_DEVICE_TABLE(i2c, max77843_id);
...@@ -196,7 +198,7 @@ MODULE_DEVICE_TABLE(i2c, max77843_id); ...@@ -196,7 +198,7 @@ MODULE_DEVICE_TABLE(i2c, max77843_id);
static int __maybe_unused max77843_suspend(struct device *dev) static int __maybe_unused max77843_suspend(struct device *dev)
{ {
struct i2c_client *i2c = container_of(dev, struct i2c_client, dev); struct i2c_client *i2c = container_of(dev, struct i2c_client, dev);
struct max77843 *max77843 = i2c_get_clientdata(i2c); struct max77693_dev *max77843 = i2c_get_clientdata(i2c);
disable_irq(max77843->irq); disable_irq(max77843->irq);
if (device_may_wakeup(dev)) if (device_may_wakeup(dev))
...@@ -208,7 +210,7 @@ static int __maybe_unused max77843_suspend(struct device *dev) ...@@ -208,7 +210,7 @@ static int __maybe_unused max77843_suspend(struct device *dev)
static int __maybe_unused max77843_resume(struct device *dev) static int __maybe_unused max77843_resume(struct device *dev)
{ {
struct i2c_client *i2c = container_of(dev, struct i2c_client, dev); struct i2c_client *i2c = container_of(dev, struct i2c_client, dev);
struct max77843 *max77843 = i2c_get_clientdata(i2c); struct max77693_dev *max77843 = i2c_get_clientdata(i2c);
if (device_may_wakeup(dev)) if (device_may_wakeup(dev))
disable_irq_wake(max77843->irq); disable_irq_wake(max77843->irq);
......
drivers/regulator/max77843.c
View file @ bc1aadc1
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/regulator/driver.h> #include <linux/regulator/driver.h>
#include <linux/regulator/machine.h> #include <linux/regulator/machine.h>
#include <linux/mfd/max77693-common.h>
#include <linux/mfd/max77843-private.h> #include <linux/mfd/max77843-private.h>
#include <linux/regulator/of_regulator.h> #include <linux/regulator/of_regulator.h>
...@@ -130,7 +131,8 @@ static const struct regulator_desc max77843_supported_regulators[] = { ...@@ -130,7 +131,8 @@ static const struct regulator_desc max77843_supported_regulators[] = {
}, },
}; };
static struct regmap *max77843_get_regmap(struct max77843 *max77843, int reg_id) static struct regmap *max77843_get_regmap(struct max77693_dev *max77843,
int reg_id)
{ {
switch (reg_id) { switch (reg_id) {
case MAX77843_SAFEOUT1: case MAX77843_SAFEOUT1:
...@@ -145,7 +147,7 @@ static struct regmap *max77843_get_regmap(struct max77843 *max77843, int reg_id) ...@@ -145,7 +147,7 @@ static struct regmap *max77843_get_regmap(struct max77843 *max77843, int reg_id)
static int max77843_regulator_probe(struct platform_device *pdev) static int max77843_regulator_probe(struct platform_device *pdev)
{ {
struct max77843 *max77843 = dev_get_drvdata(pdev->dev.parent); struct max77693_dev *max77843 = dev_get_drvdata(pdev->dev.parent);
struct regulator_config config = {}; struct regulator_config config = {};
int i; int i;
......
include/linux/mfd/max77693-common.h
View file @ bc1aadc1
...@@ -15,6 +15,9 @@ ...@@ -15,6 +15,9 @@
enum max77693_types { enum max77693_types {
TYPE_MAX77693_UNKNOWN, TYPE_MAX77693_UNKNOWN,
TYPE_MAX77693, TYPE_MAX77693,
TYPE_MAX77843,
TYPE_MAX77693_NUM,
}; };
/* /*
...@@ -25,12 +28,14 @@ struct max77693_dev { ...@@ -25,12 +28,14 @@ struct max77693_dev {
struct i2c_client *i2c; /* 0xCC , PMIC, Charger, Flash LED */ struct i2c_client *i2c; /* 0xCC , PMIC, Charger, Flash LED */
struct i2c_client *i2c_muic; /* 0x4A , MUIC */ struct i2c_client *i2c_muic; /* 0x4A , MUIC */
struct i2c_client *i2c_haptic; /* MAX77693: 0x90 , Haptic */ struct i2c_client *i2c_haptic; /* MAX77693: 0x90 , Haptic */
struct i2c_client *i2c_chg; /* MAX77843: 0xD2, Charger */
enum max77693_types type; enum max77693_types type;
struct regmap *regmap; struct regmap *regmap;
struct regmap *regmap_muic; struct regmap *regmap_muic;
struct regmap *regmap_haptic; /* Only MAX77693 */ struct regmap *regmap_haptic; /* Only MAX77693 */
struct regmap *regmap_chg; /* Only MAX77843 */
struct regmap_irq_chip_data *irq_data_led; struct regmap_irq_chip_data *irq_data_led;
struct regmap_irq_chip_data *irq_data_topsys; struct regmap_irq_chip_data *irq_data_topsys;
......
include/linux/mfd/max77843-private.h
View file @ bc1aadc1
...@@ -431,24 +431,4 @@ enum max77843_irq_muic { ...@@ -431,24 +431,4 @@ enum max77843_irq_muic {
#define MAX77843_REG_SAFEOUTCTRL_SAFEOUT2_MASK \ #define MAX77843_REG_SAFEOUTCTRL_SAFEOUT2_MASK \
(0x3 << SAFEOUTCTRL_SAFEOUT2_SHIFT) (0x3 << SAFEOUTCTRL_SAFEOUT2_SHIFT)
struct max77843 {
struct device *dev;
struct i2c_client *i2c;
struct i2c_client *i2c_chg;
struct i2c_client *i2c_fuel;
struct i2c_client *i2c_muic;
struct regmap *regmap;
struct regmap *regmap_chg;
struct regmap *regmap_fuel;
struct regmap *regmap_muic;
struct regmap_irq_chip_data *irq_data;
struct regmap_irq_chip_data *irq_data_chg;
struct regmap_irq_chip_data *irq_data_fuel;
struct regmap_irq_chip_data *irq_data_muic;
int irq;
};
#endif /* __MAX77843_H__ */ #endif /* __MAX77843_H__ */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7