Merge branches 'for-3.15/upstream-fixes' and 'for-3.16/upstream' into for-linus

[firefly-linux-kernel-4.4.55.git] / drivers / mfd / as3722.c

diff --git a/drivers/mfd/as3722.c b/drivers/mfd/as3722.c
index f161f2e00df7434ee8970584e76392af68304179..39fa554f13bbfcffc1f13b2bd2e8024371c317fe 100644 (file)
--- a/drivers/mfd/as3722.c
+++ b/drivers/mfd/as3722.c
@@ -54,7 +54,7 @@ static const struct resource as3722_adc_resource[] = {
        },
 };
 
-static struct mfd_cell as3722_devs[] = {
+static const struct mfd_cell as3722_devs[] = {
        {
                .name = "as3722-pinctrl",
        },
@@ -74,6 +74,9 @@ static struct mfd_cell as3722_devs[] = {
        {
                .name = "as3722-power-off",
        },
+       {
+               .name = "as3722-wdt",
+       },
 };
 
 static const struct regmap_irq as3722_irqs[] = {
@@ -274,6 +277,7 @@ static const struct regmap_range as3722_readable_ranges[] = {
        regmap_reg_range(AS3722_ADC0_CONTROL_REG, AS3722_ADC_CONFIGURATION_REG),
        regmap_reg_range(AS3722_ASIC_ID1_REG, AS3722_ASIC_ID2_REG),
        regmap_reg_range(AS3722_LOCK_REG, AS3722_LOCK_REG),
+       regmap_reg_range(AS3722_FUSE7_REG, AS3722_FUSE7_REG),
 };
 
 static const struct regmap_access_table as3722_readable_table = {