Merge tag 'rtc-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux
Pull RTC updates from Alexandre Belloni: "Core: - New sysfs interface to set and read clock offset - Drivers can now be both I2C and SPI (see pcf2127 and ds3232) New drivers: - Alphascale ASM9260 - Epson RX6110SA - Maxim max20024 and max77620 (in max77686) - Microchip PIC32 - NXP pcf2129 (in pcf2127) Subsystem wide cleanups: - remove IRQF_EARLY_RESUME when unecessary Drivers: - ds1307: clock output, temperature sensor and wakeup-source support - ds1685: actually spin forever in poweroff error path - ds3232: many cleanups - ds3234: merged in ds3232 - hym8563: fix invalid year calculation - max77686: many cleanups - max77802 merged in max77686 - pcf2123: cleanups and offset support - pcf85063: cleanups - pcf8523: propely handle oscillator stop bit - rv3029: many cleanups, trickle charger and temperature sensor support - rv8803: convert spin_lock to mutex_lock - rx8025: many fixes - vr41xx: restore alarm_irq_enable" * tag 'rtc-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux: (86 commits) rtc: pcf2127: add pcf2129 device id rtc: pcf2127: add support for spi interface rtc: pcf2127: convert to use regmap rtc: rv3029: Add thermometer hwmon support rtc: rv3029: Add update_bits helper for eeprom access rtc: ds1685: actually spin forever in poweroff error path rtc: hym8563: fix invalid year calculation rtc: ds3232: use rtc->ops_lock to protect alarm operations rtc: ds3232: fix issue when irq is shared several devices rtc: ds3232: remove unused UIE code rtc: ds3232: add register access error checks rtc: ds3232: fix read on /dev/rtc after RTC_AIE_ON rtc: merge ds3232 and ds3234 rtc: ds3232: convert to use regmap rtc: pxa: fix Kconfig indentation rtc: rv3029: Add device tree property for trickle charger rtc: rv3029: Add functions for EEPROM access rtc: rv3029: Add i2c register update-bits helper rtc: rv3029: Add missing register definitions rtc: rv3029: Add "rv3029" I2C device id ...
This commit is contained in:
Linus Torvalds
@@ -35,8 +35,6 @@
|
||||
#include <linux/err.h>
|
||||
#include <linux/of.h>
|
||||
|
||||
#define I2C_ADDR_RTC (0x0C >> 1)
|
||||
|
||||
static const struct mfd_cell max77686_devs[] = {
|
||||
{ .name = "max77686-pmic", },
|
||||
{ .name = "max77686-rtc", },
|
||||
@@ -116,11 +114,6 @@ static const struct regmap_config max77686_regmap_config = {
|
||||
.val_bits = 8,
|
||||
};
|
||||
|
||||
static const struct regmap_config max77686_rtc_regmap_config = {
|
||||
.reg_bits = 8,
|
||||
.val_bits = 8,
|
||||
};
|
||||
|
||||
static const struct regmap_config max77802_regmap_config = {
|
||||
.reg_bits = 8,
|
||||
.val_bits = 8,
|
||||
@@ -156,25 +149,6 @@ static const struct regmap_irq_chip max77686_irq_chip = {
|
||||
.num_irqs = ARRAY_SIZE(max77686_irqs),
|
||||
};
|
||||
|
||||
static const struct regmap_irq max77686_rtc_irqs[] = {
|
||||
/* RTC interrupts */
|
||||
{ .reg_offset = 0, .mask = MAX77686_RTCINT_RTC60S_MSK, },
|
||||
{ .reg_offset = 0, .mask = MAX77686_RTCINT_RTCA1_MSK, },
|
||||
{ .reg_offset = 0, .mask = MAX77686_RTCINT_RTCA2_MSK, },
|
||||
{ .reg_offset = 0, .mask = MAX77686_RTCINT_SMPL_MSK, },
|
||||
{ .reg_offset = 0, .mask = MAX77686_RTCINT_RTC1S_MSK, },
|
||||
{ .reg_offset = 0, .mask = MAX77686_RTCINT_WTSR_MSK, },
|
||||
};
|
||||
|
||||
static const struct regmap_irq_chip max77686_rtc_irq_chip = {
|
||||
.name = "max77686-rtc",
|
||||
.status_base = MAX77686_RTC_INT,
|
||||
.mask_base = MAX77686_RTC_INTM,
|
||||
.num_regs = 1,
|
||||
.irqs = max77686_rtc_irqs,
|
||||
.num_irqs = ARRAY_SIZE(max77686_rtc_irqs),
|
||||
};
|
||||
|
||||
static const struct regmap_irq_chip max77802_irq_chip = {
|
||||
.name = "max77802-pmic",
|
||||
.status_base = MAX77802_REG_INT1,
|
||||
@@ -184,15 +158,6 @@ static const struct regmap_irq_chip max77802_irq_chip = {
|
||||
.num_irqs = ARRAY_SIZE(max77686_irqs),
|
||||
};
|
||||
|
||||
static const struct regmap_irq_chip max77802_rtc_irq_chip = {
|
||||
.name = "max77802-rtc",
|
||||
.status_base = MAX77802_RTC_INT,
|
||||
.mask_base = MAX77802_RTC_INTM,
|
||||
.num_regs = 1,
|
||||
.irqs = max77686_rtc_irqs, /* same masks as 77686 */
|
||||
.num_irqs = ARRAY_SIZE(max77686_rtc_irqs),
|
||||
};
|
||||
|
||||
static const struct of_device_id max77686_pmic_dt_match[] = {
|
||||
{
|
||||
.compatible = "maxim,max77686",
|
||||
@@ -214,8 +179,6 @@ static int max77686_i2c_probe(struct i2c_client *i2c,
|
||||
int ret = 0;
|
||||
const struct regmap_config *config;
|
||||
const struct regmap_irq_chip *irq_chip;
|
||||
const struct regmap_irq_chip *rtc_irq_chip;
|
||||
struct regmap **rtc_regmap;
|
||||
const struct mfd_cell *cells;
|
||||
int n_devs;
|
||||
|
||||
@@ -242,15 +205,11 @@ static int max77686_i2c_probe(struct i2c_client *i2c,
|
||||
if (max77686->type == TYPE_MAX77686) {
|
||||
config = &max77686_regmap_config;
|
||||
irq_chip = &max77686_irq_chip;
|
||||
rtc_irq_chip = &max77686_rtc_irq_chip;
|
||||
rtc_regmap = &max77686->rtc_regmap;
|
||||
cells = max77686_devs;
|
||||
n_devs = ARRAY_SIZE(max77686_devs);
|
||||
} else {
|
||||
config = &max77802_regmap_config;
|
||||
irq_chip = &max77802_irq_chip;
|
||||
rtc_irq_chip = &max77802_rtc_irq_chip;
|
||||
rtc_regmap = &max77686->regmap;
|
||||
cells = max77802_devs;
|
||||
n_devs = ARRAY_SIZE(max77802_devs);
|
||||
}
|
||||
@@ -270,60 +229,25 @@ static int max77686_i2c_probe(struct i2c_client *i2c,
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
if (max77686->type == TYPE_MAX77686) {
|
||||
max77686->rtc = i2c_new_dummy(i2c->adapter, I2C_ADDR_RTC);
|
||||
if (!max77686->rtc) {
|
||||
dev_err(max77686->dev,
|
||||
"Failed to allocate I2C device for RTC\n");
|
||||
return -ENODEV;
|
||||
}
|
||||
i2c_set_clientdata(max77686->rtc, max77686);
|
||||
|
||||
max77686->rtc_regmap =
|
||||
devm_regmap_init_i2c(max77686->rtc,
|
||||
&max77686_rtc_regmap_config);
|
||||
if (IS_ERR(max77686->rtc_regmap)) {
|
||||
ret = PTR_ERR(max77686->rtc_regmap);
|
||||
dev_err(max77686->dev,
|
||||
"failed to allocate RTC regmap: %d\n",
|
||||
ret);
|
||||
goto err_unregister_i2c;
|
||||
}
|
||||
}
|
||||
|
||||
ret = regmap_add_irq_chip(max77686->regmap, max77686->irq,
|
||||
IRQF_TRIGGER_FALLING | IRQF_ONESHOT |
|
||||
IRQF_SHARED, 0, irq_chip,
|
||||
&max77686->irq_data);
|
||||
if (ret) {
|
||||
if (ret < 0) {
|
||||
dev_err(&i2c->dev, "failed to add PMIC irq chip: %d\n", ret);
|
||||
goto err_unregister_i2c;
|
||||
}
|
||||
|
||||
ret = regmap_add_irq_chip(*rtc_regmap, max77686->irq,
|
||||
IRQF_TRIGGER_FALLING | IRQF_ONESHOT |
|
||||
IRQF_SHARED, 0, rtc_irq_chip,
|
||||
&max77686->rtc_irq_data);
|
||||
if (ret) {
|
||||
dev_err(&i2c->dev, "failed to add RTC irq chip: %d\n", ret);
|
||||
goto err_del_irqc;
|
||||
return ret;
|
||||
}
|
||||
|
||||
ret = mfd_add_devices(max77686->dev, -1, cells, n_devs, NULL, 0, NULL);
|
||||
if (ret < 0) {
|
||||
dev_err(&i2c->dev, "failed to add MFD devices: %d\n", ret);
|
||||
goto err_del_rtc_irqc;
|
||||
goto err_del_irqc;
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
||||
err_del_rtc_irqc:
|
||||
regmap_del_irq_chip(max77686->irq, max77686->rtc_irq_data);
|
||||
err_del_irqc:
|
||||
regmap_del_irq_chip(max77686->irq, max77686->irq_data);
|
||||
err_unregister_i2c:
|
||||
if (max77686->type == TYPE_MAX77686)
|
||||
i2c_unregister_device(max77686->rtc);
|
||||
|
||||
return ret;
|
||||
}
|
||||
@@ -334,12 +258,8 @@ static int max77686_i2c_remove(struct i2c_client *i2c)
|
||||
|
||||
mfd_remove_devices(max77686->dev);
|
||||
|
||||
regmap_del_irq_chip(max77686->irq, max77686->rtc_irq_data);
|
||||
regmap_del_irq_chip(max77686->irq, max77686->irq_data);
|
||||
|
||||
if (max77686->type == TYPE_MAX77686)
|
||||
i2c_unregister_device(max77686->rtc);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user