Re: [PATCH 09/18] mfd: max14577: Add "muic" suffix to regmap and irq_chip
On 01/28/2014 09:18 PM, Krzysztof Kozlowski wrote: > This patch continues the preparation for adding support for max77836 > device to existing max14577 driver. > > Add "muic" suffix to regmap and irq_data fields in maxim_core state > container to prepare for max77836 support. > This is only a rename-like patch, new code is not added. > > Signed-off-by: Krzysztof Kozlowski > Cc: Kyungmin Park > Cc: Marek Szyprowski > --- > drivers/extcon/extcon-max14577.c | 17 + > drivers/mfd/max14577.c | 22 +++--- > drivers/power/max14577_charger.c |8 > drivers/regulator/max14577.c |2 +- > include/linux/mfd/max14577-private.h |4 ++-- > 5 files changed, 27 insertions(+), 26 deletions(-) > For extcon: Acked-by: Chanwoo Choi For mfd/regulator/charger/extcon of max14577 Tested-by: Chanwoo Choi Thanks, Chanwoo Choi -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH 09/18] mfd: max14577: Add "muic" suffix to regmap and irq_chip
+Cc: Chanwoo, Mark and Dmitry for ACK-s on their subsystems. Krzysztof Kozlowski On Mon, 2014-02-03 at 09:45 +, Lee Jones wrote: > > This patch continues the preparation for adding support for max77836 > > device to existing max14577 driver. > > > > Add "muic" suffix to regmap and irq_data fields in maxim_core state > > container to prepare for max77836 support. > > This is only a rename-like patch, new code is not added. > > > > Signed-off-by: Krzysztof Kozlowski > > Cc: Kyungmin Park > > Cc: Marek Szyprowski > > --- > > drivers/extcon/extcon-max14577.c | 17 + > > drivers/mfd/max14577.c | 22 +++--- > > drivers/power/max14577_charger.c |8 > > drivers/regulator/max14577.c |2 +- > > include/linux/mfd/max14577-private.h |4 ++-- > > 5 files changed, 27 insertions(+), 26 deletions(-) > > Happy to apply this with maintainer Acks. > Acked-by: Lee Jones > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH 09/18] mfd: max14577: Add muic suffix to regmap and irq_chip
+Cc: Chanwoo, Mark and Dmitry for ACK-s on their subsystems. Krzysztof Kozlowski On Mon, 2014-02-03 at 09:45 +, Lee Jones wrote: This patch continues the preparation for adding support for max77836 device to existing max14577 driver. Add muic suffix to regmap and irq_data fields in maxim_core state container to prepare for max77836 support. This is only a rename-like patch, new code is not added. Signed-off-by: Krzysztof Kozlowski k.kozlow...@samsung.com Cc: Kyungmin Park kyungmin.p...@samsung.com Cc: Marek Szyprowski m.szyprow...@samsung.com --- drivers/extcon/extcon-max14577.c | 17 + drivers/mfd/max14577.c | 22 +++--- drivers/power/max14577_charger.c |8 drivers/regulator/max14577.c |2 +- include/linux/mfd/max14577-private.h |4 ++-- 5 files changed, 27 insertions(+), 26 deletions(-) Happy to apply this with maintainer Acks. Acked-by: Lee Jones lee.jo...@linaro.org -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH 09/18] mfd: max14577: Add muic suffix to regmap and irq_chip
On 01/28/2014 09:18 PM, Krzysztof Kozlowski wrote: This patch continues the preparation for adding support for max77836 device to existing max14577 driver. Add muic suffix to regmap and irq_data fields in maxim_core state container to prepare for max77836 support. This is only a rename-like patch, new code is not added. Signed-off-by: Krzysztof Kozlowski k.kozlow...@samsung.com Cc: Kyungmin Park kyungmin.p...@samsung.com Cc: Marek Szyprowski m.szyprow...@samsung.com --- drivers/extcon/extcon-max14577.c | 17 + drivers/mfd/max14577.c | 22 +++--- drivers/power/max14577_charger.c |8 drivers/regulator/max14577.c |2 +- include/linux/mfd/max14577-private.h |4 ++-- 5 files changed, 27 insertions(+), 26 deletions(-) For extcon: Acked-by: Chanwoo Choi cw00.c...@samsung.com For mfd/regulator/charger/extcon of max14577 Tested-by: Chanwoo Choi cw00.c...@samsung.com Thanks, Chanwoo Choi -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH 09/18] mfd: max14577: Add "muic" suffix to regmap and irq_chip
> This patch continues the preparation for adding support for max77836 > device to existing max14577 driver. > > Add "muic" suffix to regmap and irq_data fields in maxim_core state > container to prepare for max77836 support. > This is only a rename-like patch, new code is not added. > > Signed-off-by: Krzysztof Kozlowski > Cc: Kyungmin Park > Cc: Marek Szyprowski > --- > drivers/extcon/extcon-max14577.c | 17 + > drivers/mfd/max14577.c | 22 +++--- > drivers/power/max14577_charger.c |8 > drivers/regulator/max14577.c |2 +- > include/linux/mfd/max14577-private.h |4 ++-- > 5 files changed, 27 insertions(+), 26 deletions(-) Happy to apply this with maintainer Acks. Acked-by: Lee Jones -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH 09/18] mfd: max14577: Add muic suffix to regmap and irq_chip
This patch continues the preparation for adding support for max77836 device to existing max14577 driver. Add muic suffix to regmap and irq_data fields in maxim_core state container to prepare for max77836 support. This is only a rename-like patch, new code is not added. Signed-off-by: Krzysztof Kozlowski k.kozlow...@samsung.com Cc: Kyungmin Park kyungmin.p...@samsung.com Cc: Marek Szyprowski m.szyprow...@samsung.com --- drivers/extcon/extcon-max14577.c | 17 + drivers/mfd/max14577.c | 22 +++--- drivers/power/max14577_charger.c |8 drivers/regulator/max14577.c |2 +- include/linux/mfd/max14577-private.h |4 ++-- 5 files changed, 27 insertions(+), 26 deletions(-) Happy to apply this with maintainer Acks. Acked-by: Lee Jones lee.jo...@linaro.org -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH 09/18] mfd: max14577: Add "muic" suffix to regmap and irq_chip
This patch continues the preparation for adding support for max77836
device to existing max14577 driver.
Add "muic" suffix to regmap and irq_data fields in maxim_core state
container to prepare for max77836 support.
This is only a rename-like patch, new code is not added.
Signed-off-by: Krzysztof Kozlowski
Cc: Kyungmin Park
Cc: Marek Szyprowski
---
drivers/extcon/extcon-max14577.c | 17 +
drivers/mfd/max14577.c | 22 +++---
drivers/power/max14577_charger.c |8
drivers/regulator/max14577.c |2 +-
include/linux/mfd/max14577-private.h |4 ++--
5 files changed, 27 insertions(+), 26 deletions(-)
diff --git a/drivers/extcon/extcon-max14577.c b/drivers/extcon/extcon-max14577.c
index 2879cc5844dc..fd48b4909470 100644
--- a/drivers/extcon/extcon-max14577.c
+++ b/drivers/extcon/extcon-max14577.c
@@ -176,7 +176,7 @@ static int max14577_muic_set_debounce_time(struct
max14577_muic_info *info,
case ADC_DEBOUNCE_TIME_10MS:
case ADC_DEBOUNCE_TIME_25MS:
case ADC_DEBOUNCE_TIME_38_62MS:
- ret = max14577_update_reg(info->maxim_core->regmap,
+ ret = max14577_update_reg(info->maxim_core->regmap_muic,
MAXIM_MUIC_REG_CONTROL3,
MAXIM_CONTROL3_ADCDBSET_MASK,
time << MAXIM_CONTROL3_ADCDBSET_SHIFT);
@@ -210,7 +210,7 @@ static int max14577_muic_set_path(struct max14577_muic_info
*info,
u8 ctrl1, ctrl2 = 0;
/* Set open state to path before changing hw path */
- ret = max14577_update_reg(info->maxim_core->regmap,
+ ret = max14577_update_reg(info->maxim_core->regmap_muic,
MAXIM_MUIC_REG_CONTROL1,
MAXIM_CONTROL1_CLEAR_IDBEN_MICEN_MASK,
MAXIM_CONTROL1_SW_OPEN);
@@ -224,7 +224,7 @@ static int max14577_muic_set_path(struct max14577_muic_info
*info,
else
ctrl1 = MAXIM_CONTROL1_SW_OPEN;
- ret = max14577_update_reg(info->maxim_core->regmap,
+ ret = max14577_update_reg(info->maxim_core->regmap_muic,
MAXIM_MUIC_REG_CONTROL1,
MAXIM_CONTROL1_CLEAR_IDBEN_MICEN_MASK, ctrl1);
if (ret < 0) {
@@ -237,7 +237,7 @@ static int max14577_muic_set_path(struct max14577_muic_info
*info,
else
ctrl2 |= MAXIM_CONTROL2_LOWPWR_MASK;/* LowPwr=1, CPEn=0 */
- ret = max14577_update_reg(info->maxim_core->regmap,
+ ret = max14577_update_reg(info->maxim_core->regmap_muic,
MAXIM_MUIC_REG_CONTROL2,
MAXIM_CONTROL2_LOWPWR_MASK | MAXIM_CONTROL2_CPEN_MASK,
ctrl2);
@@ -505,7 +505,7 @@ static void max14577_muic_irq_work(struct work_struct *work)
mutex_lock(>mutex);
- ret = max14577_bulk_read(info->maxim_core->regmap,
+ ret = max14577_bulk_read(info->maxim_core->regmap_muic,
MAXIM_MUIC_REG_STATUS1, info->status, 2);
if (ret) {
dev_err(info->dev, "failed to read MUIC register\n");
@@ -581,7 +581,7 @@ static int max14577_muic_detect_accessory(struct
max14577_muic_info *info)
mutex_lock(>mutex);
/* Read STATUSx register to detect accessory */
- ret = max14577_bulk_read(info->maxim_core->regmap,
+ ret = max14577_bulk_read(info->maxim_core->regmap_muic,
MAXIM_MUIC_REG_STATUS1, info->status, 2);
if (ret) {
dev_err(info->dev, "failed to read MUIC register\n");
@@ -651,7 +651,8 @@ static int max14577_muic_probe(struct platform_device *pdev)
struct max14577_muic_irq *muic_irq = _irqs[i];
unsigned int virq = 0;
- virq = regmap_irq_get_virq(maxim_core->irq_data, muic_irq->irq);
+ virq = regmap_irq_get_virq(maxim_core->irq_data_muic,
+ muic_irq->irq);
if (!virq)
return -EINVAL;
muic_irq->virq = virq;
@@ -693,7 +694,7 @@ static int max14577_muic_probe(struct platform_device *pdev)
max14577_muic_set_path(info, info->path_uart, true);
/* Check revision number of MUIC device*/
- ret = max14577_read_reg(info->maxim_core->regmap,
+ ret = max14577_read_reg(info->maxim_core->regmap_muic,
MAXIM_MUIC_REG_DEVICEID, );
if (ret < 0) {
dev_err(>dev, "failed to read revision number\n");
diff --git a/drivers/mfd/max14577.c b/drivers/mfd/max14577.c
index f160e582712d..1d8104213b3e 100644
--- a/drivers/mfd/max14577.c
+++ b/drivers/mfd/max14577.c
@@ -112,17 +112,17 @@ static int max14577_i2c_probe(struct i2c_client *i2c,
maxim_core->i2c = i2c;
maxim_core->irq = i2c->irq;
- maxim_core->regmap = devm_regmap_init_i2c(i2c,
- _muic_regmap_config);
-
[PATCH 09/18] mfd: max14577: Add muic suffix to regmap and irq_chip
This patch continues the preparation for adding support for max77836
device to existing max14577 driver.
Add muic suffix to regmap and irq_data fields in maxim_core state
container to prepare for max77836 support.
This is only a rename-like patch, new code is not added.
Signed-off-by: Krzysztof Kozlowski k.kozlow...@samsung.com
Cc: Kyungmin Park kyungmin.p...@samsung.com
Cc: Marek Szyprowski m.szyprow...@samsung.com
---
drivers/extcon/extcon-max14577.c | 17 +
drivers/mfd/max14577.c | 22 +++---
drivers/power/max14577_charger.c |8
drivers/regulator/max14577.c |2 +-
include/linux/mfd/max14577-private.h |4 ++--
5 files changed, 27 insertions(+), 26 deletions(-)
diff --git a/drivers/extcon/extcon-max14577.c b/drivers/extcon/extcon-max14577.c
index 2879cc5844dc..fd48b4909470 100644
--- a/drivers/extcon/extcon-max14577.c
+++ b/drivers/extcon/extcon-max14577.c
@@ -176,7 +176,7 @@ static int max14577_muic_set_debounce_time(struct
max14577_muic_info *info,
case ADC_DEBOUNCE_TIME_10MS:
case ADC_DEBOUNCE_TIME_25MS:
case ADC_DEBOUNCE_TIME_38_62MS:
- ret = max14577_update_reg(info-maxim_core-regmap,
+ ret = max14577_update_reg(info-maxim_core-regmap_muic,
MAXIM_MUIC_REG_CONTROL3,
MAXIM_CONTROL3_ADCDBSET_MASK,
time MAXIM_CONTROL3_ADCDBSET_SHIFT);
@@ -210,7 +210,7 @@ static int max14577_muic_set_path(struct max14577_muic_info
*info,
u8 ctrl1, ctrl2 = 0;
/* Set open state to path before changing hw path */
- ret = max14577_update_reg(info-maxim_core-regmap,
+ ret = max14577_update_reg(info-maxim_core-regmap_muic,
MAXIM_MUIC_REG_CONTROL1,
MAXIM_CONTROL1_CLEAR_IDBEN_MICEN_MASK,
MAXIM_CONTROL1_SW_OPEN);
@@ -224,7 +224,7 @@ static int max14577_muic_set_path(struct max14577_muic_info
*info,
else
ctrl1 = MAXIM_CONTROL1_SW_OPEN;
- ret = max14577_update_reg(info-maxim_core-regmap,
+ ret = max14577_update_reg(info-maxim_core-regmap_muic,
MAXIM_MUIC_REG_CONTROL1,
MAXIM_CONTROL1_CLEAR_IDBEN_MICEN_MASK, ctrl1);
if (ret 0) {
@@ -237,7 +237,7 @@ static int max14577_muic_set_path(struct max14577_muic_info
*info,
else
ctrl2 |= MAXIM_CONTROL2_LOWPWR_MASK;/* LowPwr=1, CPEn=0 */
- ret = max14577_update_reg(info-maxim_core-regmap,
+ ret = max14577_update_reg(info-maxim_core-regmap_muic,
MAXIM_MUIC_REG_CONTROL2,
MAXIM_CONTROL2_LOWPWR_MASK | MAXIM_CONTROL2_CPEN_MASK,
ctrl2);
@@ -505,7 +505,7 @@ static void max14577_muic_irq_work(struct work_struct *work)
mutex_lock(info-mutex);
- ret = max14577_bulk_read(info-maxim_core-regmap,
+ ret = max14577_bulk_read(info-maxim_core-regmap_muic,
MAXIM_MUIC_REG_STATUS1, info-status, 2);
if (ret) {
dev_err(info-dev, failed to read MUIC register\n);
@@ -581,7 +581,7 @@ static int max14577_muic_detect_accessory(struct
max14577_muic_info *info)
mutex_lock(info-mutex);
/* Read STATUSx register to detect accessory */
- ret = max14577_bulk_read(info-maxim_core-regmap,
+ ret = max14577_bulk_read(info-maxim_core-regmap_muic,
MAXIM_MUIC_REG_STATUS1, info-status, 2);
if (ret) {
dev_err(info-dev, failed to read MUIC register\n);
@@ -651,7 +651,8 @@ static int max14577_muic_probe(struct platform_device *pdev)
struct max14577_muic_irq *muic_irq = muic_irqs[i];
unsigned int virq = 0;
- virq = regmap_irq_get_virq(maxim_core-irq_data, muic_irq-irq);
+ virq = regmap_irq_get_virq(maxim_core-irq_data_muic,
+ muic_irq-irq);
if (!virq)
return -EINVAL;
muic_irq-virq = virq;
@@ -693,7 +694,7 @@ static int max14577_muic_probe(struct platform_device *pdev)
max14577_muic_set_path(info, info-path_uart, true);
/* Check revision number of MUIC device*/
- ret = max14577_read_reg(info-maxim_core-regmap,
+ ret = max14577_read_reg(info-maxim_core-regmap_muic,
MAXIM_MUIC_REG_DEVICEID, id);
if (ret 0) {
dev_err(pdev-dev, failed to read revision number\n);
diff --git a/drivers/mfd/max14577.c b/drivers/mfd/max14577.c
index f160e582712d..1d8104213b3e 100644
--- a/drivers/mfd/max14577.c
+++ b/drivers/mfd/max14577.c
@@ -112,17 +112,17 @@ static int max14577_i2c_probe(struct i2c_client *i2c,
maxim_core-i2c = i2c;
maxim_core-irq = i2c-irq;
- maxim_core-regmap = devm_regmap_init_i2c(i2c,
-
