Merge tag 'mfd-next-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd

author Linus Torvalds <torvalds@linux-foundation.org>

Wed, 16 Dec 2020 22:48:32 +0000 (14:48 -0800)

committer Linus Torvalds <torvalds@linux-foundation.org>

Wed, 16 Dec 2020 22:48:32 +0000 (14:48 -0800)
author Linus Torvalds <torvalds@linux-foundation.org>
Wed, 16 Dec 2020 22:48:32 +0000 (14:48 -0800)
committer Linus Torvalds <torvalds@linux-foundation.org>
Wed, 16 Dec 2020 22:48:32 +0000 (14:48 -0800)
diff --git a/Documentation/devicetree/bindings/mfd/rohm,bd71837-pmic.yaml b/Documentation/devicetree/bindings/mfd/rohm,bd71837-pmic.yaml

index 65018a0..3bfdd33 100644 (file)
--- a/Documentation/devicetree/bindings/mfd/rohm,bd71837-pmic.yaml
+++ b/Documentation/devicetree/bindings/mfd/rohm,bd71837-pmic.yaml
@@ -32,9 +32,15 @@ properties:
    clocks:
      maxItems: 1
  
+  clock-names:
+    const: osc
+
    "#clock-cells":
      const: 0
  
+  clock-output-names:
+    const: pmic_clk
+
  # The BD718x7 supports two different HW states as reset target states. States
  # are called as SNVS and READY. At READY state all the PMIC power outputs go
  # down and OTP is reload. At the SNVS state all other logic and external
diff --git a/Documentation/devicetree/bindings/mfd/syscon.yaml b/Documentation/devicetree/bindings/mfd/syscon.yaml

index 8f4764a..f14ae6d 100644 (file)
--- a/Documentation/devicetree/bindings/mfd/syscon.yaml
+++ b/Documentation/devicetree/bindings/mfd/syscon.yaml
@@ -44,6 +44,10 @@ properties:
                - hisilicon,peri-subctrl
                - microchip,sparx5-cpu-syscon
                - mstar,msc313-pmsleep
+              - rockchip,px30-qos
+              - rockchip,rk3066-qos
+              - rockchip,rk3288-qos
+              - rockchip,rk3399-qos
                - samsung,exynos3-sysreg
                - samsung,exynos4-sysreg
                - samsung,exynos5-sysreg
diff --git a/drivers/gpio/gpio-tps65910.c b/drivers/gpio/gpio-tps65910.c

index 0c785b0..0c0b445 100644 (file)
--- a/drivers/gpio/gpio-tps65910.c
+++ b/drivers/gpio/gpio-tps65910.c
@@ -28,7 +28,7 @@ static int tps65910_gpio_get(struct gpio_chip *gc, unsigned offset)
         struct tps65910 *tps65910 = tps65910_gpio->tps65910;
         unsigned int val;
  
-       tps65910_reg_read(tps65910, TPS65910_GPIO0 + offset, &val);
+       regmap_read(tps65910->regmap, TPS65910_GPIO0 + offset, &val);
  
         if (val & GPIO_STS_MASK)
                 return 1;
@@ -43,10 +43,10 @@ static void tps65910_gpio_set(struct gpio_chip *gc, unsigned offset,
         struct tps65910 *tps65910 = tps65910_gpio->tps65910;
  
         if (value)
-               tps65910_reg_set_bits(tps65910, TPS65910_GPIO0 + offset,
+               regmap_set_bits(tps65910->regmap, TPS65910_GPIO0 + offset,
                                                 GPIO_SET_MASK);
         else
-               tps65910_reg_clear_bits(tps65910, TPS65910_GPIO0 + offset,
+               regmap_clear_bits(tps65910->regmap, TPS65910_GPIO0 + offset,
                                                 GPIO_SET_MASK);
  }
  
@@ -59,7 +59,7 @@ static int tps65910_gpio_output(struct gpio_chip *gc, unsigned offset,
         /* Set the initial value */
         tps65910_gpio_set(gc, offset, value);
  
-       return tps65910_reg_set_bits(tps65910, TPS65910_GPIO0 + offset,
+       return regmap_set_bits(tps65910->regmap, TPS65910_GPIO0 + offset,
                                                 GPIO_CFG_MASK);
  }
  
@@ -68,7 +68,7 @@ static int tps65910_gpio_input(struct gpio_chip *gc, unsigned offset)
         struct tps65910_gpio *tps65910_gpio = gpiochip_get_data(gc);
         struct tps65910 *tps65910 = tps65910_gpio->tps65910;
  
-       return tps65910_reg_clear_bits(tps65910, TPS65910_GPIO0 + offset,
+       return regmap_clear_bits(tps65910->regmap, TPS65910_GPIO0 + offset,
                                                 GPIO_CFG_MASK);
  }
  
@@ -157,7 +157,7 @@ static int tps65910_gpio_probe(struct platform_device *pdev)
                 if (!pdata->en_gpio_sleep[i])
                         continue;
  
-               ret = tps65910_reg_set_bits(tps65910,
+               ret = regmap_set_bits(tps65910->regmap,
                         TPS65910_GPIO0 + i, GPIO_SLEEP_MASK);
                 if (ret < 0)
                         dev_warn(tps65910->dev,
diff --git a/drivers/mfd/88pm800.c b/drivers/mfd/88pm800.c

index 4e8d0d6..c7f9649 100644 (file)
--- a/drivers/mfd/88pm800.c
+++ b/drivers/mfd/88pm800.c
@@ -121,7 +121,7 @@ static const struct i2c_device_id pm80x_id_table[] = {
  };
  MODULE_DEVICE_TABLE(i2c, pm80x_id_table);
  
-static struct resource rtc_resources[] = {
+static const struct resource rtc_resources[] = {
         {
          .name = "88pm80x-rtc",
          .start = PM800_IRQ_RTC,
diff --git a/drivers/mfd/88pm860x-core.c b/drivers/mfd/88pm860x-core.c

index c9bae71..b1e829e 100644 (file)
--- a/drivers/mfd/88pm860x-core.c
+++ b/drivers/mfd/88pm860x-core.c
@@ -26,99 +26,99 @@
  
  #define INT_STATUS_NUM                 3
  
-static struct resource bk0_resources[] = {
+static const struct resource bk0_resources[] = {
         {2, 2, "duty cycle", IORESOURCE_REG, },
         {3, 3, "always on",  IORESOURCE_REG, },
         {3, 3, "current",    IORESOURCE_REG, },
  };
-static struct resource bk1_resources[] = {
+static const struct resource bk1_resources[] = {
         {4, 4, "duty cycle", IORESOURCE_REG, },
         {5, 5, "always on",  IORESOURCE_REG, },
         {5, 5, "current",    IORESOURCE_REG, },
  };
-static struct resource bk2_resources[] = {
+static const struct resource bk2_resources[] = {
         {6, 6, "duty cycle", IORESOURCE_REG, },
         {7, 7, "always on",  IORESOURCE_REG, },
         {5, 5, "current",    IORESOURCE_REG, },
  };
  
-static struct resource led0_resources[] = {
+static const struct resource led0_resources[] = {
         /* RGB1 Red LED */
         {0xd, 0xd, "control", IORESOURCE_REG, },
         {0xc, 0xc, "blink",   IORESOURCE_REG, },
  };
-static struct resource led1_resources[] = {
+static const struct resource led1_resources[] = {
         /* RGB1 Green LED */
         {0xe, 0xe, "control", IORESOURCE_REG, },
         {0xc, 0xc, "blink",   IORESOURCE_REG, },
  };
-static struct resource led2_resources[] = {
+static const struct resource led2_resources[] = {
         /* RGB1 Blue LED */
         {0xf, 0xf, "control", IORESOURCE_REG, },
         {0xc, 0xc, "blink",   IORESOURCE_REG, },
  };
-static struct resource led3_resources[] = {
+static const struct resource led3_resources[] = {
         /* RGB2 Red LED */
         {0x9, 0x9, "control", IORESOURCE_REG, },
         {0x8, 0x8, "blink",   IORESOURCE_REG, },
  };
-static struct resource led4_resources[] = {
+static const struct resource led4_resources[] = {
         /* RGB2 Green LED */
         {0xa, 0xa, "control", IORESOURCE_REG, },
         {0x8, 0x8, "blink",   IORESOURCE_REG, },
  };
-static struct resource led5_resources[] = {
+static const struct resource led5_resources[] = {
         /* RGB2 Blue LED */
         {0xb, 0xb, "control", IORESOURCE_REG, },
         {0x8, 0x8, "blink",   IORESOURCE_REG, },
  };
  
-static struct resource buck1_resources[] = {
+static const struct resource buck1_resources[] = {
         {0x24, 0x24, "buck set", IORESOURCE_REG, },
  };
-static struct resource buck2_resources[] = {
+static const struct resource buck2_resources[] = {
         {0x25, 0x25, "buck set", IORESOURCE_REG, },
  };
-static struct resource buck3_resources[] = {
+static const struct resource buck3_resources[] = {
         {0x26, 0x26, "buck set", IORESOURCE_REG, },
  };
-static struct resource ldo1_resources[] = {
+static const struct resource ldo1_resources[] = {
         {0x10, 0x10, "ldo set", IORESOURCE_REG, },
  };
-static struct resource ldo2_resources[] = {
+static const struct resource ldo2_resources[] = {
         {0x11, 0x11, "ldo set", IORESOURCE_REG, },
  };
-static struct resource ldo3_resources[] = {
+static const struct resource ldo3_resources[] = {
         {0x12, 0x12, "ldo set", IORESOURCE_REG, },
  };
-static struct resource ldo4_resources[] = {
+static const struct resource ldo4_resources[] = {
         {0x13, 0x13, "ldo set", IORESOURCE_REG, },
  };
-static struct resource ldo5_resources[] = {
+static const struct resource ldo5_resources[] = {
         {0x14, 0x14, "ldo set", IORESOURCE_REG, },
  };
-static struct resource ldo6_resources[] = {
+static const struct resource ldo6_resources[] = {
         {0x15, 0x15, "ldo set", IORESOURCE_REG, },
  };
-static struct resource ldo7_resources[] = {
+static const struct resource ldo7_resources[] = {
         {0x16, 0x16, "ldo set", IORESOURCE_REG, },
  };
-static struct resource ldo8_resources[] = {
+static const struct resource ldo8_resources[] = {
         {0x17, 0x17, "ldo set", IORESOURCE_REG, },
  };
-static struct resource ldo9_resources[] = {
+static const struct resource ldo9_resources[] = {
         {0x18, 0x18, "ldo set", IORESOURCE_REG, },
  };
-static struct resource ldo10_resources[] = {
+static const struct resource ldo10_resources[] = {
         {0x19, 0x19, "ldo set", IORESOURCE_REG, },
  };
-static struct resource ldo12_resources[] = {
+static const struct resource ldo12_resources[] = {
         {0x1a, 0x1a, "ldo set", IORESOURCE_REG, },
  };
-static struct resource ldo_vibrator_resources[] = {
+static const struct resource ldo_vibrator_resources[] = {
         {0x28, 0x28, "ldo set", IORESOURCE_REG, },
  };
-static struct resource ldo14_resources[] = {
+static const struct resource ldo14_resources[] = {
         {0x1b, 0x1b, "ldo set", IORESOURCE_REG, },
  };
  
diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig

index cc0b732..bdfce7b 100644 (file)
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -730,33 +730,9 @@ config MFD_KEMPLD
         select MFD_CORE
         help
           This is the core driver for the PLD (Programmable Logic Device) found
-         on some Kontron ETX and COMexpress (ETXexpress) modules. The PLD
-         device may provide functions like watchdog, GPIO, UART and I2C bus.
-
-         The following modules are supported:
-               * COMe-bBD#
-               * COMe-bBL6
-               * COMe-bHL6
-               * COMe-bSL6
-               * COMe-bIP#
-               * COMe-bKL6
-               * COMe-bPC2 (ETXexpress-PC)
-               * COMe-bSC# (ETXexpress-SC T#)
-               * COMe-cAL6
-               * COMe-cBL6
-               * COMe-cBT6
-               * COMe-cBW6
-               * COMe-cCT6
-               * COMe-cDC2 (microETXexpress-DC)
-               * COMe-cHL6
-               * COMe-cKL6
-               * COMe-cPC2 (microETXexpress-PC)
-               * COMe-cSL6
-               * COMe-mAL10
-               * COMe-mBT10
-               * COMe-mCT10
-               * COMe-mTT10 (nanoETXexpress-TT)
-               * ETX-OH
+         on some Kontron ETX and nearly all COMexpress (ETXexpress) modules as
+         well as on some other Kontron products. The PLD device may provide
+         functions like watchdog, GPIO, UART and I2C bus.
  
           This driver can also be built as a module. If so, the module
           will be called kempld-core.
@@ -1199,6 +1175,7 @@ config MFD_SIMPLE_MFD_I2C
  config MFD_SL28CPLD
         tristate "Kontron sl28cpld Board Management Controller"
         depends on I2C
+       depends on ARCH_LAYERSCAPE || COMPILE_TEST
         select MFD_SIMPLE_MFD_I2C
         help
           Say yes here to enable support for the Kontron sl28cpld board
@@ -1442,6 +1419,7 @@ config MFD_TI_LMU
  config MFD_OMAP_USB_HOST
         bool "TI OMAP USBHS core and TLL driver"
         depends on USB_EHCI_HCD_OMAP || USB_OHCI_HCD_OMAP3
+       depends on COMMON_CLK
         default y
         help
           This is the core driver for the OAMP EHCI and OHCI drivers.
diff --git a/drivers/mfd/altera-sysmgr.c b/drivers/mfd/altera-sysmgr.c

index 41076d1..193a96c 100644 (file)
--- a/drivers/mfd/altera-sysmgr.c
+++ b/drivers/mfd/altera-sysmgr.c
@@ -152,7 +152,7 @@ static int sysmgr_probe(struct platform_device *pdev)
                 if (!base)
                         return -ENOMEM;
  
-               sysmgr_config.max_register = res->end - res->start - 3;
+               sysmgr_config.max_register = resource_size(res) - 3;
                 regmap = devm_regmap_init_mmio(dev, base, &sysmgr_config);
         }
  
diff --git a/drivers/mfd/at91-usart.c b/drivers/mfd/at91-usart.c

index 6a8351a..7f08cb6 100644 (file)
--- a/drivers/mfd/at91-usart.c
+++ b/drivers/mfd/at91-usart.c
@@ -15,15 +15,11 @@
  #include <linux/of.h>
  #include <linux/property.h>
  
-static const struct mfd_cell at91_usart_spi_subdev = {
-       .name = "at91_usart_spi",
-       .of_compatible = "microchip,at91sam9g45-usart-spi",
-};
+static const struct mfd_cell at91_usart_spi_subdev =
+       MFD_CELL_NAME("at91_usart_spi");
  
-static const struct mfd_cell at91_usart_serial_subdev = {
-       .name = "atmel_usart_serial",
-       .of_compatible = "atmel,at91rm9200-usart-serial",
-};
+static const struct mfd_cell at91_usart_serial_subdev =
+       MFD_CELL_NAME("atmel_usart_serial");
  
  static int at91_usart_mode_probe(struct platform_device *pdev)
  {
diff --git a/drivers/mfd/axp20x-i2c.c b/drivers/mfd/axp20x-i2c.c

index 068e9c0..2cfde81 100644 (file)
--- a/drivers/mfd/axp20x-i2c.c
+++ b/drivers/mfd/axp20x-i2c.c
@@ -57,6 +57,7 @@ static int axp20x_i2c_remove(struct i2c_client *i2c)
         return axp20x_device_remove(axp20x);
  }
  
+#ifdef CONFIG_OF
  static const struct of_device_id axp20x_i2c_of_match[] = {
         { .compatible = "x-powers,axp152", .data = (void *)AXP152_ID },
         { .compatible = "x-powers,axp202", .data = (void *)AXP202_ID },
@@ -68,6 +69,7 @@ static const struct of_device_id axp20x_i2c_of_match[] = {
         { },
  };
  MODULE_DEVICE_TABLE(of, axp20x_i2c_of_match);
+#endif
  
  static const struct i2c_device_id axp20x_i2c_id[] = {
         { "axp152", 0 },
diff --git a/drivers/mfd/bcm590xx.c b/drivers/mfd/bcm590xx.c

index bfac5dc..6ca337c 100644 (file)
--- a/drivers/mfd/bcm590xx.c
+++ b/drivers/mfd/bcm590xx.c
@@ -107,7 +107,7 @@ MODULE_DEVICE_TABLE(i2c, bcm590xx_i2c_id);
  static struct i2c_driver bcm590xx_i2c_driver = {
         .driver = {
                    .name = "bcm590xx",
-                  .of_match_table = of_match_ptr(bcm590xx_of_match),
+                  .of_match_table = bcm590xx_of_match,
         },
         .probe = bcm590xx_i2c_probe,
         .id_table = bcm590xx_i2c_id,
diff --git a/drivers/mfd/da9055-core.c b/drivers/mfd/da9055-core.c

index 6d0af84..d074d21 100644 (file)
--- a/drivers/mfd/da9055-core.c
+++ b/drivers/mfd/da9055-core.c
@@ -254,14 +254,14 @@ const struct regmap_config da9055_regmap_config = {
  };
  EXPORT_SYMBOL_GPL(da9055_regmap_config);
  
-static struct resource da9055_onkey_resource = {
+static const struct resource da9055_onkey_resource = {
         .name = "ONKEY",
         .start = DA9055_IRQ_NONKEY,
         .end   = DA9055_IRQ_NONKEY,
         .flags = IORESOURCE_IRQ,
  };
  
-static struct resource da9055_rtc_resource[] = {
+static const struct resource da9055_rtc_resource[] = {
         {
                 .name = "ALM",
                 .start = DA9055_IRQ_ALARM,
@@ -276,14 +276,14 @@ static struct resource da9055_rtc_resource[] = {
         },
  };
  
-static struct resource da9055_hwmon_resource = {
+static const struct resource da9055_hwmon_resource = {
         .name = "HWMON",
         .start = DA9055_IRQ_HWMON,
         .end   = DA9055_IRQ_HWMON,
         .flags = IORESOURCE_IRQ,
  };
  
-static struct resource da9055_ld05_6_resource = {
+static const struct resource da9055_ld05_6_resource = {
         .name = "REGULATOR",
         .start = DA9055_IRQ_REGULATOR,
         .end   = DA9055_IRQ_REGULATOR,
diff --git a/drivers/mfd/da9055-i2c.c b/drivers/mfd/da9055-i2c.c

index 950b75f..bc60433 100644 (file)
--- a/drivers/mfd/da9055-i2c.c
+++ b/drivers/mfd/da9055-i2c.c
@@ -74,7 +74,7 @@ static struct i2c_driver da9055_i2c_driver = {
         .id_table = da9055_i2c_id,
         .driver = {
                 .name = "da9055-pmic",
-               .of_match_table = of_match_ptr(da9055_of_match),
+               .of_match_table = da9055_of_match,
         },
  };
  
diff --git a/drivers/mfd/da9062-core.c b/drivers/mfd/da9062-core.c

index fc30726..8d91337 100644 (file)
--- a/drivers/mfd/da9062-core.c
+++ b/drivers/mfd/da9062-core.c
@@ -160,23 +160,23 @@ static struct regmap_irq_chip da9062_irq_chip = {
         .ack_base = DA9062AA_EVENT_A,
  };
  
-static struct resource da9061_core_resources[] = {
+static const struct resource da9061_core_resources[] = {
         DEFINE_RES_IRQ_NAMED(DA9061_IRQ_VDD_WARN, "VDD_WARN"),
  };
  
-static struct resource da9061_regulators_resources[] = {
+static const struct resource da9061_regulators_resources[] = {
         DEFINE_RES_IRQ_NAMED(DA9061_IRQ_LDO_LIM, "LDO_LIM"),
  };
  
-static struct resource da9061_thermal_resources[] = {
+static const struct resource da9061_thermal_resources[] = {
         DEFINE_RES_IRQ_NAMED(DA9061_IRQ_TEMP, "THERMAL"),
  };
  
-static struct resource da9061_wdt_resources[] = {
+static const struct resource da9061_wdt_resources[] = {
         DEFINE_RES_IRQ_NAMED(DA9061_IRQ_WDG_WARN, "WD_WARN"),
  };
  
-static struct resource da9061_onkey_resources[] = {
+static const struct resource da9061_onkey_resources[] = {
         DEFINE_RES_IRQ_NAMED(DA9061_IRQ_ONKEY, "ONKEY"),
  };
  
@@ -211,32 +211,32 @@ static const struct mfd_cell da9061_devs[] = {
         },
  };
  
-static struct resource da9062_core_resources[] = {
+static const struct resource da9062_core_resources[] = {
         DEFINE_RES_NAMED(DA9062_IRQ_VDD_WARN, 1, "VDD_WARN", IORESOURCE_IRQ),
  };
  
-static struct resource da9062_regulators_resources[] = {
+static const struct resource da9062_regulators_resources[] = {
         DEFINE_RES_NAMED(DA9062_IRQ_LDO_LIM, 1, "LDO_LIM", IORESOURCE_IRQ),
  };
  
-static struct resource da9062_thermal_resources[] = {
+static const struct resource da9062_thermal_resources[] = {
         DEFINE_RES_NAMED(DA9062_IRQ_TEMP, 1, "THERMAL", IORESOURCE_IRQ),
  };
  
-static struct resource da9062_wdt_resources[] = {
+static const struct resource da9062_wdt_resources[] = {
         DEFINE_RES_NAMED(DA9062_IRQ_WDG_WARN, 1, "WD_WARN", IORESOURCE_IRQ),
  };
  
-static struct resource da9062_rtc_resources[] = {
+static const struct resource da9062_rtc_resources[] = {
         DEFINE_RES_NAMED(DA9062_IRQ_ALARM, 1, "ALARM", IORESOURCE_IRQ),
         DEFINE_RES_NAMED(DA9062_IRQ_TICK, 1, "TICK", IORESOURCE_IRQ),
  };
  
-static struct resource da9062_onkey_resources[] = {
+static const struct resource da9062_onkey_resources[] = {
         DEFINE_RES_NAMED(DA9062_IRQ_ONKEY, 1, "ONKEY", IORESOURCE_IRQ),
  };
  
-static struct resource da9062_gpio_resources[] = {
+static const struct resource da9062_gpio_resources[] = {
         DEFINE_RES_NAMED(DA9062_IRQ_GPI0, 1, "GPI0", IORESOURCE_IRQ),
         DEFINE_RES_NAMED(DA9062_IRQ_GPI1, 1, "GPI1", IORESOURCE_IRQ),
         DEFINE_RES_NAMED(DA9062_IRQ_GPI2, 1, "GPI2", IORESOURCE_IRQ),
@@ -736,7 +736,7 @@ MODULE_DEVICE_TABLE(i2c, da9062_i2c_id);
  static struct i2c_driver da9062_i2c_driver = {
         .driver = {
                 .name = "da9062",
-               .of_match_table = of_match_ptr(da9062_dt_ids),
+               .of_match_table = da9062_dt_ids,
         },
         .probe    = da9062_i2c_probe,
         .remove   = da9062_i2c_remove,
diff --git a/drivers/mfd/da9063-core.c b/drivers/mfd/da9063-core.c

index a353d52..df407c3 100644 (file)
--- a/drivers/mfd/da9063-core.c
+++ b/drivers/mfd/da9063-core.c
@@ -29,7 +29,7 @@
  #include <linux/uaccess.h>
  
  
-static struct resource da9063_regulators_resources[] = {
+static const struct resource da9063_regulators_resources[] = {
         {
                 .name   = "LDO_LIM",
                 .start  = DA9063_IRQ_LDO_LIM,
@@ -38,7 +38,7 @@ static struct resource da9063_regulators_resources[] = {
         },
  };
  
-static struct resource da9063_rtc_resources[] = {
+static const struct resource da9063_rtc_resources[] = {
         {
                 .name   = "ALARM",
                 .start  = DA9063_IRQ_ALARM,
@@ -53,7 +53,7 @@ static struct resource da9063_rtc_resources[] = {
         }
  };
  
-static struct resource da9063_onkey_resources[] = {
+static const struct resource da9063_onkey_resources[] = {
         {
                 .name   = "ONKEY",
                 .start  = DA9063_IRQ_ONKEY,
@@ -62,7 +62,7 @@ static struct resource da9063_onkey_resources[] = {
         },
  };
  
-static struct resource da9063_hwmon_resources[] = {
+static const struct resource da9063_hwmon_resources[] = {
         {
                 .start  = DA9063_IRQ_ADC_RDY,
                 .end    = DA9063_IRQ_ADC_RDY,
diff --git a/drivers/mfd/da9063-i2c.c b/drivers/mfd/da9063-i2c.c

index b8217ad..3781d0b 100644 (file)
--- a/drivers/mfd/da9063-i2c.c
+++ b/drivers/mfd/da9063-i2c.c
@@ -455,7 +455,7 @@ MODULE_DEVICE_TABLE(i2c, da9063_i2c_id);
  static struct i2c_driver da9063_i2c_driver = {
         .driver = {
                 .name = "da9063",
-               .of_match_table = of_match_ptr(da9063_dt_ids),
+               .of_match_table = da9063_dt_ids,
         },
         .probe    = da9063_i2c_probe,
         .id_table = da9063_i2c_id,
diff --git a/drivers/mfd/da9150-core.c b/drivers/mfd/da9150-core.c

index 7f0aa1e..58009c8 100644 (file)
--- a/drivers/mfd/da9150-core.c
+++ b/drivers/mfd/da9150-core.c
@@ -350,18 +350,18 @@ static const struct regmap_irq_chip da9150_regmap_irq_chip = {
         .num_irqs = ARRAY_SIZE(da9150_irqs),
  };
  
-static struct resource da9150_gpadc_resources[] = {
+static const struct resource da9150_gpadc_resources[] = {
         DEFINE_RES_IRQ_NAMED(DA9150_IRQ_GPADC, "GPADC"),
  };
  
-static struct resource da9150_charger_resources[] = {
+static const struct resource da9150_charger_resources[] = {
         DEFINE_RES_IRQ_NAMED(DA9150_IRQ_CHG, "CHG_STATUS"),
         DEFINE_RES_IRQ_NAMED(DA9150_IRQ_TJUNC, "CHG_TJUNC"),
         DEFINE_RES_IRQ_NAMED(DA9150_IRQ_VFAULT, "CHG_VFAULT"),
         DEFINE_RES_IRQ_NAMED(DA9150_IRQ_VBUS, "CHG_VBUS"),
  };
  
-static struct resource da9150_fg_resources[] = {
+static const struct resource da9150_fg_resources[] = {
         DEFINE_RES_IRQ_NAMED(DA9150_IRQ_FG, "FG"),
  };
  
@@ -511,7 +511,7 @@ MODULE_DEVICE_TABLE(of, da9150_of_match);
  static struct i2c_driver da9150_driver = {
         .driver = {
                 .name   = "da9150",
-               .of_match_table = of_match_ptr(da9150_of_match),
+               .of_match_table = da9150_of_match,
         },
         .probe          = da9150_probe,
         .remove         = da9150_remove,
diff --git a/drivers/mfd/ene-kb3930.c b/drivers/mfd/ene-kb3930.c

index 1c32ff5..83243e6 100644 (file)
--- a/drivers/mfd/ene-kb3930.c
+++ b/drivers/mfd/ene-kb3930.c
@@ -202,7 +202,7 @@ static struct i2c_driver kb3930_driver = {
         .remove = kb3930_remove,
         .driver = {
                 .name = "ene-kb3930",
-               .of_match_table = of_match_ptr(kb3930_dt_ids),
+               .of_match_table = kb3930_dt_ids,
         },
  };
  module_i2c_driver(kb3930_driver);
diff --git a/drivers/mfd/fsl-imx25-tsadc.c b/drivers/mfd/fsl-imx25-tsadc.c

index a016b39..5f6f0a8 100644 (file)
--- a/drivers/mfd/fsl-imx25-tsadc.c
+++ b/drivers/mfd/fsl-imx25-tsadc.c
@@ -196,7 +196,7 @@ MODULE_DEVICE_TABLE(of, mx25_tsadc_ids);
  static struct platform_driver mx25_tsadc_driver = {
         .driver = {
                 .name = "mx25-tsadc",
-               .of_match_table = of_match_ptr(mx25_tsadc_ids),
+               .of_match_table = mx25_tsadc_ids,
         },
         .probe = mx25_tsadc_probe,
         .remove = mx25_tsadc_remove,
diff --git a/drivers/mfd/hi655x-pmic.c b/drivers/mfd/hi655x-pmic.c

index 7e3959a..d3c86a7 100644 (file)
--- a/drivers/mfd/hi655x-pmic.c
+++ b/drivers/mfd/hi655x-pmic.c
@@ -49,7 +49,7 @@ static struct regmap_config hi655x_regmap_config = {
         .max_register = HI655X_BUS_ADDR(0x400) - HI655X_STRIDE,
  };
  
-static struct resource pwrkey_resources[] = {
+static const struct resource pwrkey_resources[] = {
         {
                 .name   = "down",
                 .start  = PWRON_D20R_INT,
diff --git a/drivers/mfd/htc-i2cpld.c b/drivers/mfd/htc-i2cpld.c

index 247f984..417b035 100644 (file)
--- a/drivers/mfd/htc-i2cpld.c
+++ b/drivers/mfd/htc-i2cpld.c
@@ -346,6 +346,7 @@ static int htcpld_register_chip_i2c(
         if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_READ_BYTE_DATA)) {
                 dev_warn(dev, "i2c adapter %d non-functional\n",
                          pdata->i2c_adapter_id);
+               i2c_put_adapter(adapter);
                 return -EINVAL;
         }
  
@@ -360,6 +361,7 @@ static int htcpld_register_chip_i2c(
                 /* I2C device registration failed, contineu with the next */
                 dev_warn(dev, "Unable to add I2C device for 0x%x\n",
                          plat_chip_data->addr);
+               i2c_put_adapter(adapter);
                 return PTR_ERR(client);
         }
  
diff --git a/drivers/mfd/intel_msic.c b/drivers/mfd/intel_msic.c

index bb24c2a..daa772f 100644 (file)
--- a/drivers/mfd/intel_msic.c
+++ b/drivers/mfd/intel_msic.c
@@ -50,23 +50,23 @@ struct intel_msic {
         void __iomem                    *irq_base;
  };
  
-static struct resource msic_touch_resources[] = {
+static const struct resource msic_touch_resources[] = {
         DEFINE_RES_IRQ(0),
  };
  
-static struct resource msic_adc_resources[] = {
+static const struct resource msic_adc_resources[] = {
         DEFINE_RES_IRQ(0),
  };
  
-static struct resource msic_battery_resources[] = {
+static const struct resource msic_battery_resources[] = {
         DEFINE_RES_IRQ(0),
  };
  
-static struct resource msic_gpio_resources[] = {
+static const struct resource msic_gpio_resources[] = {
         DEFINE_RES_IRQ(0),
  };
  
-static struct resource msic_audio_resources[] = {
+static const struct resource msic_audio_resources[] = {
         DEFINE_RES_IRQ_NAMED(0, "IRQ"),
         /*
          * We will pass IRQ_BASE to the driver now but this can be removed
@@ -75,19 +75,19 @@ static struct resource msic_audio_resources[] = {
         DEFINE_RES_MEM_NAMED(MSIC_IRQ_STATUS_ACCDET, 1, "IRQ_BASE"),
  };
  
-static struct resource msic_hdmi_resources[] = {
+static const struct resource msic_hdmi_resources[] = {
         DEFINE_RES_IRQ(0),
  };
  
-static struct resource msic_thermal_resources[] = {
+static const struct resource msic_thermal_resources[] = {
         DEFINE_RES_IRQ(0),
  };
  
-static struct resource msic_power_btn_resources[] = {
+static const struct resource msic_power_btn_resources[] = {
         DEFINE_RES_IRQ(0),
  };
  
-static struct resource msic_ocd_resources[] = {
+static const struct resource msic_ocd_resources[] = {
         DEFINE_RES_IRQ(0),
  };
  
diff --git a/drivers/mfd/intel_quark_i2c_gpio.c b/drivers/mfd/intel_quark_i2c_gpio.c

index 84ca790..fe8ca94 100644 (file)
--- a/drivers/mfd/intel_quark_i2c_gpio.c
+++ b/drivers/mfd/intel_quark_i2c_gpio.c
@@ -72,7 +72,7 @@ static const struct dmi_system_id dmi_platform_info[] = {
         {}
  };
  
-static struct resource intel_quark_i2c_res[] = {
+static const struct resource intel_quark_i2c_res[] = {
         [INTEL_QUARK_IORES_MEM] = {
                 .flags = IORESOURCE_MEM,
         },
@@ -85,7 +85,7 @@ static struct mfd_cell_acpi_match intel_quark_acpi_match_i2c = {
         .adr = MFD_ACPI_MATCH_I2C,
  };
  
-static struct resource intel_quark_gpio_res[] = {
+static const struct resource intel_quark_gpio_res[] = {
         [INTEL_QUARK_IORES_MEM] = {
                 .flags = IORESOURCE_MEM,
         },
diff --git a/drivers/mfd/intel_soc_pmic_bxtwc.c b/drivers/mfd/intel_soc_pmic_bxtwc.c

index eba8978..47d0d3a 100644 (file)
--- a/drivers/mfd/intel_soc_pmic_bxtwc.c
+++ b/drivers/mfd/intel_soc_pmic_bxtwc.c
@@ -200,32 +200,32 @@ static struct regmap_irq_chip bxtwc_regmap_irq_chip_crit = {
         .num_regs = 1,
  };
  
-static struct resource gpio_resources[] = {
+static const struct resource gpio_resources[] = {
         DEFINE_RES_IRQ_NAMED(BXTWC_GPIO_LVL1_IRQ, "GPIO"),
  };
  
-static struct resource adc_resources[] = {
+static const struct resource adc_resources[] = {
         DEFINE_RES_IRQ_NAMED(BXTWC_ADC_IRQ, "ADC"),
  };
  
-static struct resource usbc_resources[] = {
+static const struct resource usbc_resources[] = {
         DEFINE_RES_IRQ(BXTWC_USBC_IRQ),
  };
  
-static struct resource charger_resources[] = {
+static const struct resource charger_resources[] = {
         DEFINE_RES_IRQ_NAMED(BXTWC_CHGR0_IRQ, "CHARGER"),
         DEFINE_RES_IRQ_NAMED(BXTWC_CHGR1_IRQ, "CHARGER1"),
  };
  
-static struct resource thermal_resources[] = {
+static const struct resource thermal_resources[] = {
         DEFINE_RES_IRQ(BXTWC_THRM_LVL1_IRQ),
  };
  
-static struct resource bcu_resources[] = {
+static const struct resource bcu_resources[] = {
         DEFINE_RES_IRQ_NAMED(BXTWC_BCU_IRQ, "BCU"),
  };
  
-static struct resource tmu_resources[] = {
+static const struct resource tmu_resources[] = {
         DEFINE_RES_IRQ_NAMED(BXTWC_TMU_IRQ, "TMU"),
  };
  
diff --git a/drivers/mfd/intel_soc_pmic_chtdc_ti.c b/drivers/mfd/intel_soc_pmic_chtdc_ti.c

index 64b5c3c..1c7577b 100644 (file)
--- a/drivers/mfd/intel_soc_pmic_chtdc_ti.c
+++ b/drivers/mfd/intel_soc_pmic_chtdc_ti.c
@@ -32,23 +32,23 @@ enum {
         CHTDC_TI_CCEOCAL = 7,   /* battery */
  };
  
-static struct resource power_button_resources[] = {
+static const struct resource power_button_resources[] = {
         DEFINE_RES_IRQ(CHTDC_TI_PWRBTN),
  };
  
-static struct resource thermal_resources[] = {
+static const struct resource thermal_resources[] = {
         DEFINE_RES_IRQ(CHTDC_TI_DIETMPWARN),
  };
  
-static struct resource adc_resources[] = {
+static const struct resource adc_resources[] = {
         DEFINE_RES_IRQ(CHTDC_TI_ADCCMPL),
  };
  
-static struct resource pwrsrc_resources[] = {
+static const struct resource pwrsrc_resources[] = {
         DEFINE_RES_IRQ(CHTDC_TI_VBUSDET),
  };
  
-static struct resource battery_resources[] = {
+static const struct resource battery_resources[] = {
         DEFINE_RES_IRQ(CHTDC_TI_VBATLOW),
         DEFINE_RES_IRQ(CHTDC_TI_CCEOCAL),
  };
diff --git a/drivers/mfd/intel_soc_pmic_chtwc.c b/drivers/mfd/intel_soc_pmic_chtwc.c

index be84bb2..49c5f71 100644 (file)
--- a/drivers/mfd/intel_soc_pmic_chtwc.c
+++ b/drivers/mfd/intel_soc_pmic_chtwc.c
@@ -41,11 +41,11 @@ enum {
         CHT_WC_CRIT_IRQ = 7,
  };
  
-static struct resource cht_wc_pwrsrc_resources[] = {
+static const struct resource cht_wc_pwrsrc_resources[] = {
         DEFINE_RES_IRQ(CHT_WC_PWRSRC_IRQ),
  };
  
-static struct resource cht_wc_ext_charger_resources[] = {
+static const struct resource cht_wc_ext_charger_resources[] = {
         DEFINE_RES_IRQ(CHT_WC_EXT_CHGR_IRQ),
  };
  
diff --git a/drivers/mfd/intel_soc_pmic_crc.c b/drivers/mfd/intel_soc_pmic_crc.c

index 429efa1..38acb20 100644 (file)
--- a/drivers/mfd/intel_soc_pmic_crc.c
+++ b/drivers/mfd/intel_soc_pmic_crc.c
@@ -28,23 +28,23 @@
  #define CRYSTAL_COVE_IRQ_GPIO          5
  #define CRYSTAL_COVE_IRQ_VHDMIOCP      6
  
-static struct resource gpio_resources[] = {
+static const struct resource gpio_resources[] = {
         DEFINE_RES_IRQ_NAMED(CRYSTAL_COVE_IRQ_GPIO, "GPIO"),
  };
  
-static struct resource pwrsrc_resources[] = {
+static const struct resource pwrsrc_resources[] = {
         DEFINE_RES_IRQ_NAMED(CRYSTAL_COVE_IRQ_PWRSRC, "PWRSRC"),
  };
  
-static struct resource adc_resources[] = {
+static const struct resource adc_resources[] = {
         DEFINE_RES_IRQ_NAMED(CRYSTAL_COVE_IRQ_ADC, "ADC"),
  };
  
-static struct resource thermal_resources[] = {
+static const struct resource thermal_resources[] = {
         DEFINE_RES_IRQ_NAMED(CRYSTAL_COVE_IRQ_THRM, "THERMAL"),
  };
  
-static struct resource bcu_resources[] = {
+static const struct resource bcu_resources[] = {
         DEFINE_RES_IRQ_NAMED(CRYSTAL_COVE_IRQ_BCU, "BCU"),
  };
  
diff --git a/drivers/mfd/ioc3.c b/drivers/mfd/ioc3.c

index d939ccc..c73ec78 100644 (file)
--- a/drivers/mfd/ioc3.c
+++ b/drivers/mfd/ioc3.c
@@ -158,13 +158,13 @@ err:
         return -ENOMEM;
  }
  
-static struct resource ioc3_uarta_resources[] = {
+static const struct resource ioc3_uarta_resources[] = {
         DEFINE_RES_MEM(offsetof(struct ioc3, sregs.uarta),
                        sizeof_field(struct ioc3, sregs.uarta)),
         DEFINE_RES_IRQ(IOC3_IRQ_SERIAL_A)
  };
  
-static struct resource ioc3_uartb_resources[] = {
+static const struct resource ioc3_uartb_resources[] = {
         DEFINE_RES_MEM(offsetof(struct ioc3, sregs.uartb),
                        sizeof_field(struct ioc3, sregs.uartb)),
         DEFINE_RES_IRQ(IOC3_IRQ_SERIAL_B)
@@ -213,7 +213,7 @@ static int ioc3_serial_setup(struct ioc3_priv_data *ipd)
         return 0;
  }
  
-static struct resource ioc3_kbd_resources[] = {
+static const struct resource ioc3_kbd_resources[] = {
         DEFINE_RES_MEM(offsetof(struct ioc3, serio),
                        sizeof_field(struct ioc3, serio)),
         DEFINE_RES_IRQ(IOC3_IRQ_KBD)
@@ -242,7 +242,7 @@ static int ioc3_kbd_setup(struct ioc3_priv_data *ipd)
         return 0;
  }
  
-static struct resource ioc3_eth_resources[] = {
+static const struct resource ioc3_eth_resources[] = {
         DEFINE_RES_MEM(offsetof(struct ioc3, eth),
                        sizeof_field(struct ioc3, eth)),
         DEFINE_RES_MEM(offsetof(struct ioc3, ssram),
@@ -250,7 +250,7 @@ static struct resource ioc3_eth_resources[] = {
         DEFINE_RES_IRQ(0)
  };
  
-static struct resource ioc3_w1_resources[] = {
+static const struct resource ioc3_w1_resources[] = {
         DEFINE_RES_MEM(offsetof(struct ioc3, mcr),
                        sizeof_field(struct ioc3, mcr)),
  };
@@ -294,7 +294,7 @@ static int ioc3_eth_setup(struct ioc3_priv_data *ipd)
         return 0;
  }
  
-static struct resource ioc3_m48t35_resources[] = {
+static const struct resource ioc3_m48t35_resources[] = {
         DEFINE_RES_MEM(IOC3_BYTEBUS_DEV0, M48T35_REG_SIZE)
  };
  
@@ -326,7 +326,7 @@ static struct ds1685_rtc_platform_data ip30_rtc_platform_data = {
         .access_type = ds1685_reg_indirect,
  };
  
-static struct resource ioc3_rtc_ds1685_resources[] = {
+static const struct resource ioc3_rtc_ds1685_resources[] = {
         DEFINE_RES_MEM(IOC3_BYTEBUS_DEV1, 1),
         DEFINE_RES_MEM(IOC3_BYTEBUS_DEV2, 1),
         DEFINE_RES_IRQ(0)
@@ -359,7 +359,7 @@ static int ioc3_ds1685_setup(struct ioc3_priv_data *ipd)
  };
  
  
-static struct resource ioc3_leds_resources[] = {
+static const struct resource ioc3_leds_resources[] = {
         DEFINE_RES_MEM(offsetof(struct ioc3, gppr[0]),
                        sizeof_field(struct ioc3, gppr[0])),
         DEFINE_RES_MEM(offsetof(struct ioc3, gppr[1]),
diff --git a/drivers/mfd/kempld-core.c b/drivers/mfd/kempld-core.c

index 2c92959..9166075 100644 (file)
--- a/drivers/mfd/kempld-core.c
+++ b/drivers/mfd/kempld-core.c
@@ -125,7 +125,6 @@ static const struct kempld_platform_data kempld_platform_data_generic = {
  };
  
  static struct platform_device *kempld_pdev;
-static bool kempld_acpi_mode;
  
  static int kempld_create_platform_device(const struct dmi_system_id *id)
  {
@@ -501,8 +500,6 @@ static int kempld_probe(struct platform_device *pdev)
                 ret = kempld_get_acpi_data(pdev);
                 if (ret)
                         return ret;
-
-               kempld_acpi_mode = true;
         } else if (kempld_pdev != pdev) {
                 /*
                  * The platform device we are probing is not the one we
@@ -555,6 +552,7 @@ static int kempld_remove(struct platform_device *pdev)
  
  #ifdef CONFIG_ACPI
  static const struct acpi_device_id kempld_acpi_table[] = {
+       { "KEM0000", (kernel_ulong_t)&kempld_platform_data_generic },
         { "KEM0001", (kernel_ulong_t)&kempld_platform_data_generic },
         {}
  };
@@ -565,7 +563,6 @@ static struct platform_driver kempld_driver = {
         .driver         = {
                 .name   = "kempld",
                 .acpi_match_table = ACPI_PTR(kempld_acpi_table),
-               .probe_type = PROBE_FORCE_SYNCHRONOUS,
         },
         .probe          = kempld_probe,
         .remove         = kempld_remove,
@@ -588,6 +585,14 @@ static const struct dmi_system_id kempld_dmi_table[] __initconst = {
                 },
                 .driver_data = (void *)&kempld_platform_data_generic,
                 .callback = kempld_create_platform_device,
+       }, {
+               .ident = "BDV7",
+               .matches = {
+                       DMI_MATCH(DMI_BOARD_VENDOR, "Kontron"),
+                       DMI_MATCH(DMI_BOARD_NAME, "COMe-bDV7"),
+               },
+               .driver_data = (void *)&kempld_platform_data_generic,
+               .callback = kempld_create_platform_device,
         }, {
                 .ident = "BHL6",
                 .matches = {
@@ -652,6 +657,14 @@ static const struct dmi_system_id kempld_dmi_table[] __initconst = {
                 },
                 .driver_data = (void *)&kempld_platform_data_generic,
                 .callback = kempld_create_platform_device,
+       }, {
+               .ident = "CDV7",
+               .matches = {
+                       DMI_MATCH(DMI_BOARD_VENDOR, "Kontron"),
+                       DMI_MATCH(DMI_BOARD_NAME, "COMe-cDV7"),
+               },
+               .driver_data = (void *)&kempld_platform_data_generic,
+               .callback = kempld_create_platform_device,
         }, {
                 .ident = "CHL6",
                 .matches = {
@@ -771,6 +784,22 @@ static const struct dmi_system_id kempld_dmi_table[] __initconst = {
                 },
                 .driver_data = (void *)&kempld_platform_data_generic,
                 .callback = kempld_create_platform_device,
+       }, {
+               .ident = "A203",
+               .matches = {
+                       DMI_MATCH(DMI_BOARD_VENDOR, "Kontron"),
+                       DMI_MATCH(DMI_BOARD_NAME, "KBox A-203"),
+               },
+               .driver_data = (void *)&kempld_platform_data_generic,
+               .callback = kempld_create_platform_device,
+       }, {
+               .ident = "M4A1",
+               .matches = {
+                       DMI_MATCH(DMI_BOARD_VENDOR, "Kontron"),
+                       DMI_MATCH(DMI_BOARD_NAME, "COMe-m4AL"),
+               },
+               .driver_data = (void *)&kempld_platform_data_generic,
+               .callback = kempld_create_platform_device,
         }, {
                 .ident = "MAL1",
                 .matches = {
@@ -779,6 +808,14 @@ static const struct dmi_system_id kempld_dmi_table[] __initconst = {
                 },
                 .driver_data = (void *)&kempld_platform_data_generic,
                 .callback = kempld_create_platform_device,
+       }, {
+               .ident = "MAPL",
+               .matches = {
+                       DMI_MATCH(DMI_BOARD_VENDOR, "Kontron"),
+                       DMI_MATCH(DMI_BOARD_NAME, "mITX-APL"),
+               },
+               .driver_data = (void *)&kempld_platform_data_generic,
+               .callback = kempld_create_platform_device,
         }, {
                 .ident = "MBR1",
                 .matches = {
@@ -827,6 +864,30 @@ static const struct dmi_system_id kempld_dmi_table[] __initconst = {
                 },
                 .driver_data = (void *)&kempld_platform_data_generic,
                 .callback = kempld_create_platform_device,
+       }, {
+               .ident = "PAPL",
+               .matches = {
+                       DMI_MATCH(DMI_BOARD_VENDOR, "Kontron"),
+                       DMI_MATCH(DMI_BOARD_NAME, "pITX-APL"),
+               },
+               .driver_data = (void *)&kempld_platform_data_generic,
+               .callback = kempld_create_platform_device,
+       }, {
+               .ident = "SXAL",
+               .matches = {
+                       DMI_MATCH(DMI_BOARD_VENDOR, "Kontron"),
+                       DMI_MATCH(DMI_BOARD_NAME, "SMARC-sXAL"),
+               },
+               .driver_data = (void *)&kempld_platform_data_generic,
+               .callback = kempld_create_platform_device,
+       }, {
+               .ident = "SXAL4",
+               .matches = {
+                       DMI_MATCH(DMI_BOARD_VENDOR, "Kontron"),
+                       DMI_MATCH(DMI_BOARD_NAME, "SMARC-sXA4"),
+               },
+               .driver_data = (void *)&kempld_platform_data_generic,
+               .callback = kempld_create_platform_device,
         }, {
                 .ident = "UNP1",
                 .matches = {
@@ -867,8 +928,7 @@ static const struct dmi_system_id kempld_dmi_table[] __initconst = {
                 },
                 .driver_data = (void *)&kempld_platform_data_generic,
                 .callback = kempld_create_platform_device,
-       },
-       {
+       }, {
                 .ident = "UTH6",
                 .matches = {
                         DMI_MATCH(DMI_BOARD_VENDOR, "Kontron"),
@@ -876,6 +936,14 @@ static const struct dmi_system_id kempld_dmi_table[] __initconst = {
                 },
                 .driver_data = (void *)&kempld_platform_data_generic,
                 .callback = kempld_create_platform_device,
+       }, {
+               .ident = "Q7AL",
+               .matches = {
+                       DMI_MATCH(DMI_BOARD_VENDOR, "Kontron"),
+                       DMI_MATCH(DMI_BOARD_NAME, "Qseven-Q7AL"),
+               },
+               .driver_data = (void *)&kempld_platform_data_generic,
+               .callback = kempld_create_platform_device,
         },
         {}
  };
@@ -884,7 +952,6 @@ MODULE_DEVICE_TABLE(dmi, kempld_dmi_table);
  static int __init kempld_init(void)
  {
         const struct dmi_system_id *id;
-       int ret;
  
         if (force_device_id[0]) {
                 for (id = kempld_dmi_table;
@@ -894,24 +961,11 @@ static int __init kempld_init(void)
                                         break;
                 if (id->matches[0].slot == DMI_NONE)
                         return -ENODEV;
-       }
-
-       ret = platform_driver_register(&kempld_driver);
-       if (ret)
-               return ret;
-
-       /*
-        * With synchronous probing the device should already be probed now.
-        * If no device id is forced and also no ACPI definition for the
-        * device was found, scan DMI table as fallback.
-        *
-        * If drivers_autoprobing is disabled and the device is found here,
-        * only that device can be bound manually later.
-        */
-       if (!kempld_pdev && !kempld_acpi_mode)
+       } else {
                 dmi_check_system(kempld_dmi_table);
+       }
  
-       return 0;
+       return platform_driver_register(&kempld_driver);
  }
  
  static void __exit kempld_exit(void)
diff --git a/drivers/mfd/lp8788.c b/drivers/mfd/lp8788.c

index 768d556..c223d2c 100644 (file)
--- a/drivers/mfd/lp8788.c
+++ b/drivers/mfd/lp8788.c
@@ -34,7 +34,7 @@
         .num_resources = num_resource,                          \
  }
  
-static struct resource chg_irqs[] = {
+static const struct resource chg_irqs[] = {
         /* Charger Interrupts */
         {
                 .start = LP8788_INT_CHG_INPUT_STATE,
@@ -58,7 +58,7 @@ static struct resource chg_irqs[] = {
         },
  };
  
-static struct resource rtc_irqs[] = {
+static const struct resource rtc_irqs[] = {
         {
                 .start = LP8788_INT_RTC_ALARM1,
                 .end   = LP8788_INT_RTC_ALARM2,
diff --git a/drivers/mfd/madera-core.c b/drivers/mfd/madera-core.c

index 4ed6ad8..a2abc00 100644 (file)
--- a/drivers/mfd/madera-core.c
+++ b/drivers/mfd/madera-core.c
@@ -38,6 +38,9 @@
  #define MADERA_RESET_MIN_US    2000
  #define MADERA_RESET_MAX_US    3000
  
+#define ERRATA_DCVDD_MIN_US    10000
+#define ERRATA_DCVDD_MAX_US    15000
+
  static const char * const madera_core_supplies[] = {
         "AVDD",
         "DBVDD1",
@@ -291,6 +294,9 @@ static int __maybe_unused madera_runtime_resume(struct device *dev)
  
         dev_dbg(dev, "Leaving sleep mode\n");
  
+       if (!madera->reset_errata)
+               madera_enable_hard_reset(madera);
+
         ret = regulator_enable(madera->dcvdd);
         if (ret) {
                 dev_err(dev, "Failed to enable DCVDD: %d\n", ret);
@@ -300,7 +306,22 @@ static int __maybe_unused madera_runtime_resume(struct device *dev)
         regcache_cache_only(madera->regmap, false);
         regcache_cache_only(madera->regmap_32bit, false);
  
-       usleep_range(MADERA_RESET_MIN_US, MADERA_RESET_MAX_US);
+       if (madera->reset_errata)
+               usleep_range(ERRATA_DCVDD_MIN_US, ERRATA_DCVDD_MAX_US);
+       else
+               madera_disable_hard_reset(madera);
+
+       if (!madera->pdata.reset || madera->reset_errata) {
+               ret = madera_wait_for_boot(madera);
+               if (ret)
+                       goto err;
+
+               ret = madera_soft_reset(madera);
+               if (ret) {
+                       dev_err(dev, "Failed to reset: %d\n", ret);
+                       goto err;
+               }
+       }
  
         ret = madera_wait_for_boot(madera);
         if (ret)
@@ -489,6 +510,8 @@ int madera_dev_init(struct madera *madera)
          */
         switch (madera->type) {
         case CS47L15:
+               madera->reset_errata = true;
+               break;
         case CS47L35:
         case CS47L90:
         case CS47L91:
@@ -539,13 +562,19 @@ int madera_dev_init(struct madera *madera)
                 goto err_dcvdd;
         }
  
+       if (madera->reset_errata)
+               madera_disable_hard_reset(madera);
+
         ret = regulator_enable(madera->dcvdd);
         if (ret) {
                 dev_err(dev, "Failed to enable DCVDD: %d\n", ret);
                 goto err_enable;
         }
  
-       madera_disable_hard_reset(madera);
+       if (madera->reset_errata)
+               usleep_range(ERRATA_DCVDD_MIN_US, ERRATA_DCVDD_MAX_US);
+       else
+               madera_disable_hard_reset(madera);
  
         regcache_cache_only(madera->regmap, false);
         regcache_cache_only(madera->regmap_32bit, false);
@@ -653,7 +682,7 @@ int madera_dev_init(struct madera *madera)
          * It looks like a device we support. If we don't have a hard reset
          * we can now attempt a soft reset.
          */
-       if (!madera->pdata.reset) {
+       if (!madera->pdata.reset || madera->reset_errata) {
                 ret = madera_soft_reset(madera);
                 if (ret)
                         goto err_reset;
diff --git a/drivers/mfd/max77650.c b/drivers/mfd/max77650.c

index 60e07ac..777485a 100644 (file)
--- a/drivers/mfd/max77650.c
+++ b/drivers/mfd/max77650.c
@@ -221,7 +221,7 @@ MODULE_DEVICE_TABLE(of, max77650_of_match);
  static struct i2c_driver max77650_i2c_driver = {
         .driver = {
                 .name = "max77650",
-               .of_match_table = of_match_ptr(max77650_of_match),
+               .of_match_table = max77650_of_match,
         },
         .probe_new = max77650_i2c_probe,
  };
diff --git a/drivers/mfd/max77686.c b/drivers/mfd/max77686.c

index 71faf50..2ad554b 100644 (file)
--- a/drivers/mfd/max77686.c
+++ b/drivers/mfd/max77686.c
@@ -270,7 +270,7 @@ static struct i2c_driver max77686_i2c_driver = {
         .driver = {
                    .name = "max77686",
                    .pm = &max77686_pm,
-                  .of_match_table = of_match_ptr(max77686_pmic_dt_match),
+                  .of_match_table = max77686_pmic_dt_match,
         },
         .probe_new = max77686_i2c_probe,
  };
diff --git a/drivers/mfd/max8925-core.c b/drivers/mfd/max8925-core.c

index 0af6833..eb3f061 100644 (file)
--- a/drivers/mfd/max8925-core.c
+++ b/drivers/mfd/max8925-core.c
@@ -19,7 +19,7 @@
  #include <linux/of.h>
  #include <linux/of_platform.h>
  
-static struct resource bk_resources[] = {
+static const struct resource bk_resources[] = {
         { 0x84, 0x84, "mode control", IORESOURCE_REG, },
         { 0x85, 0x85, "control",      IORESOURCE_REG, },
  };
@@ -33,7 +33,7 @@ static struct mfd_cell bk_devs[] = {
         },
  };
  
-static struct resource touch_resources[] = {
+static const struct resource touch_resources[] = {
         {
                 .name   = "max8925-tsc",
                 .start  = MAX8925_TSC_IRQ,
@@ -51,7 +51,7 @@ static const struct mfd_cell touch_devs[] = {
         },
  };
  
-static struct resource power_supply_resources[] = {
+static const struct resource power_supply_resources[] = {
         {
                 .name   = "max8925-power",
                 .start  = MAX8925_CHG_IRQ1,
@@ -69,7 +69,7 @@ static const struct mfd_cell power_devs[] = {
         },
  };
  
-static struct resource rtc_resources[] = {
+static const struct resource rtc_resources[] = {
         {
                 .name   = "max8925-rtc",
                 .start  = MAX8925_IRQ_RTC_ALARM0,
@@ -87,7 +87,7 @@ static const struct mfd_cell rtc_devs[] = {
         },
  };
  
-static struct resource onkey_resources[] = {
+static const struct resource onkey_resources[] = {
         {
                 .name   = "max8925-onkey",
                 .start  = MAX8925_IRQ_GPM_SW_R,
@@ -110,95 +110,95 @@ static const struct mfd_cell onkey_devs[] = {
         },
  };
  
-static struct resource sd1_resources[] = {
+static const struct resource sd1_resources[] = {
         {0x06, 0x06, "sdv", IORESOURCE_REG, },
  };
  
-static struct resource sd2_resources[] = {
+static const struct resource sd2_resources[] = {
         {0x09, 0x09, "sdv", IORESOURCE_REG, },
  };
  
-static struct resource sd3_resources[] = {
+static const struct resource sd3_resources[] = {
         {0x0c, 0x0c, "sdv", IORESOURCE_REG, },
  };
  
-static struct resource ldo1_resources[] = {
+static const struct resource ldo1_resources[] = {
         {0x1a, 0x1a, "ldov", IORESOURCE_REG, },
  };
  
-static struct resource ldo2_resources[] = {
+static const struct resource ldo2_resources[] = {
         {0x1e, 0x1e, "ldov", IORESOURCE_REG, },
  };
  
-static struct resource ldo3_resources[] = {
+static const struct resource ldo3_resources[] = {
         {0x22, 0x22, "ldov", IORESOURCE_REG, },
  };
  
-static struct resource ldo4_resources[] = {
+static const struct resource ldo4_resources[] = {
         {0x26, 0x26, "ldov", IORESOURCE_REG, },
  };
  
-static struct resource ldo5_resources[] = {
+static const struct resource ldo5_resources[] = {
         {0x2a, 0x2a, "ldov", IORESOURCE_REG, },
  };
  
-static struct resource ldo6_resources[] = {
+static const struct resource ldo6_resources[] = {
         {0x2e, 0x2e, "ldov", IORESOURCE_REG, },
  };
  
-static struct resource ldo7_resources[] = {
+static const struct resource ldo7_resources[] = {
         {0x32, 0x32, "ldov", IORESOURCE_REG, },
  };
  
-static struct resource ldo8_resources[] = {
+static const struct resource ldo8_resources[] = {
         {0x36, 0x36, "ldov", IORESOURCE_REG, },
  };
  
-static struct resource ldo9_resources[] = {
+static const struct resource ldo9_resources[] = {
         {0x3a, 0x3a, "ldov", IORESOURCE_REG, },
  };
  
-static struct resource ldo10_resources[] = {
+static const struct resource ldo10_resources[] = {
         {0x3e, 0x3e, "ldov", IORESOURCE_REG, },
  };
  
-static struct resource ldo11_resources[] = {
+static const struct resource ldo11_resources[] = {
         {0x42, 0x42, "ldov", IORESOURCE_REG, },
  };
  
-static struct resource ldo12_resources[] = {
+static const struct resource ldo12_resources[] = {
         {0x46, 0x46, "ldov", IORESOURCE_REG, },
  };
  
-static struct resource ldo13_resources[] = {
+static const struct resource ldo13_resources[] = {
         {0x4a, 0x4a, "ldov", IORESOURCE_REG, },
  };
  
-static struct resource ldo14_resources[] = {
+static const struct resource ldo14_resources[] = {
         {0x4e, 0x4e, "ldov", IORESOURCE_REG, },
  };
  
-static struct resource ldo15_resources[] = {
+static const struct resource ldo15_resources[] = {
         {0x52, 0x52, "ldov", IORESOURCE_REG, },
  };
  
-static struct resource ldo16_resources[] = {
+static const struct resource ldo16_resources[] = {
         {0x12, 0x12, "ldov", IORESOURCE_REG, },
  };
  
-static struct resource ldo17_resources[] = {
+static const struct resource ldo17_resources[] = {
         {0x16, 0x16, "ldov", IORESOURCE_REG, },
  };
  
-static struct resource ldo18_resources[] = {
+static const struct resource ldo18_resources[] = {
         {0x74, 0x74, "ldov", IORESOURCE_REG, },
  };
  
-static struct resource ldo19_resources[] = {
+static const struct resource ldo19_resources[] = {
         {0x5e, 0x5e, "ldov", IORESOURCE_REG, },
  };
  
-static struct resource ldo20_resources[] = {
+static const struct resource ldo20_resources[] = {
         {0x9e, 0x9e, "ldov", IORESOURCE_REG, },
  };
  
diff --git a/drivers/mfd/motorola-cpcap.c b/drivers/mfd/motorola-cpcap.c

index 2283d88..30d82bf 100644 (file)
--- a/drivers/mfd/motorola-cpcap.c
+++ b/drivers/mfd/motorola-cpcap.c
@@ -97,7 +97,7 @@ static struct regmap_irq_chip cpcap_irq_chip[CPCAP_NR_IRQ_CHIPS] = {
                 .ack_base = CPCAP_REG_MI1,
                 .mask_base = CPCAP_REG_MIM1,
                 .use_ack = true,
-               .ack_invert = true,
+               .clear_ack = true,
         },
         {
                 .name = "cpcap-m2",
@@ -106,7 +106,7 @@ static struct regmap_irq_chip cpcap_irq_chip[CPCAP_NR_IRQ_CHIPS] = {
                 .ack_base = CPCAP_REG_MI2,
                 .mask_base = CPCAP_REG_MIM2,
                 .use_ack = true,
-               .ack_invert = true,
+               .clear_ack = true,
         },
         {
                 .name = "cpcap1-4",
@@ -115,7 +115,7 @@ static struct regmap_irq_chip cpcap_irq_chip[CPCAP_NR_IRQ_CHIPS] = {
                 .ack_base = CPCAP_REG_INT1,
                 .mask_base = CPCAP_REG_INTM1,
                 .use_ack = true,
-               .ack_invert = true,
+               .clear_ack = true,
         },
  };
  
diff --git a/drivers/mfd/mt6397-core.c b/drivers/mfd/mt6397-core.c

index f6cd8a6..7518d74 100644 (file)
--- a/drivers/mfd/mt6397-core.c
+++ b/drivers/mfd/mt6397-core.c
@@ -237,7 +237,7 @@ static struct platform_driver mt6397_driver = {
         .probe = mt6397_probe,
         .driver = {
                 .name = "mt6397",
-               .of_match_table = of_match_ptr(mt6397_of_match),
+               .of_match_table = mt6397_of_match,
         },
         .id_table = mt6397_id,
  };
diff --git a/drivers/mfd/qcom-spmi-pmic.c b/drivers/mfd/qcom-spmi-pmic.c

index 1df1a27..a35d5cf 100644 (file)
--- a/drivers/mfd/qcom-spmi-pmic.c
+++ b/drivers/mfd/qcom-spmi-pmic.c
@@ -36,6 +36,8 @@
  #define PM8998_SUBTYPE         0x14
  #define PMI8998_SUBTYPE                0x15
  #define PM8005_SUBTYPE         0x18
+#define PM660L_SUBTYPE         0x1A
+#define PM660_SUBTYPE          0x1B
  
  static const struct of_device_id pmic_spmi_id_table[] = {
         { .compatible = "qcom,spmi-pmic", .data = (void *)COMMON_SUBTYPE },
@@ -57,6 +59,8 @@ static const struct of_device_id pmic_spmi_id_table[] = {
         { .compatible = "qcom,pm8998",    .data = (void *)PM8998_SUBTYPE },
         { .compatible = "qcom,pmi8998",   .data = (void *)PMI8998_SUBTYPE },
         { .compatible = "qcom,pm8005",    .data = (void *)PM8005_SUBTYPE },
+       { .compatible = "qcom,pm660l",    .data = (void *)PM660L_SUBTYPE },
+       { .compatible = "qcom,pm660",     .data = (void *)PM660_SUBTYPE },
         { }
  };
  
diff --git a/drivers/mfd/rdc321x-southbridge.c b/drivers/mfd/rdc321x-southbridge.c

index fbb1faf..c44a762 100644 (file)
--- a/drivers/mfd/rdc321x-southbridge.c
+++ b/drivers/mfd/rdc321x-southbridge.c
@@ -14,7 +14,7 @@
  
  static struct rdc321x_wdt_pdata rdc321x_wdt_pdata;
  
-static struct resource rdc321x_wdt_resource[] = {
+static const struct resource rdc321x_wdt_resource[] = {
         {
                 .name   = "wdt-reg",
                 .start  = RDC321X_WDT_CTRL,
@@ -27,7 +27,7 @@ static struct rdc321x_gpio_pdata rdc321x_gpio_pdata = {
         .max_gpios      = RDC321X_NUM_GPIO,
  };
  
-static struct resource rdc321x_gpio_resources[] = {
+static const struct resource rdc321x_gpio_resources[] = {
         {
                 .name   = "gpio-reg1",
                 .start  = RDC321X_GPIO_CTRL_REG1,
diff --git a/drivers/mfd/retu-mfd.c b/drivers/mfd/retu-mfd.c

index e7d27b7..c748fd2 100644 (file)
--- a/drivers/mfd/retu-mfd.c
+++ b/drivers/mfd/retu-mfd.c
@@ -45,7 +45,7 @@ struct retu_dev {
         struct regmap_irq_chip_data     *irq_data;
  };
  
-static struct resource retu_pwrbutton_res[] = {
+static const struct resource retu_pwrbutton_res[] = {
         {
                 .name   = "retu-pwrbutton",
                 .start  = RETU_INT_PWR,
@@ -84,7 +84,7 @@ static struct regmap_irq_chip retu_irq_chip = {
  /* Retu device registered for the power off. */
  static struct retu_dev *retu_pm_power_off;
  
-static struct resource tahvo_usb_res[] = {
+static const struct resource tahvo_usb_res[] = {
         {
                 .name   = "tahvo-usb",
                 .start  = TAHVO_INT_VBUS,
diff --git a/drivers/mfd/rk808.c b/drivers/mfd/rk808.c

index d109b9f..ad923dd 100644 (file)
--- a/drivers/mfd/rk808.c
+++ b/drivers/mfd/rk808.c
@@ -107,20 +107,20 @@ static const struct regmap_config rk817_regmap_config = {
         .volatile_reg = rk817_is_volatile_reg,
  };
  
-static struct resource rtc_resources[] = {
+static const struct resource rtc_resources[] = {
         DEFINE_RES_IRQ(RK808_IRQ_RTC_ALARM),
  };
  
-static struct resource rk817_rtc_resources[] = {
+static const struct resource rk817_rtc_resources[] = {
         DEFINE_RES_IRQ(RK817_IRQ_RTC_ALARM),
  };
  
-static struct resource rk805_key_resources[] = {
+static const struct resource rk805_key_resources[] = {
         DEFINE_RES_IRQ(RK805_IRQ_PWRON_RISE),
         DEFINE_RES_IRQ(RK805_IRQ_PWRON_FALL),
  };
  
-static struct resource rk817_pwrkey_resources[] = {
+static const struct resource rk817_pwrkey_resources[] = {
         DEFINE_RES_IRQ(RK817_IRQ_PWRON_RISE),
         DEFINE_RES_IRQ(RK817_IRQ_PWRON_FALL),
  };
diff --git a/drivers/mfd/rt5033.c b/drivers/mfd/rt5033.c

index 48381d9..f1236a9 100644 (file)
--- a/drivers/mfd/rt5033.c
+++ b/drivers/mfd/rt5033.c
@@ -122,7 +122,7 @@ MODULE_DEVICE_TABLE(of, rt5033_dt_match);
  static struct i2c_driver rt5033_driver = {
         .driver = {
                 .name = "rt5033",
-               .of_match_table = of_match_ptr(rt5033_dt_match),
+               .of_match_table = rt5033_dt_match,
         },
         .probe = rt5033_i2c_probe,
         .id_table = rt5033_i2c_id,
diff --git a/drivers/mfd/stmfx.c b/drivers/mfd/stmfx.c

index 5e680bf..e095a39 100644 (file)
--- a/drivers/mfd/stmfx.c
+++ b/drivers/mfd/stmfx.c
@@ -329,11 +329,11 @@ static int stmfx_chip_init(struct i2c_client *client)
  
         stmfx->vdd = devm_regulator_get_optional(&client->dev, "vdd");
         ret = PTR_ERR_OR_ZERO(stmfx->vdd);
-       if (ret == -ENODEV) {
-               stmfx->vdd = NULL;
-       } else {
-               return dev_err_probe(&client->dev, ret,
-                                    "Failed to get VDD regulator\n");
+       if (ret) {
+               if (ret == -ENODEV)
+                       stmfx->vdd = NULL;
+               else
+                       return dev_err_probe(&client->dev, ret, "Failed to get VDD regulator\n");
         }
  
         if (stmfx->vdd) {
@@ -548,7 +548,7 @@ MODULE_DEVICE_TABLE(of, stmfx_of_match);
  static struct i2c_driver stmfx_driver = {
         .driver = {
                 .name = "stmfx-core",
-               .of_match_table = of_match_ptr(stmfx_of_match),
+               .of_match_table = stmfx_of_match,
                 .pm = &stmfx_dev_pm_ops,
         },
         .probe = stmfx_probe,
diff --git a/drivers/mfd/stmpe.c b/drivers/mfd/stmpe.c

index 1aee3b3..90f3292 100644 (file)
--- a/drivers/mfd/stmpe.c
+++ b/drivers/mfd/stmpe.c
@@ -312,7 +312,7 @@ EXPORT_SYMBOL_GPL(stmpe_set_altfunc);
   * GPIO (all variants)
   */
  
-static struct resource stmpe_gpio_resources[] = {
+static const struct resource stmpe_gpio_resources[] = {
         /* Start and end filled dynamically */
         {
                 .flags  = IORESOURCE_IRQ,
@@ -336,7 +336,7 @@ static const struct mfd_cell stmpe_gpio_cell_noirq = {
   * Keypad (1601, 2401, 2403)
   */
  
-static struct resource stmpe_keypad_resources[] = {
+static const struct resource stmpe_keypad_resources[] = {
         {
                 .name   = "KEYPAD",
                 .flags  = IORESOURCE_IRQ,
@@ -357,7 +357,7 @@ static const struct mfd_cell stmpe_keypad_cell = {
  /*
   * PWM (1601, 2401, 2403)
   */
-static struct resource stmpe_pwm_resources[] = {
+static const struct resource stmpe_pwm_resources[] = {
         {
                 .name   = "PWM0",
                 .flags  = IORESOURCE_IRQ,
@@ -445,7 +445,7 @@ static struct stmpe_variant_info stmpe801_noirq = {
   * Touchscreen (STMPE811 or STMPE610)
   */
  
-static struct resource stmpe_ts_resources[] = {
+static const struct resource stmpe_ts_resources[] = {
         {
                 .name   = "TOUCH_DET",
                 .flags  = IORESOURCE_IRQ,
@@ -467,7 +467,7 @@ static const struct mfd_cell stmpe_ts_cell = {
   * ADC (STMPE811)
   */
  
-static struct resource stmpe_adc_resources[] = {
+static const struct resource stmpe_adc_resources[] = {
         {
                 .name   = "STMPE_TEMP_SENS",
                 .flags  = IORESOURCE_IRQ,
diff --git a/drivers/mfd/sun4i-gpadc.c b/drivers/mfd/sun4i-gpadc.c

index b346fbc..cfe14d9 100644 (file)
--- a/drivers/mfd/sun4i-gpadc.c
+++ b/drivers/mfd/sun4i-gpadc.c
@@ -18,7 +18,7 @@
  #define ARCH_SUN5I_A13 1
  #define ARCH_SUN6I_A31 2
  
-static struct resource adc_resources[] = {
+static const struct resource adc_resources[] = {
         DEFINE_RES_IRQ_NAMED(SUN4I_GPADC_IRQ_FIFO_DATA, "FIFO_DATA_PENDING"),
         DEFINE_RES_IRQ_NAMED(SUN4I_GPADC_IRQ_TEMP_DATA, "TEMP_DATA_PENDING"),
  };
@@ -166,7 +166,7 @@ static int sun4i_gpadc_probe(struct platform_device *pdev)
  static struct platform_driver sun4i_gpadc_driver = {
         .driver = {
                 .name = "sun4i-gpadc",
-               .of_match_table = of_match_ptr(sun4i_gpadc_of_match),
+               .of_match_table = sun4i_gpadc_of_match,
         },
         .probe = sun4i_gpadc_probe,
  };
diff --git a/drivers/mfd/syscon.c b/drivers/mfd/syscon.c

index ca46579..c6f139b 100644 (file)
--- a/drivers/mfd/syscon.c
+++ b/drivers/mfd/syscon.c
@@ -255,6 +255,24 @@ struct regmap *syscon_regmap_lookup_by_phandle_args(struct device_node *np,
  }
  EXPORT_SYMBOL_GPL(syscon_regmap_lookup_by_phandle_args);
  
+/*
+ * It behaves the same as syscon_regmap_lookup_by_phandle() except where
+ * there is no regmap phandle. In this case, instead of returning -ENODEV,
+ * the function returns NULL.
+ */
+struct regmap *syscon_regmap_lookup_by_phandle_optional(struct device_node *np,
+                                       const char *property)
+{
+       struct regmap *regmap;
+
+       regmap = syscon_regmap_lookup_by_phandle(np, property);
+       if (IS_ERR(regmap) && PTR_ERR(regmap) == -ENODEV)
+               return NULL;
+
+       return regmap;
+}
+EXPORT_SYMBOL_GPL(syscon_regmap_lookup_by_phandle_optional);
+
  static int syscon_probe(struct platform_device *pdev)
  {
         struct device *dev = &pdev->dev;
diff --git a/drivers/mfd/tc3589x.c b/drivers/mfd/tc3589x.c

index 7882a37..7614f8f 100644 (file)
--- a/drivers/mfd/tc3589x.c
+++ b/drivers/mfd/tc3589x.c
@@ -141,7 +141,7 @@ out:
  }
  EXPORT_SYMBOL_GPL(tc3589x_set_bits);
  
-static struct resource gpio_resources[] = {
+static const struct resource gpio_resources[] = {
         {
                 .start  = TC3589x_INT_GPIIRQ,
                 .end    = TC3589x_INT_GPIIRQ,
@@ -149,7 +149,7 @@ static struct resource gpio_resources[] = {
         },
  };
  
-static struct resource keypad_resources[] = {
+static const struct resource keypad_resources[] = {
         {
                 .start  = TC3589x_INT_KBDIRQ,
                 .end    = TC3589x_INT_KBDIRQ,
diff --git a/drivers/mfd/tc6387xb.c b/drivers/mfd/tc6387xb.c

index c66a701..e846e4d 100644 (file)
--- a/drivers/mfd/tc6387xb.c
+++ b/drivers/mfd/tc6387xb.c
@@ -25,7 +25,7 @@ struct tc6387xb {
         struct resource rscr;
  };
  
-static struct resource tc6387xb_mmc_resources[] = {
+static const struct resource tc6387xb_mmc_resources[] = {
         {
                 .start = 0x800,
                 .end   = 0x9ff,
diff --git a/drivers/mfd/tc6393xb.c b/drivers/mfd/tc6393xb.c

index 05d5059..3d5b14c 100644 (file)
--- a/drivers/mfd/tc6393xb.c
+++ b/drivers/mfd/tc6393xb.c
@@ -133,7 +133,7 @@ static int tc6393xb_nand_enable(struct platform_device *nand)
         return 0;
  }
  
-static struct resource tc6393xb_nand_resources[] = {
+static const struct resource tc6393xb_nand_resources[] = {
         {
                 .start  = 0x1000,
                 .end    = 0x1007,
@@ -151,7 +151,7 @@ static struct resource tc6393xb_nand_resources[] = {
         },
  };
  
-static struct resource tc6393xb_mmc_resources[] = {
+static const struct resource tc6393xb_mmc_resources[] = {
         {
                 .start  = 0x800,
                 .end    = 0x9ff,
@@ -192,7 +192,7 @@ static const struct resource tc6393xb_ohci_resources[] = {
         },
  };
  
-static struct resource tc6393xb_fb_resources[] = {
+static const struct resource tc6393xb_fb_resources[] = {
         {
                 .start  = 0x5000,
                 .end    = 0x51ff,
diff --git a/drivers/mfd/tps65090.c b/drivers/mfd/tps65090.c

index 6cdf6c3..bd62353 100644 (file)
--- a/drivers/mfd/tps65090.c
+++ b/drivers/mfd/tps65090.c
@@ -38,7 +38,7 @@
  #define TPS65090_INT2_MASK_OVERLOAD_FET6               6
  #define TPS65090_INT2_MASK_OVERLOAD_FET7               7
  
-static struct resource charger_resources[] = {
+static const struct resource charger_resources[] = {
         {
                 .start  = TPS65090_IRQ_VAC_STATUS_CHANGE,
                 .end    = TPS65090_IRQ_VAC_STATUS_CHANGE,
diff --git a/drivers/mfd/tps65217.c b/drivers/mfd/tps65217.c

index 2d9c282..8027b0a 100644 (file)
--- a/drivers/mfd/tps65217.c
+++ b/drivers/mfd/tps65217.c
@@ -33,12 +33,12 @@
  #include <linux/mfd/core.h>
  #include <linux/mfd/tps65217.h>
  
-static struct resource charger_resources[] = {
+static const struct resource charger_resources[] = {
         DEFINE_RES_IRQ_NAMED(TPS65217_IRQ_AC, "AC"),
         DEFINE_RES_IRQ_NAMED(TPS65217_IRQ_USB, "USB"),
  };
  
-static struct resource pb_resources[] = {
+static const struct resource pb_resources[] = {
         DEFINE_RES_IRQ_NAMED(TPS65217_IRQ_PB, "PB"),
  };
  
diff --git a/drivers/mfd/tps6586x.c b/drivers/mfd/tps6586x.c

index c365977..c9303d3 100644 (file)
--- a/drivers/mfd/tps6586x.c
+++ b/drivers/mfd/tps6586x.c
@@ -92,7 +92,7 @@ static const struct tps6586x_irq_data tps6586x_irqs[] = {
         [TPS6586X_INT_RTC_ALM2] = TPS6586X_IRQ(TPS6586X_INT_MASK4, 1 << 1),
  };
  
-static struct resource tps6586x_rtc_resources[] = {
+static const struct resource tps6586x_rtc_resources[] = {
         {
                 .start  = TPS6586X_INT_RTC_ALM1,
                 .end    = TPS6586X_INT_RTC_ALM1,
diff --git a/drivers/mfd/tps65910.c b/drivers/mfd/tps65910.c

index 1195902..6e105cc 100644 (file)
--- a/drivers/mfd/tps65910.c
+++ b/drivers/mfd/tps65910.c
@@ -21,7 +21,7 @@
  #include <linux/of.h>
  #include <linux/of_device.h>
  
-static struct resource rtc_resources[] = {
+static const struct resource rtc_resources[] = {
         {
                 .start  = TPS65910_IRQ_RTC_ALARM,
                 .end    = TPS65910_IRQ_RTC_ALARM,
@@ -292,8 +292,8 @@ static int tps65910_ck32k_init(struct tps65910 *tps65910,
         if (!pmic_pdata->en_ck32k_xtal)
                 return 0;
  
-       ret = tps65910_reg_clear_bits(tps65910, TPS65910_DEVCTRL,
-                                               DEVCTRL_CK32K_CTRL_MASK);
+       ret = regmap_clear_bits(tps65910->regmap, TPS65910_DEVCTRL,
+                               DEVCTRL_CK32K_CTRL_MASK);
         if (ret < 0) {
                 dev_err(tps65910->dev, "clear ck32k_ctrl failed: %d\n", ret);
                 return ret;
@@ -314,17 +314,17 @@ static int tps65910_sleepinit(struct tps65910 *tps65910,
         dev = tps65910->dev;
  
         /* enabling SLEEP device state */
-       ret = tps65910_reg_set_bits(tps65910, TPS65910_DEVCTRL,
-                               DEVCTRL_DEV_SLP_MASK);
+       ret = regmap_set_bits(tps65910->regmap, TPS65910_DEVCTRL,
+                             DEVCTRL_DEV_SLP_MASK);
         if (ret < 0) {
                 dev_err(dev, "set dev_slp failed: %d\n", ret);
                 goto err_sleep_init;
         }
  
         if (pmic_pdata->slp_keepon.therm_keepon) {
-               ret = tps65910_reg_set_bits(tps65910,
-                               TPS65910_SLEEP_KEEP_RES_ON,
-                               SLEEP_KEEP_RES_ON_THERM_KEEPON_MASK);
+               ret = regmap_set_bits(tps65910->regmap,
+                                     TPS65910_SLEEP_KEEP_RES_ON,
+                                     SLEEP_KEEP_RES_ON_THERM_KEEPON_MASK);
                 if (ret < 0) {
                         dev_err(dev, "set therm_keepon failed: %d\n", ret);
                         goto disable_dev_slp;
@@ -332,9 +332,9 @@ static int tps65910_sleepinit(struct tps65910 *tps65910,
         }
  
         if (pmic_pdata->slp_keepon.clkout32k_keepon) {
-               ret = tps65910_reg_set_bits(tps65910,
-                               TPS65910_SLEEP_KEEP_RES_ON,
-                               SLEEP_KEEP_RES_ON_CLKOUT32K_KEEPON_MASK);
+               ret = regmap_set_bits(tps65910->regmap,
+                                     TPS65910_SLEEP_KEEP_RES_ON,
+                                     SLEEP_KEEP_RES_ON_CLKOUT32K_KEEPON_MASK);
                 if (ret < 0) {
                         dev_err(dev, "set clkout32k_keepon failed: %d\n", ret);
                         goto disable_dev_slp;
@@ -342,9 +342,9 @@ static int tps65910_sleepinit(struct tps65910 *tps65910,
         }
  
         if (pmic_pdata->slp_keepon.i2chs_keepon) {
-               ret = tps65910_reg_set_bits(tps65910,
-                               TPS65910_SLEEP_KEEP_RES_ON,
-                               SLEEP_KEEP_RES_ON_I2CHS_KEEPON_MASK);
+               ret = regmap_set_bits(tps65910->regmap,
+                                     TPS65910_SLEEP_KEEP_RES_ON,
+                                     SLEEP_KEEP_RES_ON_I2CHS_KEEPON_MASK);
                 if (ret < 0) {
                         dev_err(dev, "set i2chs_keepon failed: %d\n", ret);
                         goto disable_dev_slp;
@@ -354,8 +354,8 @@ static int tps65910_sleepinit(struct tps65910 *tps65910,
         return 0;
  
  disable_dev_slp:
-       tps65910_reg_clear_bits(tps65910, TPS65910_DEVCTRL,
-                               DEVCTRL_DEV_SLP_MASK);
+       regmap_clear_bits(tps65910->regmap, TPS65910_DEVCTRL,
+                         DEVCTRL_DEV_SLP_MASK);
  
  err_sleep_init:
         return ret;
@@ -436,12 +436,18 @@ static void tps65910_power_off(void)
  
         tps65910 = dev_get_drvdata(&tps65910_i2c_client->dev);
  
-       if (tps65910_reg_set_bits(tps65910, TPS65910_DEVCTRL,
-                       DEVCTRL_PWR_OFF_MASK) < 0)
+       /*
+        * The PWR_OFF bit needs to be set separately, before transitioning
+        * to the OFF state. It enables the "sequential" power-off mode on
+        * TPS65911, it's a NO-OP on TPS65910.
+        */
+       if (regmap_set_bits(tps65910->regmap, TPS65910_DEVCTRL,
+                           DEVCTRL_PWR_OFF_MASK) < 0)
                 return;
  
-       tps65910_reg_clear_bits(tps65910, TPS65910_DEVCTRL,
-                       DEVCTRL_DEV_ON_MASK);
+       regmap_update_bits(tps65910->regmap, TPS65910_DEVCTRL,
+                          DEVCTRL_DEV_OFF_MASK | DEVCTRL_DEV_ON_MASK,
+                          DEVCTRL_DEV_OFF_MASK);
  }
  
  static int tps65910_i2c_probe(struct i2c_client *i2c,
diff --git a/drivers/mfd/tps65911-comparator.c b/drivers/mfd/tps65911-comparator.c

index 2334cd6..8f42100 100644 (file)
--- a/drivers/mfd/tps65911-comparator.c
+++ b/drivers/mfd/tps65911-comparator.c
@@ -69,7 +69,7 @@ static int comp_threshold_set(struct tps65910 *tps65910, int id, int voltage)
                 return -EINVAL;
  
         val = index << 1;
-       ret = tps65910_reg_write(tps65910, tps_comp.reg, val);
+       ret = regmap_write(tps65910->regmap, tps_comp.reg, val);
  
         return ret;
  }
@@ -80,7 +80,7 @@ static int comp_threshold_get(struct tps65910 *tps65910, int id)
         unsigned int val;
         int ret;
  
-       ret = tps65910_reg_read(tps65910, tps_comp.reg, &val);
+       ret = regmap_read(tps65910->regmap, tps_comp.reg, &val);
         if (ret < 0)
                 return ret;
  
diff --git a/drivers/mfd/tps80031.c b/drivers/mfd/tps80031.c

index 907452b..902e335 100644 (file)
--- a/drivers/mfd/tps80031.c
+++ b/drivers/mfd/tps80031.c
@@ -34,7 +34,7 @@
  #include <linux/regmap.h>
  #include <linux/slab.h>
  
-static struct resource tps80031_rtc_resources[] = {
+static const struct resource tps80031_rtc_resources[] = {
         {
                 .start = TPS80031_INT_RTC_ALARM,
                 .end = TPS80031_INT_RTC_ALARM,
diff --git a/drivers/mfd/twl6030-irq.c b/drivers/mfd/twl6030-irq.c

index aff2dfb..97af6c2 100644 (file)
--- a/drivers/mfd/twl6030-irq.c
+++ b/drivers/mfd/twl6030-irq.c
@@ -356,7 +356,7 @@ static const struct irq_domain_ops twl6030_irq_domain_ops = {
         .xlate  = irq_domain_xlate_onetwocell,
  };
  
-static const struct of_device_id twl6030_of_match[] = {
+static const struct of_device_id twl6030_of_match[] __maybe_unused = {
         {.compatible = "ti,twl6030", &twl6030_interrupt_mapping},
         {.compatible = "ti,twl6032", &twl6032_interrupt_mapping},
         { },
diff --git a/drivers/mfd/wm831x-core.c b/drivers/mfd/wm831x-core.c

index b0344e5..bcef08f 100644 (file)
--- a/drivers/mfd/wm831x-core.c
+++ b/drivers/mfd/wm831x-core.c
@@ -616,7 +616,7 @@ int wm831x_set_bits(struct wm831x *wm831x, unsigned short reg,
  }
  EXPORT_SYMBOL_GPL(wm831x_set_bits);
  
-static struct resource wm831x_dcdc1_resources[] = {
+static const struct resource wm831x_dcdc1_resources[] = {
         {
                 .start = WM831X_DC1_CONTROL_1,
                 .end   = WM831X_DC1_DVS_CONTROL,
@@ -637,7 +637,7 @@ static struct resource wm831x_dcdc1_resources[] = {
  };
  
  
-static struct resource wm831x_dcdc2_resources[] = {
+static const struct resource wm831x_dcdc2_resources[] = {
         {
                 .start = WM831X_DC2_CONTROL_1,
                 .end   = WM831X_DC2_DVS_CONTROL,
@@ -657,7 +657,7 @@ static struct resource wm831x_dcdc2_resources[] = {
         },
  };
  
-static struct resource wm831x_dcdc3_resources[] = {
+static const struct resource wm831x_dcdc3_resources[] = {
         {
                 .start = WM831X_DC3_CONTROL_1,
                 .end   = WM831X_DC3_SLEEP_CONTROL,
@@ -671,7 +671,7 @@ static struct resource wm831x_dcdc3_resources[] = {
         },
  };
  
-static struct resource wm831x_dcdc4_resources[] = {
+static const struct resource wm831x_dcdc4_resources[] = {
         {
                 .start = WM831X_DC4_CONTROL,
                 .end   = WM831X_DC4_SLEEP_CONTROL,
@@ -685,7 +685,7 @@ static struct resource wm831x_dcdc4_resources[] = {
         },
  };
  
-static struct resource wm8320_dcdc4_buck_resources[] = {
+static const struct resource wm8320_dcdc4_buck_resources[] = {
         {
                 .start = WM831X_DC4_CONTROL,
                 .end   = WM832X_DC4_SLEEP_CONTROL,
@@ -699,7 +699,7 @@ static struct resource wm8320_dcdc4_buck_resources[] = {
         },
  };
  
-static struct resource wm831x_gpio_resources[] = {
+static const struct resource wm831x_gpio_resources[] = {
         {
                 .start = WM831X_IRQ_GPIO_1,
                 .end   = WM831X_IRQ_GPIO_16,
@@ -707,7 +707,7 @@ static struct resource wm831x_gpio_resources[] = {
         },
  };
  
-static struct resource wm831x_isink1_resources[] = {
+static const struct resource wm831x_isink1_resources[] = {
         {
                 .start = WM831X_CURRENT_SINK_1,
                 .end   = WM831X_CURRENT_SINK_1,
@@ -720,7 +720,7 @@ static struct resource wm831x_isink1_resources[] = {
         },
  };
  
-static struct resource wm831x_isink2_resources[] = {
+static const struct resource wm831x_isink2_resources[] = {
         {
                 .start = WM831X_CURRENT_SINK_2,
                 .end   = WM831X_CURRENT_SINK_2,
@@ -733,7 +733,7 @@ static struct resource wm831x_isink2_resources[] = {
         },
  };
  
-static struct resource wm831x_ldo1_resources[] = {
+static const struct resource wm831x_ldo1_resources[] = {
         {
                 .start = WM831X_LDO1_CONTROL,
                 .end   = WM831X_LDO1_SLEEP_CONTROL,
@@ -747,7 +747,7 @@ static struct resource wm831x_ldo1_resources[] = {
         },
  };
  
-static struct resource wm831x_ldo2_resources[] = {
+static const struct resource wm831x_ldo2_resources[] = {
         {
                 .start = WM831X_LDO2_CONTROL,
                 .end   = WM831X_LDO2_SLEEP_CONTROL,
@@ -761,7 +761,7 @@ static struct resource wm831x_ldo2_resources[] = {
         },
  };
  
-static struct resource wm831x_ldo3_resources[] = {
+static const struct resource wm831x_ldo3_resources[] = {
         {
                 .start = WM831X_LDO3_CONTROL,
                 .end   = WM831X_LDO3_SLEEP_CONTROL,
@@ -775,7 +775,7 @@ static struct resource wm831x_ldo3_resources[] = {
         },
  };
  
-static struct resource wm831x_ldo4_resources[] = {
+static const struct resource wm831x_ldo4_resources[] = {
         {
                 .start = WM831X_LDO4_CONTROL,
                 .end   = WM831X_LDO4_SLEEP_CONTROL,
@@ -789,7 +789,7 @@ static struct resource wm831x_ldo4_resources[] = {
         },
  };
  
-static struct resource wm831x_ldo5_resources[] = {
+static const struct resource wm831x_ldo5_resources[] = {
         {
                 .start = WM831X_LDO5_CONTROL,
                 .end   = WM831X_LDO5_SLEEP_CONTROL,
@@ -803,7 +803,7 @@ static struct resource wm831x_ldo5_resources[] = {
         },
  };
  
-static struct resource wm831x_ldo6_resources[] = {
+static const struct resource wm831x_ldo6_resources[] = {
         {
                 .start = WM831X_LDO6_CONTROL,
                 .end   = WM831X_LDO6_SLEEP_CONTROL,
@@ -817,7 +817,7 @@ static struct resource wm831x_ldo6_resources[] = {
         },
  };
  
-static struct resource wm831x_ldo7_resources[] = {
+static const struct resource wm831x_ldo7_resources[] = {
         {
                 .start = WM831X_LDO7_CONTROL,
                 .end   = WM831X_LDO7_SLEEP_CONTROL,
@@ -831,7 +831,7 @@ static struct resource wm831x_ldo7_resources[] = {
         },
  };
  
-static struct resource wm831x_ldo8_resources[] = {
+static const struct resource wm831x_ldo8_resources[] = {
         {
                 .start = WM831X_LDO8_CONTROL,
                 .end   = WM831X_LDO8_SLEEP_CONTROL,
@@ -845,7 +845,7 @@ static struct resource wm831x_ldo8_resources[] = {
         },
  };
  
-static struct resource wm831x_ldo9_resources[] = {
+static const struct resource wm831x_ldo9_resources[] = {
         {
                 .start = WM831X_LDO9_CONTROL,
                 .end   = WM831X_LDO9_SLEEP_CONTROL,
@@ -859,7 +859,7 @@ static struct resource wm831x_ldo9_resources[] = {
         },
  };
  
-static struct resource wm831x_ldo10_resources[] = {
+static const struct resource wm831x_ldo10_resources[] = {
         {
                 .start = WM831X_LDO10_CONTROL,
                 .end   = WM831X_LDO10_SLEEP_CONTROL,
@@ -873,7 +873,7 @@ static struct resource wm831x_ldo10_resources[] = {
         },
  };
  
-static struct resource wm831x_ldo11_resources[] = {
+static const struct resource wm831x_ldo11_resources[] = {
         {
                 .start = WM831X_LDO11_ON_CONTROL,
                 .end   = WM831X_LDO11_SLEEP_CONTROL,
@@ -881,7 +881,7 @@ static struct resource wm831x_ldo11_resources[] = {
         },
  };
  
-static struct resource wm831x_on_resources[] = {
+static const struct resource wm831x_on_resources[] = {
         {
                 .start = WM831X_IRQ_ON,
                 .end   = WM831X_IRQ_ON,
@@ -890,7 +890,7 @@ static struct resource wm831x_on_resources[] = {
  };
  
  
-static struct resource wm831x_power_resources[] = {
+static const struct resource wm831x_power_resources[] = {
         {
                 .name = "SYSLO",
                 .start = WM831X_IRQ_PPM_SYSLO,
@@ -959,7 +959,7 @@ static struct resource wm831x_power_resources[] = {
         },
  };
  
-static struct resource wm831x_rtc_resources[] = {
+static const struct resource wm831x_rtc_resources[] = {
         {
                 .name = "PER",
                 .start = WM831X_IRQ_RTC_PER,
@@ -974,7 +974,7 @@ static struct resource wm831x_rtc_resources[] = {
         },
  };
  
-static struct resource wm831x_status1_resources[] = {
+static const struct resource wm831x_status1_resources[] = {
         {
                 .start = WM831X_STATUS_LED_1,
                 .end   = WM831X_STATUS_LED_1,
@@ -982,7 +982,7 @@ static struct resource wm831x_status1_resources[] = {
         },
  };
  
-static struct resource wm831x_status2_resources[] = {
+static const struct resource wm831x_status2_resources[] = {
         {
                 .start = WM831X_STATUS_LED_2,
                 .end   = WM831X_STATUS_LED_2,
@@ -990,7 +990,7 @@ static struct resource wm831x_status2_resources[] = {
         },
  };
  
-static struct resource wm831x_touch_resources[] = {
+static const struct resource wm831x_touch_resources[] = {
         {
                 .name = "TCHPD",
                 .start = WM831X_IRQ_TCHPD,
@@ -1005,7 +1005,7 @@ static struct resource wm831x_touch_resources[] = {
         },
  };
  
-static struct resource wm831x_wdt_resources[] = {
+static const struct resource wm831x_wdt_resources[] = {
         {
                 .start = WM831X_IRQ_WDOG_TO,
                 .end   = WM831X_IRQ_WDOG_TO,
diff --git a/drivers/mfd/wm8994-core.c b/drivers/mfd/wm8994-core.c

index 3b2b93c..7b1d270 100644 (file)
--- a/drivers/mfd/wm8994-core.c
+++ b/drivers/mfd/wm8994-core.c
@@ -40,7 +40,7 @@ static const struct mfd_cell wm8994_regulator_devs[] = {
         },
  };
  
-static struct resource wm8994_codec_resources[] = {
+static const struct resource wm8994_codec_resources[] = {
         {
                 .start = WM8994_IRQ_TEMP_SHUT,
                 .end   = WM8994_IRQ_TEMP_WARN,
@@ -48,7 +48,7 @@ static struct resource wm8994_codec_resources[] = {
         },
  };
  
-static struct resource wm8994_gpio_resources[] = {
+static const struct resource wm8994_gpio_resources[] = {
         {
                 .start = WM8994_IRQ_GPIO(1),
                 .end   = WM8994_IRQ_GPIO(11),
@@ -683,7 +683,7 @@ static struct i2c_driver wm8994_i2c_driver = {
         .driver = {
                 .name = "wm8994",
                 .pm = &wm8994_pm_ops,
-               .of_match_table = of_match_ptr(wm8994_of_match),
+               .of_match_table = wm8994_of_match,
         },
         .probe = wm8994_i2c_probe,
         .remove = wm8994_i2c_remove,
diff --git a/include/linux/mfd/madera/core.h b/include/linux/mfd/madera/core.h

index ad2c138..03a8a78 100644 (file)
--- a/include/linux/mfd/madera/core.h
+++ b/include/linux/mfd/madera/core.h
@@ -186,6 +186,7 @@ struct madera {
         struct regulator_bulk_data core_supplies[MADERA_MAX_CORE_SUPPLIES];
         struct regulator *dcvdd;
         bool internal_dcvdd;
+       bool reset_errata;
  
         struct madera_pdata pdata;
  
diff --git a/include/linux/mfd/madera/registers.h b/include/linux/mfd/madera/registers.h

index fe909d1..b44aeb4 100644 (file)
--- a/include/linux/mfd/madera/registers.h
+++ b/include/linux/mfd/madera/registers.h
@@ -1286,566 +1286,438 @@
  /* (0x0000)  Software_Reset */
  #define MADERA_SW_RST_DEV_ID1_MASK                     0xFFFF
  #define MADERA_SW_RST_DEV_ID1_SHIFT                         0
-#define MADERA_SW_RST_DEV_ID1_WIDTH                        16
  
  /* (0x0001)  Hardware_Revision */
  #define MADERA_HW_REVISION_MASK                                0x00FF
  #define MADERA_HW_REVISION_SHIFT                            0
-#define MADERA_HW_REVISION_WIDTH                            8
  
  /* (0x0020)  Tone_Generator_1 */
  #define MADERA_TONE2_ENA                               0x0002
  #define MADERA_TONE2_ENA_MASK                          0x0002
  #define MADERA_TONE2_ENA_SHIFT                              1
-#define MADERA_TONE2_ENA_WIDTH                              1
  #define MADERA_TONE1_ENA                               0x0001
  #define MADERA_TONE1_ENA_MASK                          0x0001
  #define MADERA_TONE1_ENA_SHIFT                              0
-#define MADERA_TONE1_ENA_WIDTH                              1
  
  /* (0x0021)  Tone_Generator_2 */
  #define MADERA_TONE1_LVL_0_MASK                                0xFFFF
  #define MADERA_TONE1_LVL_0_SHIFT                            0
-#define MADERA_TONE1_LVL_0_WIDTH                           16
  
  /* (0x0022)  Tone_Generator_3 */
  #define MADERA_TONE1_LVL_MASK                          0x00FF
  #define MADERA_TONE1_LVL_SHIFT                              0
-#define MADERA_TONE1_LVL_WIDTH                              8
  
  /* (0x0023)  Tone_Generator_4 */
  #define MADERA_TONE2_LVL_0_MASK                                0xFFFF
  #define MADERA_TONE2_LVL_0_SHIFT                            0
-#define MADERA_TONE2_LVL_0_WIDTH                           16
  
  /* (0x0024)  Tone_Generator_5 */
  #define MADERA_TONE2_LVL_MASK                          0x00FF
  #define MADERA_TONE2_LVL_SHIFT                              0
-#define MADERA_TONE2_LVL_WIDTH                              8
  
  /* (0x0030)  PWM_Drive_1 */
  #define MADERA_PWM2_ENA                                        0x0002
  #define MADERA_PWM2_ENA_MASK                           0x0002
  #define MADERA_PWM2_ENA_SHIFT                               1
-#define MADERA_PWM2_ENA_WIDTH                               1
  #define MADERA_PWM1_ENA                                        0x0001
  #define MADERA_PWM1_ENA_MASK                           0x0001
  #define MADERA_PWM1_ENA_SHIFT                               0
-#define MADERA_PWM1_ENA_WIDTH                               1
  
  /* (0x00A0)  Comfort_Noise_Generator */
  #define MADERA_NOISE_GEN_ENA                           0x0020
  #define MADERA_NOISE_GEN_ENA_MASK                      0x0020
  #define MADERA_NOISE_GEN_ENA_SHIFT                          5
-#define MADERA_NOISE_GEN_ENA_WIDTH                          1
  #define MADERA_NOISE_GEN_GAIN_MASK                     0x001F
  #define MADERA_NOISE_GEN_GAIN_SHIFT                         0
-#define MADERA_NOISE_GEN_GAIN_WIDTH                         5
  
  /* (0x0100)  Clock_32k_1 */
  #define MADERA_CLK_32K_ENA                             0x0040
  #define MADERA_CLK_32K_ENA_MASK                                0x0040
  #define MADERA_CLK_32K_ENA_SHIFT                            6
-#define MADERA_CLK_32K_ENA_WIDTH                            1
  #define MADERA_CLK_32K_SRC_MASK                                0x0003
  #define MADERA_CLK_32K_SRC_SHIFT                            0
-#define MADERA_CLK_32K_SRC_WIDTH                            2
  
  /* (0x0101)  System_Clock_1 */
  #define MADERA_SYSCLK_FRAC                             0x8000
  #define MADERA_SYSCLK_FRAC_MASK                                0x8000
  #define MADERA_SYSCLK_FRAC_SHIFT                           15
-#define MADERA_SYSCLK_FRAC_WIDTH                            1
  #define MADERA_SYSCLK_FREQ_MASK                                0x0700
  #define MADERA_SYSCLK_FREQ_SHIFT                            8
-#define MADERA_SYSCLK_FREQ_WIDTH                            3
  #define MADERA_SYSCLK_ENA                              0x0040
  #define MADERA_SYSCLK_ENA_MASK                         0x0040
  #define MADERA_SYSCLK_ENA_SHIFT                                     6
-#define MADERA_SYSCLK_ENA_WIDTH                                     1
  #define MADERA_SYSCLK_SRC_MASK                         0x000F
  #define MADERA_SYSCLK_SRC_SHIFT                                     0
-#define MADERA_SYSCLK_SRC_WIDTH                                     4
  
  /* (0x0102)  Sample_rate_1 */
  #define MADERA_SAMPLE_RATE_1_MASK                      0x001F
  #define MADERA_SAMPLE_RATE_1_SHIFT                          0
-#define MADERA_SAMPLE_RATE_1_WIDTH                          5
  
  /* (0x0103)  Sample_rate_2 */
  #define MADERA_SAMPLE_RATE_2_MASK                      0x001F
  #define MADERA_SAMPLE_RATE_2_SHIFT                          0
-#define MADERA_SAMPLE_RATE_2_WIDTH                          5
  
  /* (0x0104)  Sample_rate_3 */
  #define MADERA_SAMPLE_RATE_3_MASK                      0x001F
  #define MADERA_SAMPLE_RATE_3_SHIFT                          0
-#define MADERA_SAMPLE_RATE_3_WIDTH                          5
  
  /* (0x0112)  Async_clock_1 */
  #define MADERA_ASYNC_CLK_FREQ_MASK                     0x0700
  #define MADERA_ASYNC_CLK_FREQ_SHIFT                         8
-#define MADERA_ASYNC_CLK_FREQ_WIDTH                         3
  #define MADERA_ASYNC_CLK_ENA                           0x0040
  #define MADERA_ASYNC_CLK_ENA_MASK                      0x0040
  #define MADERA_ASYNC_CLK_ENA_SHIFT                          6
-#define MADERA_ASYNC_CLK_ENA_WIDTH                          1
  #define MADERA_ASYNC_CLK_SRC_MASK                      0x000F
  #define MADERA_ASYNC_CLK_SRC_SHIFT                          0
-#define MADERA_ASYNC_CLK_SRC_WIDTH                          4
  
  /* (0x0113)  Async_sample_rate_1 */
  #define MADERA_ASYNC_SAMPLE_RATE_1_MASK                        0x001F
  #define MADERA_ASYNC_SAMPLE_RATE_1_SHIFT                    0
-#define MADERA_ASYNC_SAMPLE_RATE_1_WIDTH                    5
  
  /* (0x0114)  Async_sample_rate_2 */
  #define MADERA_ASYNC_SAMPLE_RATE_2_MASK                        0x001F
  #define MADERA_ASYNC_SAMPLE_RATE_2_SHIFT                    0
-#define MADERA_ASYNC_SAMPLE_RATE_2_WIDTH                    5
  
  /* (0x0120)  DSP_Clock_1 */
  #define MADERA_DSP_CLK_FREQ_LEGACY                     0x0700
  #define MADERA_DSP_CLK_FREQ_LEGACY_MASK                        0x0700
  #define MADERA_DSP_CLK_FREQ_LEGACY_SHIFT                    8
-#define MADERA_DSP_CLK_FREQ_LEGACY_WIDTH                    3
  #define MADERA_DSP_CLK_ENA                             0x0040
  #define MADERA_DSP_CLK_ENA_MASK                                0x0040
  #define MADERA_DSP_CLK_ENA_SHIFT                            6
-#define MADERA_DSP_CLK_ENA_WIDTH                            1
  #define MADERA_DSP_CLK_SRC                             0x000F
  #define MADERA_DSP_CLK_SRC_MASK                                0x000F
  #define MADERA_DSP_CLK_SRC_SHIFT                            0
-#define MADERA_DSP_CLK_SRC_WIDTH                            4
  
  /* (0x0122)  DSP_Clock_2 */
  #define MADERA_DSP_CLK_FREQ_MASK                       0x03FF
  #define MADERA_DSP_CLK_FREQ_SHIFT                           0
-#define MADERA_DSP_CLK_FREQ_WIDTH                          10
  
  /* (0x0149)  Output_system_clock */
  #define MADERA_OPCLK_ENA                               0x8000
  #define MADERA_OPCLK_ENA_MASK                          0x8000
  #define MADERA_OPCLK_ENA_SHIFT                             15
-#define MADERA_OPCLK_ENA_WIDTH                              1
  #define MADERA_OPCLK_DIV_MASK                          0x00F8
  #define MADERA_OPCLK_DIV_SHIFT                              3
-#define MADERA_OPCLK_DIV_WIDTH                              5
  #define MADERA_OPCLK_SEL_MASK                          0x0007
  #define MADERA_OPCLK_SEL_SHIFT                              0
-#define MADERA_OPCLK_SEL_WIDTH                              3
  
  /* (0x014A)  Output_async_clock */
  #define MADERA_OPCLK_ASYNC_ENA                         0x8000
  #define MADERA_OPCLK_ASYNC_ENA_MASK                    0x8000
  #define MADERA_OPCLK_ASYNC_ENA_SHIFT                       15
-#define MADERA_OPCLK_ASYNC_ENA_WIDTH                        1
  #define MADERA_OPCLK_ASYNC_DIV_MASK                    0x00F8
  #define MADERA_OPCLK_ASYNC_DIV_SHIFT                        3
-#define MADERA_OPCLK_ASYNC_DIV_WIDTH                        5
  #define MADERA_OPCLK_ASYNC_SEL_MASK                    0x0007
  #define MADERA_OPCLK_ASYNC_SEL_SHIFT                        0
-#define MADERA_OPCLK_ASYNC_SEL_WIDTH                        3
  
  /* (0x0171)  FLL1_Control_1 */
  #define CS47L92_FLL1_REFCLK_SRC_MASK                   0xF000
  #define CS47L92_FLL1_REFCLK_SRC_SHIFT                      12
-#define CS47L92_FLL1_REFCLK_SRC_WIDTH                       4
  #define MADERA_FLL1_HOLD_MASK                          0x0004
  #define MADERA_FLL1_HOLD_SHIFT                              2
-#define MADERA_FLL1_HOLD_WIDTH                              1
  #define MADERA_FLL1_FREERUN                            0x0002
  #define MADERA_FLL1_FREERUN_MASK                       0x0002
  #define MADERA_FLL1_FREERUN_SHIFT                           1
-#define MADERA_FLL1_FREERUN_WIDTH                           1
  #define MADERA_FLL1_ENA                                        0x0001
  #define MADERA_FLL1_ENA_MASK                           0x0001
  #define MADERA_FLL1_ENA_SHIFT                               0
-#define MADERA_FLL1_ENA_WIDTH                               1
  
  /* (0x0172)  FLL1_Control_2 */
  #define MADERA_FLL1_CTRL_UPD                           0x8000
  #define MADERA_FLL1_CTRL_UPD_MASK                      0x8000
  #define MADERA_FLL1_CTRL_UPD_SHIFT                         15
-#define MADERA_FLL1_CTRL_UPD_WIDTH                          1
  #define MADERA_FLL1_N_MASK                             0x03FF
  #define MADERA_FLL1_N_SHIFT                                 0
-#define MADERA_FLL1_N_WIDTH                                10
  
  /* (0x0173)  FLL1_Control_3 */
  #define MADERA_FLL1_THETA_MASK                         0xFFFF
  #define MADERA_FLL1_THETA_SHIFT                                     0
-#define MADERA_FLL1_THETA_WIDTH                                    16
  
  /* (0x0174)  FLL1_Control_4 */
  #define MADERA_FLL1_LAMBDA_MASK                                0xFFFF
  #define MADERA_FLL1_LAMBDA_SHIFT                            0
-#define MADERA_FLL1_LAMBDA_WIDTH                           16
  
  /* (0x0175)  FLL1_Control_5 */
  #define MADERA_FLL1_FRATIO_MASK                                0x0F00
  #define MADERA_FLL1_FRATIO_SHIFT                            8
-#define MADERA_FLL1_FRATIO_WIDTH                            4
  #define MADERA_FLL1_FB_DIV_MASK                                0x03FF
  #define MADERA_FLL1_FB_DIV_SHIFT                            0
-#define MADERA_FLL1_FB_DIV_WIDTH                           10
  
  /* (0x0176)  FLL1_Control_6 */
  #define MADERA_FLL1_REFCLK_DIV_MASK                    0x00C0
  #define MADERA_FLL1_REFCLK_DIV_SHIFT                        6
-#define MADERA_FLL1_REFCLK_DIV_WIDTH                        2
  #define MADERA_FLL1_REFCLK_SRC_MASK                    0x000F
  #define MADERA_FLL1_REFCLK_SRC_SHIFT                        0
-#define MADERA_FLL1_REFCLK_SRC_WIDTH                        4
  
  /* (0x0179)  FLL1_Control_7 */
  #define MADERA_FLL1_GAIN_MASK                          0x003c
  #define MADERA_FLL1_GAIN_SHIFT                              2
-#define MADERA_FLL1_GAIN_WIDTH                              4
  
  /* (0x017A)  FLL1_EFS_2 */
  #define MADERA_FLL1_PHASE_GAIN_MASK                    0xF000
  #define MADERA_FLL1_PHASE_GAIN_SHIFT                       12
-#define MADERA_FLL1_PHASE_GAIN_WIDTH                        4
  #define MADERA_FLL1_PHASE_ENA_MASK                     0x0800
  #define MADERA_FLL1_PHASE_ENA_SHIFT                        11
-#define MADERA_FLL1_PHASE_ENA_WIDTH                         1
  
  /* (0x017A)  FLL1_Control_10 */
  #define MADERA_FLL1_HP_MASK                            0xC000
  #define MADERA_FLL1_HP_SHIFT                               14
-#define MADERA_FLL1_HP_WIDTH                                2
  #define MADERA_FLL1_PHASEDET_ENA_MASK                  0x1000
  #define MADERA_FLL1_PHASEDET_ENA_SHIFT                     12
-#define MADERA_FLL1_PHASEDET_ENA_WIDTH                      1
  
  /* (0x017B)  FLL1_Control_11 */
  #define MADERA_FLL1_LOCKDET_THR_MASK                   0x001E
  #define MADERA_FLL1_LOCKDET_THR_SHIFT                       1
-#define MADERA_FLL1_LOCKDET_THR_WIDTH                       4
  #define MADERA_FLL1_LOCKDET_MASK                       0x0001
  #define MADERA_FLL1_LOCKDET_SHIFT                           0
-#define MADERA_FLL1_LOCKDET_WIDTH                           1
  
  /* (0x017D)  FLL1_Digital_Test_1 */
  #define MADERA_FLL1_SYNC_EFS_ENA_MASK                  0x0100
  #define MADERA_FLL1_SYNC_EFS_ENA_SHIFT                      8
-#define MADERA_FLL1_SYNC_EFS_ENA_WIDTH                      1
  #define MADERA_FLL1_CLK_VCO_FAST_SRC_MASK              0x0003
  #define MADERA_FLL1_CLK_VCO_FAST_SRC_SHIFT                  0
-#define MADERA_FLL1_CLK_VCO_FAST_SRC_WIDTH                  2
  
  /* (0x0181)  FLL1_Synchroniser_1 */
  #define MADERA_FLL1_SYNC_ENA                           0x0001
  #define MADERA_FLL1_SYNC_ENA_MASK                      0x0001
  #define MADERA_FLL1_SYNC_ENA_SHIFT                          0
-#define MADERA_FLL1_SYNC_ENA_WIDTH                          1
  
  /* (0x0182)  FLL1_Synchroniser_2 */
  #define MADERA_FLL1_SYNC_N_MASK                                0x03FF
  #define MADERA_FLL1_SYNC_N_SHIFT                            0
-#define MADERA_FLL1_SYNC_N_WIDTH                           10
  
  /* (0x0183)  FLL1_Synchroniser_3 */
  #define MADERA_FLL1_SYNC_THETA_MASK                    0xFFFF
  #define MADERA_FLL1_SYNC_THETA_SHIFT                        0
-#define MADERA_FLL1_SYNC_THETA_WIDTH                       16
  
  /* (0x0184)  FLL1_Synchroniser_4 */
  #define MADERA_FLL1_SYNC_LAMBDA_MASK                   0xFFFF
  #define MADERA_FLL1_SYNC_LAMBDA_SHIFT                       0
-#define MADERA_FLL1_SYNC_LAMBDA_WIDTH                      16
  
  /* (0x0185)  FLL1_Synchroniser_5 */
  #define MADERA_FLL1_SYNC_FRATIO_MASK                   0x0700
  #define MADERA_FLL1_SYNC_FRATIO_SHIFT                       8
-#define MADERA_FLL1_SYNC_FRATIO_WIDTH                       3
  
  /* (0x0186)  FLL1_Synchroniser_6 */
  #define MADERA_FLL1_SYNCCLK_DIV_MASK                   0x00C0
  #define MADERA_FLL1_SYNCCLK_DIV_SHIFT                       6
-#define MADERA_FLL1_SYNCCLK_DIV_WIDTH                       2
  #define MADERA_FLL1_SYNCCLK_SRC_MASK                   0x000F
  #define MADERA_FLL1_SYNCCLK_SRC_SHIFT                       0
-#define MADERA_FLL1_SYNCCLK_SRC_WIDTH                       4
  
  /* (0x0187)  FLL1_Synchroniser_7 */
  #define MADERA_FLL1_SYNC_GAIN_MASK                     0x003c
  #define MADERA_FLL1_SYNC_GAIN_SHIFT                         2
-#define MADERA_FLL1_SYNC_GAIN_WIDTH                         4
  #define MADERA_FLL1_SYNC_DFSAT                         0x0001
  #define MADERA_FLL1_SYNC_DFSAT_MASK                    0x0001
  #define MADERA_FLL1_SYNC_DFSAT_SHIFT                        0
-#define MADERA_FLL1_SYNC_DFSAT_WIDTH                        1
  
  /* (0x01D1)  FLL_AO_Control_1 */
  #define MADERA_FLL_AO_HOLD                             0x0004
  #define MADERA_FLL_AO_HOLD_MASK                                0x0004
  #define MADERA_FLL_AO_HOLD_SHIFT                            2
-#define MADERA_FLL_AO_HOLD_WIDTH                            1
  #define MADERA_FLL_AO_FREERUN                          0x0002
  #define MADERA_FLL_AO_FREERUN_MASK                     0x0002
  #define MADERA_FLL_AO_FREERUN_SHIFT                         1
-#define MADERA_FLL_AO_FREERUN_WIDTH                         1
  #define MADERA_FLL_AO_ENA                              0x0001
  #define MADERA_FLL_AO_ENA_MASK                         0x0001
  #define MADERA_FLL_AO_ENA_SHIFT                                     0
-#define MADERA_FLL_AO_ENA_WIDTH                                     1
  
  /* (0x01D2)  FLL_AO_Control_2 */
  #define MADERA_FLL_AO_CTRL_UPD                         0x8000
  #define MADERA_FLL_AO_CTRL_UPD_MASK                    0x8000
  #define MADERA_FLL_AO_CTRL_UPD_SHIFT                       15
-#define MADERA_FLL_AO_CTRL_UPD_WIDTH                        1
  
  /* (0x01D6)  FLL_AO_Control_6 */
  #define MADERA_FLL_AO_REFCLK_SRC_MASK                  0x000F
  #define MADERA_FLL_AO_REFCLK_SRC_SHIFT                      0
-#define MADERA_FLL_AO_REFCLK_SRC_WIDTH                      4
  
  /* (0x0200)  Mic_Charge_Pump_1 */
  #define MADERA_CPMIC_BYPASS                            0x0002
  #define MADERA_CPMIC_BYPASS_MASK                       0x0002
  #define MADERA_CPMIC_BYPASS_SHIFT                           1
-#define MADERA_CPMIC_BYPASS_WIDTH                           1
  #define MADERA_CPMIC_ENA                               0x0001
  #define MADERA_CPMIC_ENA_MASK                          0x0001
  #define MADERA_CPMIC_ENA_SHIFT                              0
-#define MADERA_CPMIC_ENA_WIDTH                              1
  
  /* (0x0210)  LDO1_Control_1 */
  #define MADERA_LDO1_VSEL_MASK                          0x07E0
  #define MADERA_LDO1_VSEL_SHIFT                              5
-#define MADERA_LDO1_VSEL_WIDTH                              6
  #define MADERA_LDO1_FAST                               0x0010
  #define MADERA_LDO1_FAST_MASK                          0x0010
  #define MADERA_LDO1_FAST_SHIFT                              4
-#define MADERA_LDO1_FAST_WIDTH                              1
  #define MADERA_LDO1_DISCH                              0x0004
  #define MADERA_LDO1_DISCH_MASK                         0x0004
  #define MADERA_LDO1_DISCH_SHIFT                                     2
-#define MADERA_LDO1_DISCH_WIDTH                                     1
  #define MADERA_LDO1_BYPASS                             0x0002
  #define MADERA_LDO1_BYPASS_MASK                                0x0002
  #define MADERA_LDO1_BYPASS_SHIFT                            1
-#define MADERA_LDO1_BYPASS_WIDTH                            1
  #define MADERA_LDO1_ENA                                        0x0001
  #define MADERA_LDO1_ENA_MASK                           0x0001
  #define MADERA_LDO1_ENA_SHIFT                               0
-#define MADERA_LDO1_ENA_WIDTH                               1
  
  /* (0x0213)  LDO2_Control_1 */
  #define MADERA_LDO2_VSEL_MASK                          0x07E0
  #define MADERA_LDO2_VSEL_SHIFT                              5
-#define MADERA_LDO2_VSEL_WIDTH                              6
  #define MADERA_LDO2_FAST                               0x0010
  #define MADERA_LDO2_FAST_MASK                          0x0010
  #define MADERA_LDO2_FAST_SHIFT                              4
-#define MADERA_LDO2_FAST_WIDTH                              1
  #define MADERA_LDO2_DISCH                              0x0004
  #define MADERA_LDO2_DISCH_MASK                         0x0004
  #define MADERA_LDO2_DISCH_SHIFT                                     2
-#define MADERA_LDO2_DISCH_WIDTH                                     1
  #define MADERA_LDO2_BYPASS                             0x0002
  #define MADERA_LDO2_BYPASS_MASK                                0x0002
  #define MADERA_LDO2_BYPASS_SHIFT                            1
-#define MADERA_LDO2_BYPASS_WIDTH                            1
  #define MADERA_LDO2_ENA                                        0x0001
  #define MADERA_LDO2_ENA_MASK                           0x0001
  #define MADERA_LDO2_ENA_SHIFT                               0
-#define MADERA_LDO2_ENA_WIDTH                               1
  
  /* (0x0218)  Mic_Bias_Ctrl_1 */
  #define MADERA_MICB1_EXT_CAP                           0x8000
  #define MADERA_MICB1_EXT_CAP_MASK                      0x8000
  #define MADERA_MICB1_EXT_CAP_SHIFT                         15
-#define MADERA_MICB1_EXT_CAP_WIDTH                          1
  #define MADERA_MICB1_LVL_MASK                          0x01E0
  #define MADERA_MICB1_LVL_SHIFT                              5
-#define MADERA_MICB1_LVL_WIDTH                              4
  #define MADERA_MICB1_ENA                               0x0001
  #define MADERA_MICB1_ENA_MASK                          0x0001
  #define MADERA_MICB1_ENA_SHIFT                              0
-#define MADERA_MICB1_ENA_WIDTH                              1
  
  /* (0x021C)  Mic_Bias_Ctrl_5 */
  #define MADERA_MICB1D_ENA                              0x1000
  #define MADERA_MICB1D_ENA_MASK                         0x1000
  #define MADERA_MICB1D_ENA_SHIFT                                    12
-#define MADERA_MICB1D_ENA_WIDTH                                     1
  #define MADERA_MICB1C_ENA                              0x0100
  #define MADERA_MICB1C_ENA_MASK                         0x0100
  #define MADERA_MICB1C_ENA_SHIFT                                     8
-#define MADERA_MICB1C_ENA_WIDTH                                     1
  #define MADERA_MICB1B_ENA                              0x0010
  #define MADERA_MICB1B_ENA_MASK                         0x0010
  #define MADERA_MICB1B_ENA_SHIFT                                     4
-#define MADERA_MICB1B_ENA_WIDTH                                     1
  #define MADERA_MICB1A_ENA                              0x0001
  #define MADERA_MICB1A_ENA_MASK                         0x0001
  #define MADERA_MICB1A_ENA_SHIFT                                     0
-#define MADERA_MICB1A_ENA_WIDTH                                     1
  
  /* (0x021E)  Mic_Bias_Ctrl_6 */
  #define MADERA_MICB2D_ENA                              0x1000
  #define MADERA_MICB2D_ENA_MASK                         0x1000
  #define MADERA_MICB2D_ENA_SHIFT                                    12
-#define MADERA_MICB2D_ENA_WIDTH                                     1
  #define MADERA_MICB2C_ENA                              0x0100
  #define MADERA_MICB2C_ENA_MASK                         0x0100
  #define MADERA_MICB2C_ENA_SHIFT                                     8
-#define MADERA_MICB2C_ENA_WIDTH                                     1
  #define MADERA_MICB2B_ENA                              0x0010
  #define MADERA_MICB2B_ENA_MASK                         0x0010
  #define MADERA_MICB2B_ENA_SHIFT                                     4
-#define MADERA_MICB2B_ENA_WIDTH                                     1
  #define MADERA_MICB2A_ENA                              0x0001
  #define MADERA_MICB2A_ENA_MASK                         0x0001
  #define MADERA_MICB2A_ENA_SHIFT                                     0
-#define MADERA_MICB2A_ENA_WIDTH                                     1
  
  /* (0x0225) - HP Ctrl 1L */
  #define MADERA_RMV_SHRT_HP1L                           0x4000
  #define MADERA_RMV_SHRT_HP1L_MASK                      0x4000
  #define MADERA_RMV_SHRT_HP1L_SHIFT                         14
-#define MADERA_RMV_SHRT_HP1L_WIDTH                          1
  #define MADERA_HP1L_FLWR                               0x0004
  #define MADERA_HP1L_FLWR_MASK                          0x0004
  #define MADERA_HP1L_FLWR_SHIFT                              2
-#define MADERA_HP1L_FLWR_WIDTH                              1
  #define MADERA_HP1L_SHRTI                              0x0002
  #define MADERA_HP1L_SHRTI_MASK                         0x0002
  #define MADERA_HP1L_SHRTI_SHIFT                                     1
-#define MADERA_HP1L_SHRTI_WIDTH                                     1
  #define MADERA_HP1L_SHRTO                              0x0001
  #define MADERA_HP1L_SHRTO_MASK                         0x0001
  #define MADERA_HP1L_SHRTO_SHIFT                                     0
-#define MADERA_HP1L_SHRTO_WIDTH                                     1
  
  /* (0x0226) - HP Ctrl 1R */
  #define MADERA_RMV_SHRT_HP1R                           0x4000
  #define MADERA_RMV_SHRT_HP1R_MASK                      0x4000
  #define MADERA_RMV_SHRT_HP1R_SHIFT                         14
-#define MADERA_RMV_SHRT_HP1R_WIDTH                          1
  #define MADERA_HP1R_FLWR                               0x0004
  #define MADERA_HP1R_FLWR_MASK                          0x0004
  #define MADERA_HP1R_FLWR_SHIFT                              2
-#define MADERA_HP1R_FLWR_WIDTH                              1
  #define MADERA_HP1R_SHRTI                              0x0002
  #define MADERA_HP1R_SHRTI_MASK                         0x0002
  #define MADERA_HP1R_SHRTI_SHIFT                                     1
-#define MADERA_HP1R_SHRTI_WIDTH                                     1
  #define MADERA_HP1R_SHRTO                              0x0001
  #define MADERA_HP1R_SHRTO_MASK                         0x0001
  #define MADERA_HP1R_SHRTO_SHIFT                                     0
-#define MADERA_HP1R_SHRTO_WIDTH                                     1
  
  /* (0x0293)  Accessory_Detect_Mode_1 */
  #define MADERA_ACCDET_SRC                              0x2000
  #define MADERA_ACCDET_SRC_MASK                         0x2000
  #define MADERA_ACCDET_SRC_SHIFT                                    13
-#define MADERA_ACCDET_SRC_WIDTH                                     1
  #define MADERA_ACCDET_POLARITY_INV_ENA                 0x0080
  #define MADERA_ACCDET_POLARITY_INV_ENA_MASK            0x0080
  #define MADERA_ACCDET_POLARITY_INV_ENA_SHIFT                7
-#define MADERA_ACCDET_POLARITY_INV_ENA_WIDTH                1
  #define MADERA_ACCDET_MODE_MASK                                0x0007
  #define MADERA_ACCDET_MODE_SHIFT                            0
-#define MADERA_ACCDET_MODE_WIDTH                            3
  
  /* (0x0299)  Headphone_Detect_0 */
  #define MADERA_HPD_GND_SEL                             0x0007
  #define MADERA_HPD_GND_SEL_MASK                                0x0007
  #define MADERA_HPD_GND_SEL_SHIFT                            0
-#define MADERA_HPD_GND_SEL_WIDTH                            3
  #define MADERA_HPD_SENSE_SEL                           0x00F0
  #define MADERA_HPD_SENSE_SEL_MASK                      0x00F0
  #define MADERA_HPD_SENSE_SEL_SHIFT                          4
-#define MADERA_HPD_SENSE_SEL_WIDTH                          4
  #define MADERA_HPD_FRC_SEL                             0x0F00
  #define MADERA_HPD_FRC_SEL_MASK                                0x0F00
  #define MADERA_HPD_FRC_SEL_SHIFT                            8
-#define MADERA_HPD_FRC_SEL_WIDTH                            4
  #define MADERA_HPD_OUT_SEL                             0x7000
  #define MADERA_HPD_OUT_SEL_MASK                                0x7000
  #define MADERA_HPD_OUT_SEL_SHIFT                           12
-#define MADERA_HPD_OUT_SEL_WIDTH                            3
  #define MADERA_HPD_OVD_ENA_SEL                         0x8000
  #define MADERA_HPD_OVD_ENA_SEL_MASK                    0x8000
  #define MADERA_HPD_OVD_ENA_SEL_SHIFT                       15
-#define MADERA_HPD_OVD_ENA_SEL_WIDTH                        1
  
  /* (0x029B)  Headphone_Detect_1 */
  #define MADERA_HP_IMPEDANCE_RANGE_MASK                 0x0600
  #define MADERA_HP_IMPEDANCE_RANGE_SHIFT                             9
-#define MADERA_HP_IMPEDANCE_RANGE_WIDTH                             2
  #define MADERA_HP_STEP_SIZE                            0x0100
  #define MADERA_HP_STEP_SIZE_MASK                       0x0100
  #define MADERA_HP_STEP_SIZE_SHIFT                           8
-#define MADERA_HP_STEP_SIZE_WIDTH                           1
  #define MADERA_HP_CLK_DIV_MASK                         0x0018
  #define MADERA_HP_CLK_DIV_SHIFT                                     3
-#define MADERA_HP_CLK_DIV_WIDTH                                     2
  #define MADERA_HP_RATE_MASK                            0x0006
  #define MADERA_HP_RATE_SHIFT                                1
-#define MADERA_HP_RATE_WIDTH                                2
  #define MADERA_HP_POLL                                 0x0001
  #define MADERA_HP_POLL_MASK                            0x0001
  #define MADERA_HP_POLL_SHIFT                                0
-#define MADERA_HP_POLL_WIDTH                                1
  
  /* (0x029C)  Headphone_Detect_2 */
  #define MADERA_HP_DONE_MASK                            0x8000
  #define MADERA_HP_DONE_SHIFT                               15
-#define MADERA_HP_DONE_WIDTH                                1
  #define MADERA_HP_LVL_MASK                             0x7FFF
  #define MADERA_HP_LVL_SHIFT                                 0
-#define MADERA_HP_LVL_WIDTH                                15
  
  /* (0x029D)  Headphone_Detect_3 */
  #define MADERA_HP_DACVAL_MASK                          0x03FF
  #define MADERA_HP_DACVAL_SHIFT                              0
-#define MADERA_HP_DACVAL_WIDTH                             10
  
  /* (0x029F) - Headphone Detect 5 */
  #define MADERA_HP_DACVAL_DOWN_MASK                     0x03FF
  #define MADERA_HP_DACVAL_DOWN_SHIFT                         0
-#define MADERA_HP_DACVAL_DOWN_WIDTH                        10
  
  /* (0x02A2)  Mic_Detect_1_Control_0 */
  #define MADERA_MICD1_GND_MASK                          0x0007
  #define MADERA_MICD1_GND_SHIFT                              0
-#define MADERA_MICD1_GND_WIDTH                              3
  #define MADERA_MICD1_SENSE_MASK                                0x00F0
  #define MADERA_MICD1_SENSE_SHIFT                            4
-#define MADERA_MICD1_SENSE_WIDTH                            4
  #define MADERA_MICD1_ADC_MODE_MASK                     0x8000
  #define MADERA_MICD1_ADC_MODE_SHIFT                        15
-#define MADERA_MICD1_ADC_MODE_WIDTH                         1
  
  /* (0x02A3)  Mic_Detect_1_Control_1 */
  #define MADERA_MICD_BIAS_STARTTIME_MASK                        0xF000
  #define MADERA_MICD_BIAS_STARTTIME_SHIFT                   12
-#define MADERA_MICD_BIAS_STARTTIME_WIDTH                    4
  #define MADERA_MICD_RATE_MASK                          0x0F00
  #define MADERA_MICD_RATE_SHIFT                              8
-#define MADERA_MICD_RATE_WIDTH                              4
  #define MADERA_MICD_BIAS_SRC_MASK                      0x00F0
  #define MADERA_MICD_BIAS_SRC_SHIFT                          4
-#define MADERA_MICD_BIAS_SRC_WIDTH                          4
  #define MADERA_MICD_DBTIME                             0x0002
  #define MADERA_MICD_DBTIME_MASK                                0x0002
  #define MADERA_MICD_DBTIME_SHIFT                            1
-#define MADERA_MICD_DBTIME_WIDTH                            1
  #define MADERA_MICD_ENA                                        0x0001
  #define MADERA_MICD_ENA_MASK                           0x0001
  #define MADERA_MICD_ENA_SHIFT                               0
-#define MADERA_MICD_ENA_WIDTH                               1
  
  /* (0x02A4)  Mic_Detect_1_Control_2 */
  #define MADERA_MICD_LVL_SEL_MASK                       0x00FF
  #define MADERA_MICD_LVL_SEL_SHIFT                           0
-#define MADERA_MICD_LVL_SEL_WIDTH                           8
  
  /* (0x02A5)  Mic_Detect_1_Control_3 */
  #define MADERA_MICD_LVL_0                              0x0004
@@ -1859,1746 +1731,1341 @@
  #define MADERA_MICD_LVL_8                              0x0400
  #define MADERA_MICD_LVL_MASK                           0x07FC
  #define MADERA_MICD_LVL_SHIFT                               2
-#define MADERA_MICD_LVL_WIDTH                               9
  #define MADERA_MICD_VALID                              0x0002
  #define MADERA_MICD_VALID_MASK                         0x0002
  #define MADERA_MICD_VALID_SHIFT                                     1
-#define MADERA_MICD_VALID_WIDTH                                     1
  #define MADERA_MICD_STS                                        0x0001
  #define MADERA_MICD_STS_MASK                           0x0001
  #define MADERA_MICD_STS_SHIFT                               0
-#define MADERA_MICD_STS_WIDTH                               1
  
  /* (0x02AB)  Mic_Detect_1_Control_4 */
  #define MADERA_MICDET_ADCVAL_DIFF_MASK                 0xFF00
  #define MADERA_MICDET_ADCVAL_DIFF_SHIFT                             8
-#define MADERA_MICDET_ADCVAL_DIFF_WIDTH                             8
  #define MADERA_MICDET_ADCVAL_MASK                      0x007F
  #define MADERA_MICDET_ADCVAL_SHIFT                          0
-#define MADERA_MICDET_ADCVAL_WIDTH                          7
  
  /* (0x02C6)  Micd_Clamp_control */
  #define MADERA_MICD_CLAMP_OVD                          0x0010
  #define MADERA_MICD_CLAMP_OVD_MASK                     0x0010
  #define MADERA_MICD_CLAMP_OVD_SHIFT                         4
-#define MADERA_MICD_CLAMP_OVD_WIDTH                         1
  #define MADERA_MICD_CLAMP_MODE_MASK                    0x000F
  #define MADERA_MICD_CLAMP_MODE_SHIFT                        0
-#define MADERA_MICD_CLAMP_MODE_WIDTH                        4
  
  /* (0x02C8)  GP_Switch_1 */
  #define MADERA_SW2_MODE_MASK                           0x000C
  #define MADERA_SW2_MODE_SHIFT                               2
-#define MADERA_SW2_MODE_WIDTH                               2
  #define MADERA_SW1_MODE_MASK                           0x0003
  #define MADERA_SW1_MODE_SHIFT                               0
-#define MADERA_SW1_MODE_WIDTH                               2
  
  /* (0x02D3)  Jack_detect_analogue */
  #define MADERA_JD2_ENA                                 0x0002
  #define MADERA_JD2_ENA_MASK                            0x0002
  #define MADERA_JD2_ENA_SHIFT                                1
-#define MADERA_JD2_ENA_WIDTH                                1
  #define MADERA_JD1_ENA                                 0x0001
  #define MADERA_JD1_ENA_MASK                            0x0001
  #define MADERA_JD1_ENA_SHIFT                                0
-#define MADERA_JD1_ENA_WIDTH                                1
  
  /* (0x0300)  Input_Enables */
  #define MADERA_IN6L_ENA                                        0x0800
  #define MADERA_IN6L_ENA_MASK                           0x0800
  #define MADERA_IN6L_ENA_SHIFT                              11
-#define MADERA_IN6L_ENA_WIDTH                               1
  #define MADERA_IN6R_ENA                                        0x0400
  #define MADERA_IN6R_ENA_MASK                           0x0400
  #define MADERA_IN6R_ENA_SHIFT                              10
-#define MADERA_IN6R_ENA_WIDTH                               1
  #define MADERA_IN5L_ENA                                        0x0200
  #define MADERA_IN5L_ENA_MASK                           0x0200
  #define MADERA_IN5L_ENA_SHIFT                               9
-#define MADERA_IN5L_ENA_WIDTH                               1
  #define MADERA_IN5R_ENA                                        0x0100
  #define MADERA_IN5R_ENA_MASK                           0x0100
  #define MADERA_IN5R_ENA_SHIFT                               8
-#define MADERA_IN5R_ENA_WIDTH                               1
  #define MADERA_IN4L_ENA                                        0x0080
  #define MADERA_IN4L_ENA_MASK                           0x0080
  #define MADERA_IN4L_ENA_SHIFT                               7
-#define MADERA_IN4L_ENA_WIDTH                               1
  #define MADERA_IN4R_ENA                                        0x0040
  #define MADERA_IN4R_ENA_MASK                           0x0040
  #define MADERA_IN4R_ENA_SHIFT                               6
-#define MADERA_IN4R_ENA_WIDTH                               1
  #define MADERA_IN3L_ENA                                        0x0020
  #define MADERA_IN3L_ENA_MASK                           0x0020
  #define MADERA_IN3L_ENA_SHIFT                               5
-#define MADERA_IN3L_ENA_WIDTH                               1
  #define MADERA_IN3R_ENA                                        0x0010
  #define MADERA_IN3R_ENA_MASK                           0x0010
  #define MADERA_IN3R_ENA_SHIFT                               4
-#define MADERA_IN3R_ENA_WIDTH                               1
  #define MADERA_IN2L_ENA                                        0x0008
  #define MADERA_IN2L_ENA_MASK                           0x0008
  #define MADERA_IN2L_ENA_SHIFT                               3
-#define MADERA_IN2L_ENA_WIDTH                               1
  #define MADERA_IN2R_ENA                                        0x0004
  #define MADERA_IN2R_ENA_MASK                           0x0004
  #define MADERA_IN2R_ENA_SHIFT                               2
-#define MADERA_IN2R_ENA_WIDTH                               1
  #define MADERA_IN1L_ENA                                        0x0002
  #define MADERA_IN1L_ENA_MASK                           0x0002
  #define MADERA_IN1L_ENA_SHIFT                               1
-#define MADERA_IN1L_ENA_WIDTH                               1
  #define MADERA_IN1R_ENA                                        0x0001
  #define MADERA_IN1R_ENA_MASK                           0x0001
  #define MADERA_IN1R_ENA_SHIFT                               0
-#define MADERA_IN1R_ENA_WIDTH                               1
  
  /* (0x0308)  Input_Rate */
  #define MADERA_IN_RATE_MASK                            0xF800
  #define MADERA_IN_RATE_SHIFT                               11
-#define MADERA_IN_RATE_WIDTH                                5
  #define MADERA_IN_MODE_MASK                            0x0400
  #define MADERA_IN_MODE_SHIFT                               10
-#define MADERA_IN_MODE_WIDTH                                1
  
  /* (0x0309)  Input_Volume_Ramp */
  #define MADERA_IN_VD_RAMP_MASK                         0x0070
  #define MADERA_IN_VD_RAMP_SHIFT                                     4
-#define MADERA_IN_VD_RAMP_WIDTH                                     3
  #define MADERA_IN_VI_RAMP_MASK                         0x0007
  #define MADERA_IN_VI_RAMP_SHIFT                                     0
-#define MADERA_IN_VI_RAMP_WIDTH                                     3
  
  /* (0x030C)  HPF_Control */
  #define MADERA_IN_HPF_CUT_MASK                         0x0007
  #define MADERA_IN_HPF_CUT_SHIFT                                     0
-#define MADERA_IN_HPF_CUT_WIDTH                                     3
  
  /* (0x0310)  IN1L_Control */
  #define MADERA_IN1L_HPF_MASK                           0x8000
  #define MADERA_IN1L_HPF_SHIFT                              15
-#define MADERA_IN1L_HPF_WIDTH                               1
  #define MADERA_IN1_DMIC_SUP_MASK                       0x1800
  #define MADERA_IN1_DMIC_SUP_SHIFT                          11
-#define MADERA_IN1_DMIC_SUP_WIDTH                           2
  #define MADERA_IN1_MODE_MASK                           0x0400
  #define MADERA_IN1_MODE_SHIFT                              10
-#define MADERA_IN1_MODE_WIDTH                               1
  #define MADERA_IN1L_PGA_VOL_MASK                       0x00FE
  #define MADERA_IN1L_PGA_VOL_SHIFT                           1
-#define MADERA_IN1L_PGA_VOL_WIDTH                           7
  
  /* (0x0311)  ADC_Digital_Volume_1L */
  #define MADERA_IN1L_SRC_MASK                           0x4000
  #define MADERA_IN1L_SRC_SHIFT                              14
-#define MADERA_IN1L_SRC_WIDTH                               1
  #define MADERA_IN1L_SRC_SE_MASK                                0x2000
  #define MADERA_IN1L_SRC_SE_SHIFT                           13
-#define MADERA_IN1L_SRC_SE_WIDTH                            1
  #define MADERA_IN1L_LP_MODE                            0x0800
  #define MADERA_IN1L_LP_MODE_MASK                       0x0800
  #define MADERA_IN1L_LP_MODE_SHIFT                          11
-#define MADERA_IN1L_LP_MODE_WIDTH                           1
  #define MADERA_IN_VU                                   0x0200
  #define MADERA_IN_VU_MASK                              0x0200
  #define MADERA_IN_VU_SHIFT                                  9
-#define MADERA_IN_VU_WIDTH                                  1
  #define MADERA_IN1L_MUTE                               0x0100
  #define MADERA_IN1L_MUTE_MASK                          0x0100
  #define MADERA_IN1L_MUTE_SHIFT                              8
-#define MADERA_IN1L_MUTE_WIDTH                              1
  #define MADERA_IN1L_DIG_VOL_MASK                       0x00FF
  #define MADERA_IN1L_DIG_VOL_SHIFT                           0
-#define MADERA_IN1L_DIG_VOL_WIDTH                           8
  
  /* (0x0312)  DMIC1L_Control */
  #define MADERA_IN1_OSR_MASK                            0x0700
  #define MADERA_IN1_OSR_SHIFT                                8
-#define MADERA_IN1_OSR_WIDTH                                3
  
  /* (0x0313)  IN1L_Rate_Control */
  #define MADERA_IN1L_RATE_MASK                          0xF800
  #define MADERA_IN1L_RATE_SHIFT                             11
-#define MADERA_IN1L_RATE_WIDTH                              5
  
  /* (0x0314)  IN1R_Control */
  #define MADERA_IN1R_HPF_MASK                           0x8000
  #define MADERA_IN1R_HPF_SHIFT                              15
-#define MADERA_IN1R_HPF_WIDTH                               1
  #define MADERA_IN1R_PGA_VOL_MASK                       0x00FE
  #define MADERA_IN1R_PGA_VOL_SHIFT                           1
-#define MADERA_IN1R_PGA_VOL_WIDTH                           7
  #define MADERA_IN1_DMICCLK_SRC_MASK                    0x1800
  #define MADERA_IN1_DMICCLK_SRC_SHIFT                       11
-#define MADERA_IN1_DMICCLK_SRC_WIDTH                        2
  
  /* (0x0315)  ADC_Digital_Volume_1R */
  #define MADERA_IN1R_SRC_MASK                           0x4000
  #define MADERA_IN1R_SRC_SHIFT                              14
-#define MADERA_IN1R_SRC_WIDTH                               1
  #define MADERA_IN1R_SRC_SE_MASK                                0x2000
  #define MADERA_IN1R_SRC_SE_SHIFT                           13
-#define MADERA_IN1R_SRC_SE_WIDTH                            1
  #define MADERA_IN1R_LP_MODE                            0x0800
  #define MADERA_IN1R_LP_MODE_MASK                       0x0800
  #define MADERA_IN1R_LP_MODE_SHIFT                          11
-#define MADERA_IN1R_LP_MODE_WIDTH                           1
  #define MADERA_IN1R_MUTE                               0x0100
  #define MADERA_IN1R_MUTE_MASK                          0x0100
  #define MADERA_IN1R_MUTE_SHIFT                              8
-#define MADERA_IN1R_MUTE_WIDTH                              1
  #define MADERA_IN1R_DIG_VOL_MASK                       0x00FF
  #define MADERA_IN1R_DIG_VOL_SHIFT                           0
-#define MADERA_IN1R_DIG_VOL_WIDTH                           8
  
  /* (0x0317)  IN1R_Rate_Control */
  #define MADERA_IN1R_RATE_MASK                          0xF800
  #define MADERA_IN1R_RATE_SHIFT                             11
-#define MADERA_IN1R_RATE_WIDTH                              5
  
  /* (0x0318)  IN2L_Control */
  #define MADERA_IN2L_HPF_MASK                           0x8000
  #define MADERA_IN2L_HPF_SHIFT                              15
-#define MADERA_IN2L_HPF_WIDTH                               1
  #define MADERA_IN2_DMIC_SUP_MASK                       0x1800
  #define MADERA_IN2_DMIC_SUP_SHIFT                          11
-#define MADERA_IN2_DMIC_SUP_WIDTH                           2
  #define MADERA_IN2_MODE_MASK                           0x0400
  #define MADERA_IN2_MODE_SHIFT                              10
-#define MADERA_IN2_MODE_WIDTH                               1
  #define MADERA_IN2L_PGA_VOL_MASK                       0x00FE
  #define MADERA_IN2L_PGA_VOL_SHIFT                           1
-#define MADERA_IN2L_PGA_VOL_WIDTH                           7
  
  /* (0x0319)  ADC_Digital_Volume_2L */
  #define MADERA_IN2L_SRC_MASK                           0x4000
  #define MADERA_IN2L_SRC_SHIFT                              14
-#define MADERA_IN2L_SRC_WIDTH                               1
  #define MADERA_IN2L_SRC_SE_MASK                                0x2000
  #define MADERA_IN2L_SRC_SE_SHIFT                           13
-#define MADERA_IN2L_SRC_SE_WIDTH                            1
  #define MADERA_IN2L_LP_MODE                            0x0800
  #define MADERA_IN2L_LP_MODE_MASK                       0x0800
  #define MADERA_IN2L_LP_MODE_SHIFT                          11
-#define MADERA_IN2L_LP_MODE_WIDTH                           1
  #define MADERA_IN2L_MUTE                               0x0100
  #define MADERA_IN2L_MUTE_MASK                          0x0100
  #define MADERA_IN2L_MUTE_SHIFT                              8
-#define MADERA_IN2L_MUTE_WIDTH                              1
  #define MADERA_IN2L_DIG_VOL_MASK                       0x00FF
  #define MADERA_IN2L_DIG_VOL_SHIFT                           0
-#define MADERA_IN2L_DIG_VOL_WIDTH                           8
  
  /* (0x031A)  DMIC2L_Control */
  #define MADERA_IN2_OSR_MASK                            0x0700
  #define MADERA_IN2_OSR_SHIFT                                8
-#define MADERA_IN2_OSR_WIDTH                                3
  
  /* (0x031C)  IN2R_Control */
  #define MADERA_IN2R_HPF_MASK                           0x8000
  #define MADERA_IN2R_HPF_SHIFT                              15
-#define MADERA_IN2R_HPF_WIDTH                               1
  #define MADERA_IN2R_PGA_VOL_MASK                       0x00FE
  #define MADERA_IN2R_PGA_VOL_SHIFT                           1
-#define MADERA_IN2R_PGA_VOL_WIDTH                           7
  #define MADERA_IN2_DMICCLK_SRC_MASK                    0x1800
  #define MADERA_IN2_DMICCLK_SRC_SHIFT                       11
-#define MADERA_IN2_DMICCLK_SRC_WIDTH                        2
  
  /* (0x031D)  ADC_Digital_Volume_2R */
  #define MADERA_IN2R_SRC_MASK                           0x4000
  #define MADERA_IN2R_SRC_SHIFT                              14
-#define MADERA_IN2R_SRC_WIDTH                               1
  #define MADERA_IN2R_SRC_SE_MASK                                0x2000
  #define MADERA_IN2R_SRC_SE_SHIFT                           13
-#define MADERA_IN2R_SRC_SE_WIDTH                            1
  #define MADERA_IN2R_LP_MODE                            0x0800
  #define MADERA_IN2R_LP_MODE_MASK                       0x0800
  #define MADERA_IN2R_LP_MODE_SHIFT                          11
-#define MADERA_IN2R_LP_MODE_WIDTH                           1
  #define MADERA_IN2R_MUTE                               0x0100
  #define MADERA_IN2R_MUTE_MASK                          0x0100
  #define MADERA_IN2R_MUTE_SHIFT                              8
-#define MADERA_IN2R_MUTE_WIDTH                              1
  #define MADERA_IN2R_DIG_VOL_MASK                       0x00FF
  #define MADERA_IN2R_DIG_VOL_SHIFT                           0
-#define MADERA_IN2R_DIG_VOL_WIDTH                           8
  
  /* (0x0320)  IN3L_Control */
  #define MADERA_IN3L_HPF_MASK                           0x8000
  #define MADERA_IN3L_HPF_SHIFT                              15
-#define MADERA_IN3L_HPF_WIDTH                               1
  #define MADERA_IN3_DMIC_SUP_MASK                       0x1800
  #define MADERA_IN3_DMIC_SUP_SHIFT                          11
-#define MADERA_IN3_DMIC_SUP_WIDTH                           2
  #define MADERA_IN3_MODE_MASK                           0x0400
  #define MADERA_IN3_MODE_SHIFT                              10
-#define MADERA_IN3_MODE_WIDTH                               1
  #define MADERA_IN3L_PGA_VOL_MASK                       0x00FE
  #define MADERA_IN3L_PGA_VOL_SHIFT                           1
-#define MADERA_IN3L_PGA_VOL_WIDTH                           7
  
  /* (0x0321)  ADC_Digital_Volume_3L */
  #define MADERA_IN3L_MUTE                               0x0100
  #define MADERA_IN3L_MUTE_MASK                          0x0100
  #define MADERA_IN3L_MUTE_SHIFT                              8
-#define MADERA_IN3L_MUTE_WIDTH                              1
  #define MADERA_IN3L_DIG_VOL_MASK                       0x00FF
  #define MADERA_IN3L_DIG_VOL_SHIFT                           0
-#define MADERA_IN3L_DIG_VOL_WIDTH                           8
  
  /* (0x0322)  DMIC3L_Control */
  #define MADERA_IN3_OSR_MASK                            0x0700
  #define MADERA_IN3_OSR_SHIFT                                8
-#define MADERA_IN3_OSR_WIDTH                                3
  
  /* (0x0324)  IN3R_Control */
  #define MADERA_IN3R_HPF_MASK                           0x8000
  #define MADERA_IN3R_HPF_SHIFT                              15
-#define MADERA_IN3R_HPF_WIDTH                               1
  #define MADERA_IN3R_PGA_VOL_MASK                       0x00FE
  #define MADERA_IN3R_PGA_VOL_SHIFT                           1
-#define MADERA_IN3R_PGA_VOL_WIDTH                           7
  #define MADERA_IN3_DMICCLK_SRC_MASK                    0x1800
  #define MADERA_IN3_DMICCLK_SRC_SHIFT                       11
-#define MADERA_IN3_DMICCLK_SRC_WIDTH                        2
  
  /* (0x0325)  ADC_Digital_Volume_3R */
  #define MADERA_IN3R_MUTE                               0x0100
  #define MADERA_IN3R_MUTE_MASK                          0x0100
  #define MADERA_IN3R_MUTE_SHIFT                              8
-#define MADERA_IN3R_MUTE_WIDTH                              1
  #define MADERA_IN3R_DIG_VOL_MASK                       0x00FF
  #define MADERA_IN3R_DIG_VOL_SHIFT                           0
-#define MADERA_IN3R_DIG_VOL_WIDTH                           8
  
  /* (0x0328)  IN4L_Control */
  #define MADERA_IN4L_HPF_MASK                           0x8000
  #define MADERA_IN4L_HPF_SHIFT                              15
-#define MADERA_IN4L_HPF_WIDTH                               1
  #define MADERA_IN4_DMIC_SUP_MASK                       0x1800
  #define MADERA_IN4_DMIC_SUP_SHIFT                          11
-#define MADERA_IN4_DMIC_SUP_WIDTH                           2
  
  /* (0x0329)  ADC_Digital_Volume_4L */
  #define MADERA_IN4L_MUTE                               0x0100
  #define MADERA_IN4L_MUTE_MASK                          0x0100
  #define MADERA_IN4L_MUTE_SHIFT                              8
-#define MADERA_IN4L_MUTE_WIDTH                              1
  #define MADERA_IN4L_DIG_VOL_MASK                       0x00FF
  #define MADERA_IN4L_DIG_VOL_SHIFT                           0
-#define MADERA_IN4L_DIG_VOL_WIDTH                           8
  
  /* (0x032A)  DMIC4L_Control */
  #define MADERA_IN4_OSR_MASK                            0x0700
  #define MADERA_IN4_OSR_SHIFT                                8
-#define MADERA_IN4_OSR_WIDTH                                3
  
  /* (0x032C)  IN4R_Control */
  #define MADERA_IN4R_HPF_MASK                           0x8000
  #define MADERA_IN4R_HPF_SHIFT                              15
-#define MADERA_IN4R_HPF_WIDTH                               1
  #define MADERA_IN4_DMICCLK_SRC_MASK                    0x1800
  #define MADERA_IN4_DMICCLK_SRC_SHIFT                       11
-#define MADERA_IN4_DMICCLK_SRC_WIDTH                        2
  
  /* (0x032D)  ADC_Digital_Volume_4R */
  #define MADERA_IN4R_MUTE                               0x0100
  #define MADERA_IN4R_MUTE_MASK                          0x0100
  #define MADERA_IN4R_MUTE_SHIFT                              8
-#define MADERA_IN4R_MUTE_WIDTH                              1
  #define MADERA_IN4R_DIG_VOL_MASK                       0x00FF
  #define MADERA_IN4R_DIG_VOL_SHIFT                           0
-#define MADERA_IN4R_DIG_VOL_WIDTH                           8
  
  /* (0x0330)  IN5L_Control */
  #define MADERA_IN5L_HPF_MASK                           0x8000
  #define MADERA_IN5L_HPF_SHIFT                              15
-#define MADERA_IN5L_HPF_WIDTH                               1
  #define MADERA_IN5_DMIC_SUP_MASK                       0x1800
  #define MADERA_IN5_DMIC_SUP_SHIFT                          11
-#define MADERA_IN5_DMIC_SUP_WIDTH                           2
  
  /* (0x0331)  ADC_Digital_Volume_5L */
  #define MADERA_IN5L_MUTE                               0x0100
  #define MADERA_IN5L_MUTE_MASK                          0x0100
  #define MADERA_IN5L_MUTE_SHIFT                              8
-#define MADERA_IN5L_MUTE_WIDTH                              1
  #define MADERA_IN5L_DIG_VOL_MASK                       0x00FF
  #define MADERA_IN5L_DIG_VOL_SHIFT                           0
-#define MADERA_IN5L_DIG_VOL_WIDTH                           8
  
  /* (0x0332)  DMIC5L_Control */
  #define MADERA_IN5_OSR_MASK                            0x0700
  #define MADERA_IN5_OSR_SHIFT                                8
-#define MADERA_IN5_OSR_WIDTH                                3
  
  /* (0x0334)  IN5R_Control */
  #define MADERA_IN5R_HPF_MASK                           0x8000
  #define MADERA_IN5R_HPF_SHIFT                              15
-#define MADERA_IN5R_HPF_WIDTH                               1
  #define MADERA_IN5_DMICCLK_SRC_MASK                    0x1800
  #define MADERA_IN5_DMICCLK_SRC_SHIFT                       11
-#define MADERA_IN5_DMICCLK_SRC_WIDTH                        2
  
  /* (0x0335)  ADC_Digital_Volume_5R */
  #define MADERA_IN5R_MUTE                               0x0100
  #define MADERA_IN5R_MUTE_MASK                          0x0100
  #define MADERA_IN5R_MUTE_SHIFT                              8
-#define MADERA_IN5R_MUTE_WIDTH                              1
  #define MADERA_IN5R_DIG_VOL_MASK                       0x00FF
  #define MADERA_IN5R_DIG_VOL_SHIFT                           0
-#define MADERA_IN5R_DIG_VOL_WIDTH                           8
  
  /* (0x0338)  IN6L_Control */
  #define MADERA_IN6L_HPF_MASK                           0x8000
  #define MADERA_IN6L_HPF_SHIFT                              15
-#define MADERA_IN6L_HPF_WIDTH                               1
  #define MADERA_IN6_DMIC_SUP_MASK                       0x1800
  #define MADERA_IN6_DMIC_SUP_SHIFT                          11
-#define MADERA_IN6_DMIC_SUP_WIDTH                           2
  
  /* (0x0339)  ADC_Digital_Volume_6L */
  #define MADERA_IN6L_MUTE                               0x0100
  #define MADERA_IN6L_MUTE_MASK                          0x0100
  #define MADERA_IN6L_MUTE_SHIFT                              8
-#define MADERA_IN6L_MUTE_WIDTH                              1
  #define MADERA_IN6L_DIG_VOL_MASK                       0x00FF
  #define MADERA_IN6L_DIG_VOL_SHIFT                           0
-#define MADERA_IN6L_DIG_VOL_WIDTH                           8
  
  /* (0x033A)  DMIC6L_Control */
  #define MADERA_IN6_OSR_MASK                            0x0700
  #define MADERA_IN6_OSR_SHIFT                                8
-#define MADERA_IN6_OSR_WIDTH                                3
  
  /* (0x033C)  IN6R_Control */
  #define MADERA_IN6R_HPF_MASK                           0x8000
  #define MADERA_IN6R_HPF_SHIFT                              15
-#define MADERA_IN6R_HPF_WIDTH                               1
  
  /* (0x033D)  ADC_Digital_Volume_6R */
  #define MADERA_IN6R_MUTE                               0x0100
  #define MADERA_IN6R_MUTE_MASK                          0x0100
  #define MADERA_IN6R_MUTE_SHIFT                              8
-#define MADERA_IN6R_MUTE_WIDTH                              1
  #define MADERA_IN6R_DIG_VOL_MASK                       0x00FF
  #define MADERA_IN6R_DIG_VOL_SHIFT                           0
-#define MADERA_IN6R_DIG_VOL_WIDTH                           8
  
  /* (0x033E)  DMIC6R_Control */
  #define MADERA_IN6_DMICCLK_SRC_MASK                    0x1800
  #define MADERA_IN6_DMICCLK_SRC_SHIFT                       11
-#define MADERA_IN6_DMICCLK_SRC_WIDTH                        2
  
  /* (0x0400)  Output_Enables_1 */
  #define MADERA_EP_SEL                                  0x8000
  #define MADERA_EP_SEL_MASK                             0x8000
  #define MADERA_EP_SEL_SHIFT                                15
-#define MADERA_EP_SEL_WIDTH                                 1
  #define MADERA_OUT6L_ENA                               0x0800
  #define MADERA_OUT6L_ENA_MASK                          0x0800
  #define MADERA_OUT6L_ENA_SHIFT                             11
-#define MADERA_OUT6L_ENA_WIDTH                              1
  #define MADERA_OUT6R_ENA                               0x0400
  #define MADERA_OUT6R_ENA_MASK                          0x0400
  #define MADERA_OUT6R_ENA_SHIFT                             10
-#define MADERA_OUT6R_ENA_WIDTH                              1
  #define MADERA_OUT5L_ENA                               0x0200
  #define MADERA_OUT5L_ENA_MASK                          0x0200
  #define MADERA_OUT5L_ENA_SHIFT                              9
-#define MADERA_OUT5L_ENA_WIDTH                              1
  #define MADERA_OUT5R_ENA                               0x0100
  #define MADERA_OUT5R_ENA_MASK                          0x0100
  #define MADERA_OUT5R_ENA_SHIFT                              8
-#define MADERA_OUT5R_ENA_WIDTH                              1
  #define MADERA_OUT4L_ENA                               0x0080
  #define MADERA_OUT4L_ENA_MASK                          0x0080
  #define MADERA_OUT4L_ENA_SHIFT                              7
-#define MADERA_OUT4L_ENA_WIDTH                              1
  #define MADERA_OUT4R_ENA                               0x0040
  #define MADERA_OUT4R_ENA_MASK                          0x0040
  #define MADERA_OUT4R_ENA_SHIFT                              6
-#define MADERA_OUT4R_ENA_WIDTH                              1
  #define MADERA_OUT3L_ENA                               0x0020
  #define MADERA_OUT3L_ENA_MASK                          0x0020
  #define MADERA_OUT3L_ENA_SHIFT                              5
-#define MADERA_OUT3L_ENA_WIDTH                              1
  #define MADERA_OUT3R_ENA                               0x0010
  #define MADERA_OUT3R_ENA_MASK                          0x0010
  #define MADERA_OUT3R_ENA_SHIFT                              4
-#define MADERA_OUT3R_ENA_WIDTH                              1
  #define MADERA_OUT2L_ENA                               0x0008
  #define MADERA_OUT2L_ENA_MASK                          0x0008
  #define MADERA_OUT2L_ENA_SHIFT                              3
-#define MADERA_OUT2L_ENA_WIDTH                              1
  #define MADERA_OUT2R_ENA                               0x0004
  #define MADERA_OUT2R_ENA_MASK                          0x0004
  #define MADERA_OUT2R_ENA_SHIFT                              2
-#define MADERA_OUT2R_ENA_WIDTH                              1
  #define MADERA_OUT1L_ENA                               0x0002
  #define MADERA_OUT1L_ENA_MASK                          0x0002
  #define MADERA_OUT1L_ENA_SHIFT                              1
-#define MADERA_OUT1L_ENA_WIDTH                              1
  #define MADERA_OUT1R_ENA                               0x0001
  #define MADERA_OUT1R_ENA_MASK                          0x0001
  #define MADERA_OUT1R_ENA_SHIFT                              0
-#define MADERA_OUT1R_ENA_WIDTH                              1
  
  /* (0x0408)  Output_Rate_1 */
  #define MADERA_CP_DAC_MODE_MASK                                0x0040
  #define MADERA_CP_DAC_MODE_SHIFT                            6
-#define MADERA_CP_DAC_MODE_WIDTH                            1
  #define MADERA_OUT_EXT_CLK_DIV_MASK                    0x0030
  #define MADERA_OUT_EXT_CLK_DIV_SHIFT                        4
-#define MADERA_OUT_EXT_CLK_DIV_WIDTH                        2
  #define MADERA_OUT_CLK_SRC_MASK                                0x0007
  #define MADERA_OUT_CLK_SRC_SHIFT                            0
-#define MADERA_OUT_CLK_SRC_WIDTH                            3
  
  /* (0x0409)  Output_Volume_Ramp */
  #define MADERA_OUT_VD_RAMP_MASK                                0x0070
  #define MADERA_OUT_VD_RAMP_SHIFT                            4
-#define MADERA_OUT_VD_RAMP_WIDTH                            3
  #define MADERA_OUT_VI_RAMP_MASK                                0x0007
  #define MADERA_OUT_VI_RAMP_SHIFT                            0
-#define MADERA_OUT_VI_RAMP_WIDTH                            3
  
  /* (0x0410)  Output_Path_Config_1L */
  #define MADERA_OUT1_MONO                               0x1000
  #define MADERA_OUT1_MONO_MASK                          0x1000
  #define MADERA_OUT1_MONO_SHIFT                             12
-#define MADERA_OUT1_MONO_WIDTH                              1
  #define MADERA_OUT1L_ANC_SRC_MASK                      0x0C00
  #define MADERA_OUT1L_ANC_SRC_SHIFT                         10
-#define MADERA_OUT1L_ANC_SRC_WIDTH                          2
  
  /* (0x0411)  DAC_Digital_Volume_1L */
  #define MADERA_OUT1L_VU                                        0x0200
  #define MADERA_OUT1L_VU_MASK                           0x0200
  #define MADERA_OUT1L_VU_SHIFT                               9
-#define MADERA_OUT1L_VU_WIDTH                               1
  #define MADERA_OUT1L_MUTE                              0x0100
  #define MADERA_OUT1L_MUTE_MASK                         0x0100
  #define MADERA_OUT1L_MUTE_SHIFT                                     8
-#define MADERA_OUT1L_MUTE_WIDTH                                     1
  #define MADERA_OUT1L_VOL_MASK                          0x00FF
  #define MADERA_OUT1L_VOL_SHIFT                              0
-#define MADERA_OUT1L_VOL_WIDTH                              8
  
  /* (0x0412)  Output_Path_Config_1 */
  #define MADERA_HP1_GND_SEL_MASK                                0x0007
  #define MADERA_HP1_GND_SEL_SHIFT                            0
-#define MADERA_HP1_GND_SEL_WIDTH                            3
  
  /* (0x0414)  Output_Path_Config_1R */
  #define MADERA_OUT1R_ANC_SRC_MASK                      0x0C00
  #define MADERA_OUT1R_ANC_SRC_SHIFT                         10
-#define MADERA_OUT1R_ANC_SRC_WIDTH                          2
  
  /* (0x0415)  DAC_Digital_Volume_1R */
  #define MADERA_OUT1R_MUTE                              0x0100
  #define MADERA_OUT1R_MUTE_MASK                         0x0100
  #define MADERA_OUT1R_MUTE_SHIFT                                     8
-#define MADERA_OUT1R_MUTE_WIDTH                                     1
  #define MADERA_OUT1R_VOL_MASK                          0x00FF
  #define MADERA_OUT1R_VOL_SHIFT                              0
-#define MADERA_OUT1R_VOL_WIDTH                              8
  
  /* (0x0418)  Output_Path_Config_2L */
  #define MADERA_OUT2L_ANC_SRC_MASK                      0x0C00
  #define MADERA_OUT2L_ANC_SRC_SHIFT                         10
-#define MADERA_OUT2L_ANC_SRC_WIDTH                          2
  
  /* (0x0419)  DAC_Digital_Volume_2L */
  #define MADERA_OUT2L_MUTE                              0x0100
  #define MADERA_OUT2L_MUTE_MASK                         0x0100
  #define MADERA_OUT2L_MUTE_SHIFT                                     8
-#define MADERA_OUT2L_MUTE_WIDTH                                     1
  #define MADERA_OUT2L_VOL_MASK                          0x00FF
  #define MADERA_OUT2L_VOL_SHIFT                              0
-#define MADERA_OUT2L_VOL_WIDTH                              8
  
  /* (0x041A)  Output_Path_Config_2 */
  #define MADERA_HP2_GND_SEL_MASK                                0x0007
  #define MADERA_HP2_GND_SEL_SHIFT                            0
-#define MADERA_HP2_GND_SEL_WIDTH                            3
  
  /* (0x041C)  Output_Path_Config_2R */
  #define MADERA_OUT2R_ANC_SRC_MASK                      0x0C00
  #define MADERA_OUT2R_ANC_SRC_SHIFT                         10
-#define MADERA_OUT2R_ANC_SRC_WIDTH                          2
  
  /* (0x041D)  DAC_Digital_Volume_2R */
  #define MADERA_OUT2R_MUTE                              0x0100
  #define MADERA_OUT2R_MUTE_MASK                         0x0100
  #define MADERA_OUT2R_MUTE_SHIFT                                     8
-#define MADERA_OUT2R_MUTE_WIDTH                                     1
  #define MADERA_OUT2R_VOL_MASK                          0x00FF
  #define MADERA_OUT2R_VOL_SHIFT                              0
-#define MADERA_OUT2R_VOL_WIDTH                              8
  
  /* (0x0420)  Output_Path_Config_3L */
  #define MADERA_OUT3L_ANC_SRC_MASK                      0x0C00
  #define MADERA_OUT3L_ANC_SRC_SHIFT                         10
-#define MADERA_OUT3L_ANC_SRC_WIDTH                          2
  
  /* (0x0421)  DAC_Digital_Volume_3L */
  #define MADERA_OUT3L_MUTE                              0x0100
  #define MADERA_OUT3L_MUTE_MASK                         0x0100
  #define MADERA_OUT3L_MUTE_SHIFT                                     8
-#define MADERA_OUT3L_MUTE_WIDTH                                     1
  #define MADERA_OUT3L_VOL_MASK                          0x00FF
  #define MADERA_OUT3L_VOL_SHIFT                              0
-#define MADERA_OUT3L_VOL_WIDTH                              8
  
  /* (0x0424)  Output_Path_Config_3R */
  #define MADERA_OUT3R_ANC_SRC_MASK                      0x0C00
  #define MADERA_OUT3R_ANC_SRC_SHIFT                         10
-#define MADERA_OUT3R_ANC_SRC_WIDTH                          2
  
  /* (0x0425)  DAC_Digital_Volume_3R */
  #define MADERA_OUT3R_MUTE                              0x0100
  #define MADERA_OUT3R_MUTE_MASK                         0x0100
  #define MADERA_OUT3R_MUTE_SHIFT                                     8
-#define MADERA_OUT3R_MUTE_WIDTH                                     1
  #define MADERA_OUT3R_VOL_MASK                          0x00FF
  #define MADERA_OUT3R_VOL_SHIFT                              0
-#define MADERA_OUT3R_VOL_WIDTH                              8
  
  /* (0x0428)  Output_Path_Config_4L */
  #define MADERA_OUT4L_ANC_SRC_MASK                      0x0C00
  #define MADERA_OUT4L_ANC_SRC_SHIFT                         10
-#define MADERA_OUT4L_ANC_SRC_WIDTH                          2
  
  /* (0x0429)  DAC_Digital_Volume_4L */
  #define MADERA_OUT4L_MUTE                              0x0100
  #define MADERA_OUT4L_MUTE_MASK                         0x0100
  #define MADERA_OUT4L_MUTE_SHIFT                                     8
-#define MADERA_OUT4L_MUTE_WIDTH                                     1
  #define MADERA_OUT4L_VOL_MASK                          0x00FF
  #define MADERA_OUT4L_VOL_SHIFT                              0
-#define MADERA_OUT4L_VOL_WIDTH                              8
  
  /* (0x042C)  Output_Path_Config_4R */
  #define MADERA_OUT4R_ANC_SRC_MASK                      0x0C00
  #define MADERA_OUT4R_ANC_SRC_SHIFT                         10
-#define MADERA_OUT4R_ANC_SRC_WIDTH                          2
  
  /* (0x042D)  DAC_Digital_Volume_4R */
  #define MADERA_OUT4R_MUTE                              0x0100
  #define MADERA_OUT4R_MUTE_MASK                         0x0100
  #define MADERA_OUT4R_MUTE_SHIFT                                     8
-#define MADERA_OUT4R_MUTE_WIDTH                                     1
  #define MADERA_OUT4R_VOL_MASK                          0x00FF
  #define MADERA_OUT4R_VOL_SHIFT                              0
-#define MADERA_OUT4R_VOL_WIDTH                              8
  
  /* (0x0430)  Output_Path_Config_5L */
  #define MADERA_OUT5_OSR                                        0x2000
  #define MADERA_OUT5_OSR_MASK                           0x2000
  #define MADERA_OUT5_OSR_SHIFT                              13
-#define MADERA_OUT5_OSR_WIDTH                               1
  #define MADERA_OUT5L_ANC_SRC_MASK                      0x0C00
  #define MADERA_OUT5L_ANC_SRC_SHIFT                         10
-#define MADERA_OUT5L_ANC_SRC_WIDTH                          2
  
  /* (0x0431)  DAC_Digital_Volume_5L */
  #define MADERA_OUT5L_MUTE                              0x0100
  #define MADERA_OUT5L_MUTE_MASK                         0x0100
  #define MADERA_OUT5L_MUTE_SHIFT                                     8
-#define MADERA_OUT5L_MUTE_WIDTH                                     1
  #define MADERA_OUT5L_VOL_MASK                          0x00FF
  #define MADERA_OUT5L_VOL_SHIFT                              0
-#define MADERA_OUT5L_VOL_WIDTH                              8
  
  /* (0x0434)  Output_Path_Config_5R */
  #define MADERA_OUT5R_ANC_SRC_MASK                      0x0C00
  #define MADERA_OUT5R_ANC_SRC_SHIFT                         10
-#define MADERA_OUT5R_ANC_SRC_WIDTH                          2
  
  /* (0x0435)  DAC_Digital_Volume_5R */
  #define MADERA_OUT5R_MUTE                              0x0100
  #define MADERA_OUT5R_MUTE_MASK                         0x0100
  #define MADERA_OUT5R_MUTE_SHIFT                                     8
-#define MADERA_OUT5R_MUTE_WIDTH                                     1
  #define MADERA_OUT5R_VOL_MASK                          0x00FF
  #define MADERA_OUT5R_VOL_SHIFT                              0
-#define MADERA_OUT5R_VOL_WIDTH                              8
  
  /* (0x0438)  Output_Path_Config_6L */
  #define MADERA_OUT6_OSR                                        0x2000
  #define MADERA_OUT6_OSR_MASK                           0x2000
  #define MADERA_OUT6_OSR_SHIFT                              13
-#define MADERA_OUT6_OSR_WIDTH                               1
  #define MADERA_OUT6L_ANC_SRC_MASK                      0x0C00
  #define MADERA_OUT6L_ANC_SRC_SHIFT                         10
-#define MADERA_OUT6L_ANC_SRC_WIDTH                          2
  
  /* (0x0439)  DAC_Digital_Volume_6L */
  #define MADERA_OUT6L_MUTE                              0x0100
  #define MADERA_OUT6L_MUTE_MASK                         0x0100
  #define MADERA_OUT6L_MUTE_SHIFT                                     8
-#define MADERA_OUT6L_MUTE_WIDTH                                     1
  #define MADERA_OUT6L_VOL_MASK                          0x00FF
  #define MADERA_OUT6L_VOL_SHIFT                              0
-#define MADERA_OUT6L_VOL_WIDTH                              8
  
  /* (0x043C)  Output_Path_Config_6R */
  #define MADERA_OUT6R_ANC_SRC_MASK                      0x0C00
  #define MADERA_OUT6R_ANC_SRC_SHIFT                         10
-#define MADERA_OUT6R_ANC_SRC_WIDTH                          2
  
  /* (0x043D)  DAC_Digital_Volume_6R */
  #define MADERA_OUT6R_MUTE                              0x0100
  #define MADERA_OUT6R_MUTE_MASK                         0x0100
  #define MADERA_OUT6R_MUTE_SHIFT                                     8
-#define MADERA_OUT6R_MUTE_WIDTH                                     1
  #define MADERA_OUT6R_VOL_MASK                          0x00FF
  #define MADERA_OUT6R_VOL_SHIFT                              0
-#define MADERA_OUT6R_VOL_WIDTH                              8
  
  /* (0x0450) - DAC AEC Control 1 */
  #define MADERA_AEC1_LOOPBACK_SRC_MASK                  0x003C
  #define MADERA_AEC1_LOOPBACK_SRC_SHIFT                      2
-#define MADERA_AEC1_LOOPBACK_SRC_WIDTH                      4
  #define MADERA_AEC1_ENA_STS                            0x0002
  #define MADERA_AEC1_ENA_STS_MASK                       0x0002
  #define MADERA_AEC1_ENA_STS_SHIFT                           1
-#define MADERA_AEC1_ENA_STS_WIDTH                           1
  #define MADERA_AEC1_LOOPBACK_ENA                       0x0001
  #define MADERA_AEC1_LOOPBACK_ENA_MASK                  0x0001
  #define MADERA_AEC1_LOOPBACK_ENA_SHIFT                      0
-#define MADERA_AEC1_LOOPBACK_ENA_WIDTH                      1
  
  /* (0x0451)  DAC_AEC_Control_2 */
  #define MADERA_AEC2_LOOPBACK_SRC_MASK                  0x003C
  #define MADERA_AEC2_LOOPBACK_SRC_SHIFT                      2
-#define MADERA_AEC2_LOOPBACK_SRC_WIDTH                      4
  #define MADERA_AEC2_ENA_STS                            0x0002
  #define MADERA_AEC2_ENA_STS_MASK                       0x0002
  #define MADERA_AEC2_ENA_STS_SHIFT                           1
-#define MADERA_AEC2_ENA_STS_WIDTH                           1
  #define MADERA_AEC2_LOOPBACK_ENA                       0x0001
  #define MADERA_AEC2_LOOPBACK_ENA_MASK                  0x0001
  #define MADERA_AEC2_LOOPBACK_ENA_SHIFT                      0
-#define MADERA_AEC2_LOOPBACK_ENA_WIDTH                      1
  
  /* (0x0458)  Noise_Gate_Control */
  #define MADERA_NGATE_HOLD_MASK                         0x0030
  #define MADERA_NGATE_HOLD_SHIFT                                     4
-#define MADERA_NGATE_HOLD_WIDTH                                     2
  #define MADERA_NGATE_THR_MASK                          0x000E
  #define MADERA_NGATE_THR_SHIFT                              1
-#define MADERA_NGATE_THR_WIDTH                              3
  #define MADERA_NGATE_ENA                               0x0001
  #define MADERA_NGATE_ENA_MASK                          0x0001
  #define MADERA_NGATE_ENA_SHIFT                              0
-#define MADERA_NGATE_ENA_WIDTH                              1
  
  /* (0x0490)  PDM_SPK1_CTRL_1 */
  #define MADERA_SPK1R_MUTE                              0x2000
  #define MADERA_SPK1R_MUTE_MASK                         0x2000
  #define MADERA_SPK1R_MUTE_SHIFT                                    13
-#define MADERA_SPK1R_MUTE_WIDTH                                     1
  #define MADERA_SPK1L_MUTE                              0x1000
  #define MADERA_SPK1L_MUTE_MASK                         0x1000
  #define MADERA_SPK1L_MUTE_SHIFT                                    12
-#define MADERA_SPK1L_MUTE_WIDTH                                     1
  #define MADERA_SPK1_MUTE_ENDIAN                                0x0100
  #define MADERA_SPK1_MUTE_ENDIAN_MASK                   0x0100
  #define MADERA_SPK1_MUTE_ENDIAN_SHIFT                       8
-#define MADERA_SPK1_MUTE_ENDIAN_WIDTH                       1
  #define MADERA_SPK1_MUTE_SEQ1_MASK                     0x00FF
  #define MADERA_SPK1_MUTE_SEQ1_SHIFT                         0
-#define MADERA_SPK1_MUTE_SEQ1_WIDTH                         8
  
  /* (0x0491)  PDM_SPK1_CTRL_2 */
  #define MADERA_SPK1_FMT                                        0x0001
  #define MADERA_SPK1_FMT_MASK                           0x0001
  #define MADERA_SPK1_FMT_SHIFT                               0
-#define MADERA_SPK1_FMT_WIDTH                               1
  
  /* (0x0492)  PDM_SPK2_CTRL_1 */
  #define MADERA_SPK2R_MUTE                              0x2000
  #define MADERA_SPK2R_MUTE_MASK                         0x2000
  #define MADERA_SPK2R_MUTE_SHIFT                                    13
-#define MADERA_SPK2R_MUTE_WIDTH                                     1
  #define MADERA_SPK2L_MUTE                              0x1000
  #define MADERA_SPK2L_MUTE_MASK                         0x1000
  #define MADERA_SPK2L_MUTE_SHIFT                                    12
-#define MADERA_SPK2L_MUTE_WIDTH                                     1
  
  /* (0x04A0) - HP1 Short Circuit Ctrl */
  #define MADERA_HP1_SC_ENA                              0x1000
  #define MADERA_HP1_SC_ENA_MASK                         0x1000
  #define MADERA_HP1_SC_ENA_SHIFT                                    12
-#define MADERA_HP1_SC_ENA_WIDTH                                     1
  
  /* (0x04A1) - HP2 Short Circuit Ctrl */
  #define MADERA_HP2_SC_ENA                              0x1000
  #define MADERA_HP2_SC_ENA_MASK                         0x1000
  #define MADERA_HP2_SC_ENA_SHIFT                                    12
-#define MADERA_HP2_SC_ENA_WIDTH                                     1
  
  /* (0x04A2) - HP3 Short Circuit Ctrl */
  #define MADERA_HP3_SC_ENA                              0x1000
  #define MADERA_HP3_SC_ENA_MASK                         0x1000
  #define MADERA_HP3_SC_ENA_SHIFT                                    12
-#define MADERA_HP3_SC_ENA_WIDTH                                     1
  
  /* (0x04A8) - HP_Test_Ctrl_5 */
  #define MADERA_HP1L_ONEFLT                             0x0100
  #define MADERA_HP1L_ONEFLT_MASK                                0x0100
  #define MADERA_HP1L_ONEFLT_SHIFT                            8
-#define MADERA_HP1L_ONEFLT_WIDTH                            1
  
  /* (0x04A9) - HP_Test_Ctrl_6 */
  #define MADERA_HP1R_ONEFLT                             0x0100
  #define MADERA_HP1R_ONEFLT_MASK                                0x0100
  #define MADERA_HP1R_ONEFLT_SHIFT                            8
-#define MADERA_HP1R_ONEFLT_WIDTH                            1
  
  /* (0x0500)  AIF1_BCLK_Ctrl */
  #define MADERA_AIF1_BCLK_INV                           0x0080
  #define MADERA_AIF1_BCLK_INV_MASK                      0x0080
  #define MADERA_AIF1_BCLK_INV_SHIFT                          7
-#define MADERA_AIF1_BCLK_INV_WIDTH                          1
  #define MADERA_AIF1_BCLK_MSTR                          0x0020
  #define MADERA_AIF1_BCLK_MSTR_MASK                     0x0020
  #define MADERA_AIF1_BCLK_MSTR_SHIFT                         5
-#define MADERA_AIF1_BCLK_MSTR_WIDTH                         1
  #define MADERA_AIF1_BCLK_FREQ_MASK                     0x001F
  #define MADERA_AIF1_BCLK_FREQ_SHIFT                         0
-#define MADERA_AIF1_BCLK_FREQ_WIDTH                         5
  
  /* (0x0501)  AIF1_Tx_Pin_Ctrl */
  #define MADERA_AIF1TX_LRCLK_SRC                                0x0008
  #define MADERA_AIF1TX_LRCLK_SRC_MASK                   0x0008
  #define MADERA_AIF1TX_LRCLK_SRC_SHIFT                       3
-#define MADERA_AIF1TX_LRCLK_SRC_WIDTH                       1
  #define MADERA_AIF1TX_LRCLK_INV                                0x0004
  #define MADERA_AIF1TX_LRCLK_INV_MASK                   0x0004
  #define MADERA_AIF1TX_LRCLK_INV_SHIFT                       2
-#define MADERA_AIF1TX_LRCLK_INV_WIDTH                       1
  #define MADERA_AIF1TX_LRCLK_MSTR                       0x0001
  #define MADERA_AIF1TX_LRCLK_MSTR_MASK                  0x0001
  #define MADERA_AIF1TX_LRCLK_MSTR_SHIFT                      0
-#define MADERA_AIF1TX_LRCLK_MSTR_WIDTH                      1
  
  /* (0x0502)  AIF1_Rx_Pin_Ctrl */
  #define MADERA_AIF1RX_LRCLK_INV                                0x0004
  #define MADERA_AIF1RX_LRCLK_INV_MASK                   0x0004
  #define MADERA_AIF1RX_LRCLK_INV_SHIFT                       2
-#define MADERA_AIF1RX_LRCLK_INV_WIDTH                       1
  #define MADERA_AIF1RX_LRCLK_FRC                                0x0002
  #define MADERA_AIF1RX_LRCLK_FRC_MASK                   0x0002
  #define MADERA_AIF1RX_LRCLK_FRC_SHIFT                       1
-#define MADERA_AIF1RX_LRCLK_FRC_WIDTH                       1
  #define MADERA_AIF1RX_LRCLK_MSTR                       0x0001
  #define MADERA_AIF1RX_LRCLK_MSTR_MASK                  0x0001
  #define MADERA_AIF1RX_LRCLK_MSTR_SHIFT                      0
-#define MADERA_AIF1RX_LRCLK_MSTR_WIDTH                      1
  
  /* (0x0503)  AIF1_Rate_Ctrl */
  #define MADERA_AIF1_RATE_MASK                          0xF800
  #define MADERA_AIF1_RATE_SHIFT                             11
-#define MADERA_AIF1_RATE_WIDTH                              5
  #define MADERA_AIF1_TRI                                        0x0040
  #define MADERA_AIF1_TRI_MASK                           0x0040
  #define MADERA_AIF1_TRI_SHIFT                               6
-#define MADERA_AIF1_TRI_WIDTH                               1
  
  /* (0x0504)  AIF1_Format */
  #define MADERA_AIF1_FMT_MASK                           0x0007
  #define MADERA_AIF1_FMT_SHIFT                               0
-#define MADERA_AIF1_FMT_WIDTH                               3
  
  /* (0x0506)  AIF1_Rx_BCLK_Rate */
  #define MADERA_AIF1RX_BCPF_MASK                                0x1FFF
  #define MADERA_AIF1RX_BCPF_SHIFT                            0
-#define MADERA_AIF1RX_BCPF_WIDTH                           13
  
  /* (0x0507)  AIF1_Frame_Ctrl_1 */
  #define MADERA_AIF1TX_WL_MASK                          0x3F00
  #define MADERA_AIF1TX_WL_SHIFT                              8
-#define MADERA_AIF1TX_WL_WIDTH                              6
  #define MADERA_AIF1TX_SLOT_LEN_MASK                    0x00FF
  #define MADERA_AIF1TX_SLOT_LEN_SHIFT                        0
-#define MADERA_AIF1TX_SLOT_LEN_WIDTH                        8
  
  /* (0x0508)  AIF1_Frame_Ctrl_2 */
  #define MADERA_AIF1RX_WL_MASK                          0x3F00
  #define MADERA_AIF1RX_WL_SHIFT                              8
-#define MADERA_AIF1RX_WL_WIDTH                              6
  #define MADERA_AIF1RX_SLOT_LEN_MASK                    0x00FF
  #define MADERA_AIF1RX_SLOT_LEN_SHIFT                        0
-#define MADERA_AIF1RX_SLOT_LEN_WIDTH                        8
  
  /* (0x0509)  AIF1_Frame_Ctrl_3 */
  #define MADERA_AIF1TX1_SLOT_MASK                       0x003F
  #define MADERA_AIF1TX1_SLOT_SHIFT                           0
-#define MADERA_AIF1TX1_SLOT_WIDTH                           6
  
  /* (0x0519)  AIF1_Tx_Enables */
  #define MADERA_AIF1TX8_ENA                             0x0080
  #define MADERA_AIF1TX8_ENA_MASK                                0x0080
  #define MADERA_AIF1TX8_ENA_SHIFT                            7
-#define MADERA_AIF1TX8_ENA_WIDTH                            1
  #define MADERA_AIF1TX7_ENA                             0x0040
  #define MADERA_AIF1TX7_ENA_MASK                                0x0040
  #define MADERA_AIF1TX7_ENA_SHIFT                            6
-#define MADERA_AIF1TX7_ENA_WIDTH                            1
  #define MADERA_AIF1TX6_ENA                             0x0020
  #define MADERA_AIF1TX6_ENA_MASK                                0x0020
  #define MADERA_AIF1TX6_ENA_SHIFT                            5
-#define MADERA_AIF1TX6_ENA_WIDTH                            1
  #define MADERA_AIF1TX5_ENA                             0x0010
  #define MADERA_AIF1TX5_ENA_MASK                                0x0010
  #define MADERA_AIF1TX5_ENA_SHIFT                            4
-#define MADERA_AIF1TX5_ENA_WIDTH                            1
  #define MADERA_AIF1TX4_ENA                             0x0008
  #define MADERA_AIF1TX4_ENA_MASK                                0x0008
  #define MADERA_AIF1TX4_ENA_SHIFT                            3
-#define MADERA_AIF1TX4_ENA_WIDTH                            1
  #define MADERA_AIF1TX3_ENA                             0x0004
  #define MADERA_AIF1TX3_ENA_MASK                                0x0004
  #define MADERA_AIF1TX3_ENA_SHIFT                            2
-#define MADERA_AIF1TX3_ENA_WIDTH                            1
  #define MADERA_AIF1TX2_ENA                             0x0002
  #define MADERA_AIF1TX2_ENA_MASK                                0x0002
  #define MADERA_AIF1TX2_ENA_SHIFT                            1
-#define MADERA_AIF1TX2_ENA_WIDTH                            1
  #define MADERA_AIF1TX1_ENA                             0x0001
  #define MADERA_AIF1TX1_ENA_MASK                                0x0001
  #define MADERA_AIF1TX1_ENA_SHIFT                            0
-#define MADERA_AIF1TX1_ENA_WIDTH                            1
  
  /* (0x051A)  AIF1_Rx_Enables */
  #define MADERA_AIF1RX8_ENA                             0x0080
  #define MADERA_AIF1RX8_ENA_MASK                                0x0080
  #define MADERA_AIF1RX8_ENA_SHIFT                            7
-#define MADERA_AIF1RX8_ENA_WIDTH                            1
  #define MADERA_AIF1RX7_ENA                             0x0040
  #define MADERA_AIF1RX7_ENA_MASK                                0x0040
  #define MADERA_AIF1RX7_ENA_SHIFT                            6
-#define MADERA_AIF1RX7_ENA_WIDTH                            1
  #define MADERA_AIF1RX6_ENA                             0x0020
  #define MADERA_AIF1RX6_ENA_MASK                                0x0020
  #define MADERA_AIF1RX6_ENA_SHIFT                            5
-#define MADERA_AIF1RX6_ENA_WIDTH                            1
  #define MADERA_AIF1RX5_ENA                             0x0010
  #define MADERA_AIF1RX5_ENA_MASK                                0x0010
  #define MADERA_AIF1RX5_ENA_SHIFT                            4
-#define MADERA_AIF1RX5_ENA_WIDTH                            1
  #define MADERA_AIF1RX4_ENA                             0x0008
  #define MADERA_AIF1RX4_ENA_MASK                                0x0008
  #define MADERA_AIF1RX4_ENA_SHIFT                            3
-#define MADERA_AIF1RX4_ENA_WIDTH                            1
  #define MADERA_AIF1RX3_ENA                             0x0004
  #define MADERA_AIF1RX3_ENA_MASK                                0x0004
  #define MADERA_AIF1RX3_ENA_SHIFT                            2
-#define MADERA_AIF1RX3_ENA_WIDTH                            1
  #define MADERA_AIF1RX2_ENA                             0x0002
  #define MADERA_AIF1RX2_ENA_MASK                                0x0002
  #define MADERA_AIF1RX2_ENA_SHIFT                            1
-#define MADERA_AIF1RX2_ENA_WIDTH                            1
  #define MADERA_AIF1RX1_ENA                             0x0001
  #define MADERA_AIF1RX1_ENA_MASK                                0x0001
  #define MADERA_AIF1RX1_ENA_SHIFT                            0
-#define MADERA_AIF1RX1_ENA_WIDTH                            1
  
  /* (0x0559)  AIF2_Tx_Enables */
  #define MADERA_AIF2TX8_ENA                             0x0080
  #define MADERA_AIF2TX8_ENA_MASK                                0x0080
  #define MADERA_AIF2TX8_ENA_SHIFT                            7
-#define MADERA_AIF2TX8_ENA_WIDTH                            1
  #define MADERA_AIF2TX7_ENA                             0x0040
  #define MADERA_AIF2TX7_ENA_MASK                                0x0040
  #define MADERA_AIF2TX7_ENA_SHIFT                            6
-#define MADERA_AIF2TX7_ENA_WIDTH                            1
  #define MADERA_AIF2TX6_ENA                             0x0020
  #define MADERA_AIF2TX6_ENA_MASK                                0x0020
  #define MADERA_AIF2TX6_ENA_SHIFT                            5
-#define MADERA_AIF2TX6_ENA_WIDTH                            1
  #define MADERA_AIF2TX5_ENA                             0x0010
  #define MADERA_AIF2TX5_ENA_MASK                                0x0010
  #define MADERA_AIF2TX5_ENA_SHIFT                            4
-#define MADERA_AIF2TX5_ENA_WIDTH                            1
  #define MADERA_AIF2TX4_ENA                             0x0008
  #define MADERA_AIF2TX4_ENA_MASK                                0x0008
  #define MADERA_AIF2TX4_ENA_SHIFT                            3
-#define MADERA_AIF2TX4_ENA_WIDTH                            1
  #define MADERA_AIF2TX3_ENA                             0x0004
  #define MADERA_AIF2TX3_ENA_MASK                                0x0004
  #define MADERA_AIF2TX3_ENA_SHIFT                            2
-#define MADERA_AIF2TX3_ENA_WIDTH                            1
  #define MADERA_AIF2TX2_ENA                             0x0002
  #define MADERA_AIF2TX2_ENA_MASK                                0x0002
  #define MADERA_AIF2TX2_ENA_SHIFT                            1
-#define MADERA_AIF2TX2_ENA_WIDTH                            1
  #define MADERA_AIF2TX1_ENA                             0x0001
  #define MADERA_AIF2TX1_ENA_MASK                                0x0001
  #define MADERA_AIF2TX1_ENA_SHIFT                            0
-#define MADERA_AIF2TX1_ENA_WIDTH                            1
  
  /* (0x055A)  AIF2_Rx_Enables */
  #define MADERA_AIF2RX8_ENA                             0x0080
  #define MADERA_AIF2RX8_ENA_MASK                                0x0080
  #define MADERA_AIF2RX8_ENA_SHIFT                            7
-#define MADERA_AIF2RX8_ENA_WIDTH                            1
  #define MADERA_AIF2RX7_ENA                             0x0040
  #define MADERA_AIF2RX7_ENA_MASK                                0x0040
  #define MADERA_AIF2RX7_ENA_SHIFT                            6
-#define MADERA_AIF2RX7_ENA_WIDTH                            1
  #define MADERA_AIF2RX6_ENA                             0x0020
  #define MADERA_AIF2RX6_ENA_MASK                                0x0020
  #define MADERA_AIF2RX6_ENA_SHIFT                            5
-#define MADERA_AIF2RX6_ENA_WIDTH                            1
  #define MADERA_AIF2RX5_ENA                             0x0010
  #define MADERA_AIF2RX5_ENA_MASK                                0x0010
  #define MADERA_AIF2RX5_ENA_SHIFT                            4
-#define MADERA_AIF2RX5_ENA_WIDTH                            1
  #define MADERA_AIF2RX4_ENA                             0x0008
  #define MADERA_AIF2RX4_ENA_MASK                                0x0008
  #define MADERA_AIF2RX4_ENA_SHIFT                            3
-#define MADERA_AIF2RX4_ENA_WIDTH                            1
  #define MADERA_AIF2RX3_ENA                             0x0004
  #define MADERA_AIF2RX3_ENA_MASK                                0x0004
  #define MADERA_AIF2RX3_ENA_SHIFT                            2
-#define MADERA_AIF2RX3_ENA_WIDTH                            1
  #define MADERA_AIF2RX2_ENA                             0x0002
  #define MADERA_AIF2RX2_ENA_MASK                                0x0002
  #define MADERA_AIF2RX2_ENA_SHIFT                            1
-#define MADERA_AIF2RX2_ENA_WIDTH                            1
  #define MADERA_AIF2RX1_ENA                             0x0001
  #define MADERA_AIF2RX1_ENA_MASK                                0x0001
  #define MADERA_AIF2RX1_ENA_SHIFT                            0
-#define MADERA_AIF2RX1_ENA_WIDTH                            1
  
  /* (0x0599)  AIF3_Tx_Enables */
  #define MADERA_AIF3TX8_ENA                             0x0080
  #define MADERA_AIF3TX8_ENA_MASK                                0x0080
  #define MADERA_AIF3TX8_ENA_SHIFT                            7
-#define MADERA_AIF3TX8_ENA_WIDTH                            1
  #define MADERA_AIF3TX7_ENA                             0x0040
  #define MADERA_AIF3TX7_ENA_MASK                                0x0040
  #define MADERA_AIF3TX7_ENA_SHIFT                            6
-#define MADERA_AIF3TX7_ENA_WIDTH                            1
  #define MADERA_AIF3TX6_ENA                             0x0020
  #define MADERA_AIF3TX6_ENA_MASK                                0x0020
  #define MADERA_AIF3TX6_ENA_SHIFT                            5
-#define MADERA_AIF3TX6_ENA_WIDTH                            1
  #define MADERA_AIF3TX5_ENA                             0x0010
  #define MADERA_AIF3TX5_ENA_MASK                                0x0010
  #define MADERA_AIF3TX5_ENA_SHIFT                            4
-#define MADERA_AIF3TX5_ENA_WIDTH                            1
  #define MADERA_AIF3TX4_ENA                             0x0008
  #define MADERA_AIF3TX4_ENA_MASK                                0x0008
  #define MADERA_AIF3TX4_ENA_SHIFT                            3
-#define MADERA_AIF3TX4_ENA_WIDTH                            1
  #define MADERA_AIF3TX3_ENA                             0x0004
  #define MADERA_AIF3TX3_ENA_MASK                                0x0004
  #define MADERA_AIF3TX3_ENA_SHIFT                            2
-#define MADERA_AIF3TX3_ENA_WIDTH                            1
  #define MADERA_AIF3TX2_ENA                             0x0002
  #define MADERA_AIF3TX2_ENA_MASK                                0x0002
  #define MADERA_AIF3TX2_ENA_SHIFT                            1
-#define MADERA_AIF3TX2_ENA_WIDTH                            1
  #define MADERA_AIF3TX1_ENA                             0x0001
  #define MADERA_AIF3TX1_ENA_MASK                                0x0001
  #define MADERA_AIF3TX1_ENA_SHIFT                            0
-#define MADERA_AIF3TX1_ENA_WIDTH                            1
  
  /* (0x059A)  AIF3_Rx_Enables */
  #define MADERA_AIF3RX8_ENA                             0x0080
  #define MADERA_AIF3RX8_ENA_MASK                                0x0080
  #define MADERA_AIF3RX8_ENA_SHIFT                            7
-#define MADERA_AIF3RX8_ENA_WIDTH                            1
  #define MADERA_AIF3RX7_ENA                             0x0040
  #define MADERA_AIF3RX7_ENA_MASK                                0x0040
  #define MADERA_AIF3RX7_ENA_SHIFT                            6
-#define MADERA_AIF3RX7_ENA_WIDTH                            1
  #define MADERA_AIF3RX6_ENA                             0x0020
  #define MADERA_AIF3RX6_ENA_MASK                                0x0020
  #define MADERA_AIF3RX6_ENA_SHIFT                            5
-#define MADERA_AIF3RX6_ENA_WIDTH                            1
  #define MADERA_AIF3RX5_ENA                             0x0010
  #define MADERA_AIF3RX5_ENA_MASK                                0x0010
  #define MADERA_AIF3RX5_ENA_SHIFT                            4
-#define MADERA_AIF3RX5_ENA_WIDTH                            1
  #define MADERA_AIF3RX4_ENA                             0x0008
  #define MADERA_AIF3RX4_ENA_MASK                                0x0008
  #define MADERA_AIF3RX4_ENA_SHIFT                            3
-#define MADERA_AIF3RX4_ENA_WIDTH                            1
  #define MADERA_AIF3RX3_ENA                             0x0004
  #define MADERA_AIF3RX3_ENA_MASK                                0x0004
  #define MADERA_AIF3RX3_ENA_SHIFT                            2
-#define MADERA_AIF3RX3_ENA_WIDTH                            1
  #define MADERA_AIF3RX2_ENA                             0x0002
  #define MADERA_AIF3RX2_ENA_MASK                                0x0002
  #define MADERA_AIF3RX2_ENA_SHIFT                            1
-#define MADERA_AIF3RX2_ENA_WIDTH                            1
  #define MADERA_AIF3RX1_ENA                             0x0001
  #define MADERA_AIF3RX1_ENA_MASK                                0x0001
  #define MADERA_AIF3RX1_ENA_SHIFT                            0
-#define MADERA_AIF3RX1_ENA_WIDTH                            1
  
  /* (0x05B9)  AIF4_Tx_Enables */
  #define MADERA_AIF4TX2_ENA                             0x0002
  #define MADERA_AIF4TX2_ENA_MASK                                0x0002
  #define MADERA_AIF4TX2_ENA_SHIFT                            1
-#define MADERA_AIF4TX2_ENA_WIDTH                            1
  #define MADERA_AIF4TX1_ENA                             0x0001
  #define MADERA_AIF4TX1_ENA_MASK                                0x0001
  #define MADERA_AIF4TX1_ENA_SHIFT                            0
-#define MADERA_AIF4TX1_ENA_WIDTH                            1
  
  /* (0x05BA)  AIF4_Rx_Enables */
  #define MADERA_AIF4RX2_ENA                             0x0002
  #define MADERA_AIF4RX2_ENA_MASK                                0x0002
  #define MADERA_AIF4RX2_ENA_SHIFT                            1
-#define MADERA_AIF4RX2_ENA_WIDTH                            1
  #define MADERA_AIF4RX1_ENA                             0x0001
  #define MADERA_AIF4RX1_ENA_MASK                                0x0001
  #define MADERA_AIF4RX1_ENA_SHIFT                            0
-#define MADERA_AIF4RX1_ENA_WIDTH                            1
  
  /* (0x05C2)  SPD1_TX_Control */
  #define MADERA_SPD1_VAL2                               0x2000
  #define MADERA_SPD1_VAL2_MASK                          0x2000
  #define MADERA_SPD1_VAL2_SHIFT                             13
-#define MADERA_SPD1_VAL2_WIDTH                              1
  #define MADERA_SPD1_VAL1                               0x1000
  #define MADERA_SPD1_VAL1_MASK                          0x1000
  #define MADERA_SPD1_VAL1_SHIFT                             12
-#define MADERA_SPD1_VAL1_WIDTH                              1
  #define MADERA_SPD1_RATE_MASK                          0x00F0
  #define MADERA_SPD1_RATE_SHIFT                              4
-#define MADERA_SPD1_RATE_WIDTH                              4
  #define MADERA_SPD1_ENA                                        0x0001
  #define MADERA_SPD1_ENA_MASK                           0x0001
  #define MADERA_SPD1_ENA_SHIFT                               0
-#define MADERA_SPD1_ENA_WIDTH                               1
  
  /* (0x05F5)  SLIMbus_RX_Channel_Enable */
  #define MADERA_SLIMRX8_ENA                             0x0080
  #define MADERA_SLIMRX8_ENA_MASK                                0x0080
  #define MADERA_SLIMRX8_ENA_SHIFT                            7
-#define MADERA_SLIMRX8_ENA_WIDTH                            1
  #define MADERA_SLIMRX7_ENA                             0x0040
  #define MADERA_SLIMRX7_ENA_MASK                                0x0040
  #define MADERA_SLIMRX7_ENA_SHIFT                            6
-#define MADERA_SLIMRX7_ENA_WIDTH                            1
  #define MADERA_SLIMRX6_ENA                             0x0020
  #define MADERA_SLIMRX6_ENA_MASK                                0x0020
  #define MADERA_SLIMRX6_ENA_SHIFT                            5
-#define MADERA_SLIMRX6_ENA_WIDTH                            1
  #define MADERA_SLIMRX5_ENA                             0x0010
  #define MADERA_SLIMRX5_ENA_MASK                                0x0010
  #define MADERA_SLIMRX5_ENA_SHIFT                            4
-#define MADERA_SLIMRX5_ENA_WIDTH                            1
  #define MADERA_SLIMRX4_ENA                             0x0008
  #define MADERA_SLIMRX4_ENA_MASK                                0x0008
  #define MADERA_SLIMRX4_ENA_SHIFT                            3
-#define MADERA_SLIMRX4_ENA_WIDTH                            1
  #define MADERA_SLIMRX3_ENA                             0x0004
  #define MADERA_SLIMRX3_ENA_MASK                                0x0004
  #define MADERA_SLIMRX3_ENA_SHIFT                            2
-#define MADERA_SLIMRX3_ENA_WIDTH                            1
  #define MADERA_SLIMRX2_ENA                             0x0002
  #define MADERA_SLIMRX2_ENA_MASK                                0x0002
  #define MADERA_SLIMRX2_ENA_SHIFT                            1
-#define MADERA_SLIMRX2_ENA_WIDTH                            1
  #define MADERA_SLIMRX1_ENA                             0x0001
  #define MADERA_SLIMRX1_ENA_MASK                                0x0001
  #define MADERA_SLIMRX1_ENA_SHIFT                            0
-#define MADERA_SLIMRX1_ENA_WIDTH                            1
  
  /* (0x05F6)  SLIMbus_TX_Channel_Enable */
  #define MADERA_SLIMTX8_ENA                             0x0080
  #define MADERA_SLIMTX8_ENA_MASK                                0x0080
  #define MADERA_SLIMTX8_ENA_SHIFT                            7
-#define MADERA_SLIMTX8_ENA_WIDTH                            1
  #define MADERA_SLIMTX7_ENA                             0x0040
  #define MADERA_SLIMTX7_ENA_MASK                                0x0040
  #define MADERA_SLIMTX7_ENA_SHIFT                            6
-#define MADERA_SLIMTX7_ENA_WIDTH                            1
  #define MADERA_SLIMTX6_ENA                             0x0020
  #define MADERA_SLIMTX6_ENA_MASK                                0x0020
  #define MADERA_SLIMTX6_ENA_SHIFT                            5
-#define MADERA_SLIMTX6_ENA_WIDTH                            1
  #define MADERA_SLIMTX5_ENA                             0x0010
  #define MADERA_SLIMTX5_ENA_MASK                                0x0010
  #define MADERA_SLIMTX5_ENA_SHIFT                            4
-#define MADERA_SLIMTX5_ENA_WIDTH                            1
  #define MADERA_SLIMTX4_ENA                             0x0008
  #define MADERA_SLIMTX4_ENA_MASK                                0x0008
  #define MADERA_SLIMTX4_ENA_SHIFT                            3
-#define MADERA_SLIMTX4_ENA_WIDTH                            1
  #define MADERA_SLIMTX3_ENA                             0x0004
  #define MADERA_SLIMTX3_ENA_MASK                                0x0004
  #define MADERA_SLIMTX3_ENA_SHIFT                            2
-#define MADERA_SLIMTX3_ENA_WIDTH                            1
  #define MADERA_SLIMTX2_ENA                             0x0002
  #define MADERA_SLIMTX2_ENA_MASK                                0x0002
  #define MADERA_SLIMTX2_ENA_SHIFT                            1
-#define MADERA_SLIMTX2_ENA_WIDTH                            1
  #define MADERA_SLIMTX1_ENA                             0x0001
  #define MADERA_SLIMTX1_ENA_MASK                                0x0001
  #define MADERA_SLIMTX1_ENA_SHIFT                            0
-#define MADERA_SLIMTX1_ENA_WIDTH                            1
  
  /* (0x0E10)  EQ1_1 */
  #define MADERA_EQ1_B1_GAIN_MASK                                0xF800
  #define MADERA_EQ1_B1_GAIN_SHIFT                           11
-#define MADERA_EQ1_B1_GAIN_WIDTH                            5
  #define MADERA_EQ1_B2_GAIN_MASK                                0x07C0
  #define MADERA_EQ1_B2_GAIN_SHIFT                            6
-#define MADERA_EQ1_B2_GAIN_WIDTH                            5
  #define MADERA_EQ1_B3_GAIN_MASK                                0x003E
  #define MADERA_EQ1_B3_GAIN_SHIFT                            1
-#define MADERA_EQ1_B3_GAIN_WIDTH                            5
  #define MADERA_EQ1_ENA                                 0x0001
  #define MADERA_EQ1_ENA_MASK                            0x0001
  #define MADERA_EQ1_ENA_SHIFT                                0
-#define MADERA_EQ1_ENA_WIDTH                                1
  
  /* (0x0E11)  EQ1_2 */
  #define MADERA_EQ1_B4_GAIN_MASK                                0xF800
  #define MADERA_EQ1_B4_GAIN_SHIFT                           11
-#define MADERA_EQ1_B4_GAIN_WIDTH                            5
  #define MADERA_EQ1_B5_GAIN_MASK                                0x07C0
  #define MADERA_EQ1_B5_GAIN_SHIFT                            6
-#define MADERA_EQ1_B5_GAIN_WIDTH                            5
  #define MADERA_EQ1_B1_MODE                             0x0001
  #define MADERA_EQ1_B1_MODE_MASK                                0x0001
  #define MADERA_EQ1_B1_MODE_SHIFT                            0
-#define MADERA_EQ1_B1_MODE_WIDTH                            1
  
  /* (0x0E26)  EQ2_1 */
  #define MADERA_EQ2_B1_GAIN_MASK                                0xF800
  #define MADERA_EQ2_B1_GAIN_SHIFT                           11
-#define MADERA_EQ2_B1_GAIN_WIDTH                            5
  #define MADERA_EQ2_B2_GAIN_MASK                                0x07C0
  #define MADERA_EQ2_B2_GAIN_SHIFT                            6
-#define MADERA_EQ2_B2_GAIN_WIDTH                            5
  #define MADERA_EQ2_B3_GAIN_MASK                                0x003E
  #define MADERA_EQ2_B3_GAIN_SHIFT                            1
-#define MADERA_EQ2_B3_GAIN_WIDTH                            5
  #define MADERA_EQ2_ENA                                 0x0001
  #define MADERA_EQ2_ENA_MASK                            0x0001
  #define MADERA_EQ2_ENA_SHIFT                                0
-#define MADERA_EQ2_ENA_WIDTH                                1
  
  /* (0x0E27)  EQ2_2 */
  #define MADERA_EQ2_B4_GAIN_MASK                                0xF800
  #define MADERA_EQ2_B4_GAIN_SHIFT                           11
-#define MADERA_EQ2_B4_GAIN_WIDTH                            5
  #define MADERA_EQ2_B5_GAIN_MASK                                0x07C0
  #define MADERA_EQ2_B5_GAIN_SHIFT                            6
-#define MADERA_EQ2_B5_GAIN_WIDTH                            5
  #define MADERA_EQ2_B1_MODE                             0x0001
  #define MADERA_EQ2_B1_MODE_MASK                                0x0001
  #define MADERA_EQ2_B1_MODE_SHIFT                            0
-#define MADERA_EQ2_B1_MODE_WIDTH                            1
  
  /* (0x0E3C)  EQ3_1 */
  #define MADERA_EQ3_B1_GAIN_MASK                                0xF800
  #define MADERA_EQ3_B1_GAIN_SHIFT                           11
-#define MADERA_EQ3_B1_GAIN_WIDTH                            5
  #define MADERA_EQ3_B2_GAIN_MASK                                0x07C0
  #define MADERA_EQ3_B2_GAIN_SHIFT                            6
-#define MADERA_EQ3_B2_GAIN_WIDTH                            5
  #define MADERA_EQ3_B3_GAIN_MASK                                0x003E
  #define MADERA_EQ3_B3_GAIN_SHIFT                            1
-#define MADERA_EQ3_B3_GAIN_WIDTH                            5
  #define MADERA_EQ3_ENA                                 0x0001
  #define MADERA_EQ3_ENA_MASK                            0x0001
  #define MADERA_EQ3_ENA_SHIFT                                0
-#define MADERA_EQ3_ENA_WIDTH                                1
  
  /* (0x0E3D)  EQ3_2 */
  #define MADERA_EQ3_B4_GAIN_MASK                                0xF800
  #define MADERA_EQ3_B4_GAIN_SHIFT                           11
-#define MADERA_EQ3_B4_GAIN_WIDTH                            5
  #define MADERA_EQ3_B5_GAIN_MASK                                0x07C0
  #define MADERA_EQ3_B5_GAIN_SHIFT                            6
-#define MADERA_EQ3_B5_GAIN_WIDTH                            5
  #define MADERA_EQ3_B1_MODE                             0x0001
  #define MADERA_EQ3_B1_MODE_MASK                                0x0001
  #define MADERA_EQ3_B1_MODE_SHIFT                            0
-#define MADERA_EQ3_B1_MODE_WIDTH                            1
  
  /* (0x0E52)  EQ4_1 */
  #define MADERA_EQ4_B1_GAIN_MASK                                0xF800
  #define MADERA_EQ4_B1_GAIN_SHIFT                           11
-#define MADERA_EQ4_B1_GAIN_WIDTH                            5
  #define MADERA_EQ4_B2_GAIN_MASK                                0x07C0
  #define MADERA_EQ4_B2_GAIN_SHIFT                            6
-#define MADERA_EQ4_B2_GAIN_WIDTH                            5
  #define MADERA_EQ4_B3_GAIN_MASK                                0x003E
  #define MADERA_EQ4_B3_GAIN_SHIFT                            1
-#define MADERA_EQ4_B3_GAIN_WIDTH                            5
  #define MADERA_EQ4_ENA                                 0x0001
  #define MADERA_EQ4_ENA_MASK                            0x0001
  #define MADERA_EQ4_ENA_SHIFT                                0
-#define MADERA_EQ4_ENA_WIDTH                                1
  
  /* (0x0E53)  EQ4_2 */
  #define MADERA_EQ4_B4_GAIN_MASK                                0xF800
  #define MADERA_EQ4_B4_GAIN_SHIFT                           11
-#define MADERA_EQ4_B4_GAIN_WIDTH                            5
  #define MADERA_EQ4_B5_GAIN_MASK                                0x07C0
  #define MADERA_EQ4_B5_GAIN_SHIFT                            6
-#define MADERA_EQ4_B5_GAIN_WIDTH                            5
  #define MADERA_EQ4_B1_MODE                             0x0001
  #define MADERA_EQ4_B1_MODE_MASK                                0x0001
  #define MADERA_EQ4_B1_MODE_SHIFT                            0
-#define MADERA_EQ4_B1_MODE_WIDTH                            1
  
  /* (0x0E80)  DRC1_ctrl1 */
  #define MADERA_DRC1L_ENA                               0x0002
  #define MADERA_DRC1L_ENA_MASK                          0x0002
  #define MADERA_DRC1L_ENA_SHIFT                              1
-#define MADERA_DRC1L_ENA_WIDTH                              1
  #define MADERA_DRC1R_ENA                               0x0001
  #define MADERA_DRC1R_ENA_MASK                          0x0001
  #define MADERA_DRC1R_ENA_SHIFT                              0
-#define MADERA_DRC1R_ENA_WIDTH                              1
  
  /* (0x0E88)  DRC2_ctrl1 */
  #define MADERA_DRC2L_ENA                               0x0002
  #define MADERA_DRC2L_ENA_MASK                          0x0002
  #define MADERA_DRC2L_ENA_SHIFT                              1
-#define MADERA_DRC2L_ENA_WIDTH                              1
  #define MADERA_DRC2R_ENA                               0x0001
  #define MADERA_DRC2R_ENA_MASK                          0x0001
  #define MADERA_DRC2R_ENA_SHIFT                              0
-#define MADERA_DRC2R_ENA_WIDTH                              1
  
  /* (0x0EC0)  HPLPF1_1 */
  #define MADERA_LHPF1_MODE                              0x0002
  #define MADERA_LHPF1_MODE_MASK                         0x0002
  #define MADERA_LHPF1_MODE_SHIFT                                     1
-#define MADERA_LHPF1_MODE_WIDTH                                     1
  #define MADERA_LHPF1_ENA                               0x0001
  #define MADERA_LHPF1_ENA_MASK                          0x0001
  #define MADERA_LHPF1_ENA_SHIFT                              0
-#define MADERA_LHPF1_ENA_WIDTH                              1
  
  /* (0x0EC1)  HPLPF1_2 */
  #define MADERA_LHPF1_COEFF_MASK                                0xFFFF
  #define MADERA_LHPF1_COEFF_SHIFT                            0
-#define MADERA_LHPF1_COEFF_WIDTH                           16
  
  /* (0x0EC4)  HPLPF2_1 */
  #define MADERA_LHPF2_MODE                              0x0002
  #define MADERA_LHPF2_MODE_MASK                         0x0002
  #define MADERA_LHPF2_MODE_SHIFT                                     1
-#define MADERA_LHPF2_MODE_WIDTH                                     1
  #define MADERA_LHPF2_ENA                               0x0001
  #define MADERA_LHPF2_ENA_MASK                          0x0001
  #define MADERA_LHPF2_ENA_SHIFT                              0
-#define MADERA_LHPF2_ENA_WIDTH                              1
  
  /* (0x0EC5)  HPLPF2_2 */
  #define MADERA_LHPF2_COEFF_MASK                                0xFFFF
  #define MADERA_LHPF2_COEFF_SHIFT                            0
-#define MADERA_LHPF2_COEFF_WIDTH                           16
  
  /* (0x0EC8)  HPLPF3_1 */
  #define MADERA_LHPF3_MODE                              0x0002
  #define MADERA_LHPF3_MODE_MASK                         0x0002
  #define MADERA_LHPF3_MODE_SHIFT                                     1
-#define MADERA_LHPF3_MODE_WIDTH                                     1
  #define MADERA_LHPF3_ENA                               0x0001
  #define MADERA_LHPF3_ENA_MASK                          0x0001
  #define MADERA_LHPF3_ENA_SHIFT                              0
-#define MADERA_LHPF3_ENA_WIDTH                              1
  
  /* (0x0EC9)  HPLPF3_2 */
  #define MADERA_LHPF3_COEFF_MASK                                0xFFFF
  #define MADERA_LHPF3_COEFF_SHIFT                            0
-#define MADERA_LHPF3_COEFF_WIDTH                           16
  
  /* (0x0ECC)  HPLPF4_1 */
  #define MADERA_LHPF4_MODE                              0x0002
  #define MADERA_LHPF4_MODE_MASK                         0x0002
  #define MADERA_LHPF4_MODE_SHIFT                                     1
-#define MADERA_LHPF4_MODE_WIDTH                                     1
  #define MADERA_LHPF4_ENA                               0x0001
  #define MADERA_LHPF4_ENA_MASK                          0x0001
  #define MADERA_LHPF4_ENA_SHIFT                              0
-#define MADERA_LHPF4_ENA_WIDTH                              1
  
  /* (0x0ECD)  HPLPF4_2 */
  #define MADERA_LHPF4_COEFF_MASK                                0xFFFF
  #define MADERA_LHPF4_COEFF_SHIFT                            0
-#define MADERA_LHPF4_COEFF_WIDTH                           16
  
  /* (0x0ED0)  ASRC2_ENABLE */
  #define MADERA_ASRC2_IN2L_ENA                          0x0008
  #define MADERA_ASRC2_IN2L_ENA_MASK                     0x0008
  #define MADERA_ASRC2_IN2L_ENA_SHIFT                         3
-#define MADERA_ASRC2_IN2L_ENA_WIDTH                         1
  #define MADERA_ASRC2_IN2R_ENA                          0x0004
  #define MADERA_ASRC2_IN2R_ENA_MASK                     0x0004
  #define MADERA_ASRC2_IN2R_ENA_SHIFT                         2
-#define MADERA_ASRC2_IN2R_ENA_WIDTH                         1
  #define MADERA_ASRC2_IN1L_ENA                          0x0002
  #define MADERA_ASRC2_IN1L_ENA_MASK                     0x0002
  #define MADERA_ASRC2_IN1L_ENA_SHIFT                         1
-#define MADERA_ASRC2_IN1L_ENA_WIDTH                         1
  #define MADERA_ASRC2_IN1R_ENA                          0x0001
  #define MADERA_ASRC2_IN1R_ENA_MASK                     0x0001
  #define MADERA_ASRC2_IN1R_ENA_SHIFT                         0
-#define MADERA_ASRC2_IN1R_ENA_WIDTH                         1
  
  /* (0x0ED2)  ASRC2_RATE1 */
  #define MADERA_ASRC2_RATE1_MASK                                0xF800
  #define MADERA_ASRC2_RATE1_SHIFT                           11
-#define MADERA_ASRC2_RATE1_WIDTH                            5
  
  /* (0x0ED3)  ASRC2_RATE2 */
  #define MADERA_ASRC2_RATE2_MASK                                0xF800
  #define MADERA_ASRC2_RATE2_SHIFT                           11
-#define MADERA_ASRC2_RATE2_WIDTH                            5
  
  /* (0x0EE0)  ASRC1_ENABLE */
  #define MADERA_ASRC1_IN2L_ENA                          0x0008
  #define MADERA_ASRC1_IN2L_ENA_MASK                     0x0008
  #define MADERA_ASRC1_IN2L_ENA_SHIFT                         3
-#define MADERA_ASRC1_IN2L_ENA_WIDTH                         1
  #define MADERA_ASRC1_IN2R_ENA                          0x0004
  #define MADERA_ASRC1_IN2R_ENA_MASK                     0x0004
  #define MADERA_ASRC1_IN2R_ENA_SHIFT                         2
-#define MADERA_ASRC1_IN2R_ENA_WIDTH                         1
  #define MADERA_ASRC1_IN1L_ENA                          0x0002
  #define MADERA_ASRC1_IN1L_ENA_MASK                     0x0002
  #define MADERA_ASRC1_IN1L_ENA_SHIFT                         1
-#define MADERA_ASRC1_IN1L_ENA_WIDTH                         1
  #define MADERA_ASRC1_IN1R_ENA                          0x0001
  #define MADERA_ASRC1_IN1R_ENA_MASK                     0x0001
  #define MADERA_ASRC1_IN1R_ENA_SHIFT                         0
-#define MADERA_ASRC1_IN1R_ENA_WIDTH                         1
  
  /* (0x0EE2)  ASRC1_RATE1 */
  #define MADERA_ASRC1_RATE1_MASK                                0xF800
  #define MADERA_ASRC1_RATE1_SHIFT                           11
-#define MADERA_ASRC1_RATE1_WIDTH                            5
  
  /* (0x0EE3)  ASRC1_RATE2 */
  #define MADERA_ASRC1_RATE2_MASK                                0xF800
  #define MADERA_ASRC1_RATE2_SHIFT                           11
-#define MADERA_ASRC1_RATE2_WIDTH                            5
  
  /* (0x0EF0) - ISRC1 CTRL 1 */
  #define MADERA_ISRC1_FSH_MASK                          0xF800
  #define MADERA_ISRC1_FSH_SHIFT                             11
-#define MADERA_ISRC1_FSH_WIDTH                              5
  #define MADERA_ISRC1_CLK_SEL_MASK                      0x0700
  #define MADERA_ISRC1_CLK_SEL_SHIFT                          8
-#define MADERA_ISRC1_CLK_SEL_WIDTH                          3
  
  /* (0x0EF1)  ISRC1_CTRL_2 */
  #define MADERA_ISRC1_FSL_MASK                          0xF800
  #define MADERA_ISRC1_FSL_SHIFT                             11
-#define MADERA_ISRC1_FSL_WIDTH                              5
  
  /* (0x0EF2)  ISRC1_CTRL_3 */
  #define MADERA_ISRC1_INT1_ENA                          0x8000
  #define MADERA_ISRC1_INT1_ENA_MASK                     0x8000
  #define MADERA_ISRC1_INT1_ENA_SHIFT                        15
-#define MADERA_ISRC1_INT1_ENA_WIDTH                         1
  #define MADERA_ISRC1_INT2_ENA                          0x4000
  #define MADERA_ISRC1_INT2_ENA_MASK                     0x4000
  #define MADERA_ISRC1_INT2_ENA_SHIFT                        14
-#define MADERA_ISRC1_INT2_ENA_WIDTH                         1
  #define MADERA_ISRC1_INT3_ENA                          0x2000
  #define MADERA_ISRC1_INT3_ENA_MASK                     0x2000
  #define MADERA_ISRC1_INT3_ENA_SHIFT                        13
-#define MADERA_ISRC1_INT3_ENA_WIDTH                         1
  #define MADERA_ISRC1_INT4_ENA                          0x1000
  #define MADERA_ISRC1_INT4_ENA_MASK                     0x1000
  #define MADERA_ISRC1_INT4_ENA_SHIFT                        12
-#define MADERA_ISRC1_INT4_ENA_WIDTH                         1
  #define MADERA_ISRC1_DEC1_ENA                          0x0200
  #define MADERA_ISRC1_DEC1_ENA_MASK                     0x0200
  #define MADERA_ISRC1_DEC1_ENA_SHIFT                         9
-#define MADERA_ISRC1_DEC1_ENA_WIDTH                         1
  #define MADERA_ISRC1_DEC2_ENA                          0x0100
  #define MADERA_ISRC1_DEC2_ENA_MASK                     0x0100
  #define MADERA_ISRC1_DEC2_ENA_SHIFT                         8
-#define MADERA_ISRC1_DEC2_ENA_WIDTH                         1
  #define MADERA_ISRC1_DEC3_ENA                          0x0080
  #define MADERA_ISRC1_DEC3_ENA_MASK                     0x0080
  #define MADERA_ISRC1_DEC3_ENA_SHIFT                         7
-#define MADERA_ISRC1_DEC3_ENA_WIDTH                         1
  #define MADERA_ISRC1_DEC4_ENA                          0x0040
  #define MADERA_ISRC1_DEC4_ENA_MASK                     0x0040
  #define MADERA_ISRC1_DEC4_ENA_SHIFT                         6
-#define MADERA_ISRC1_DEC4_ENA_WIDTH                         1
  #define MADERA_ISRC1_NOTCH_ENA                         0x0001
  #define MADERA_ISRC1_NOTCH_ENA_MASK                    0x0001
  #define MADERA_ISRC1_NOTCH_ENA_SHIFT                        0
-#define MADERA_ISRC1_NOTCH_ENA_WIDTH                        1
  
  /* (0x0EF3)  ISRC2_CTRL_1 */
  #define MADERA_ISRC2_FSH_MASK                          0xF800
  #define MADERA_ISRC2_FSH_SHIFT                             11
-#define MADERA_ISRC2_FSH_WIDTH                              5
  #define MADERA_ISRC2_CLK_SEL_MASK                      0x0700
  #define MADERA_ISRC2_CLK_SEL_SHIFT                          8
-#define MADERA_ISRC2_CLK_SEL_WIDTH                          3
  
  /* (0x0EF4)  ISRC2_CTRL_2 */
  #define MADERA_ISRC2_FSL_MASK                          0xF800
  #define MADERA_ISRC2_FSL_SHIFT                             11
-#define MADERA_ISRC2_FSL_WIDTH                              5
  
  /* (0x0EF5)  ISRC2_CTRL_3 */
  #define MADERA_ISRC2_INT1_ENA                          0x8000
  #define MADERA_ISRC2_INT1_ENA_MASK                     0x8000
  #define MADERA_ISRC2_INT1_ENA_SHIFT                        15
-#define MADERA_ISRC2_INT1_ENA_WIDTH                         1
  #define MADERA_ISRC2_INT2_ENA                          0x4000
  #define MADERA_ISRC2_INT2_ENA_MASK                     0x4000
  #define MADERA_ISRC2_INT2_ENA_SHIFT                        14
-#define MADERA_ISRC2_INT2_ENA_WIDTH                         1
  #define MADERA_ISRC2_INT3_ENA                          0x2000
  #define MADERA_ISRC2_INT3_ENA_MASK                     0x2000
  #define MADERA_ISRC2_INT3_ENA_SHIFT                        13
-#define MADERA_ISRC2_INT3_ENA_WIDTH                         1
  #define MADERA_ISRC2_INT4_ENA                          0x1000
  #define MADERA_ISRC2_INT4_ENA_MASK                     0x1000
  #define MADERA_ISRC2_INT4_ENA_SHIFT                        12
-#define MADERA_ISRC2_INT4_ENA_WIDTH                         1
  #define MADERA_ISRC2_DEC1_ENA                          0x0200
  #define MADERA_ISRC2_DEC1_ENA_MASK                     0x0200
  #define MADERA_ISRC2_DEC1_ENA_SHIFT                         9
-#define MADERA_ISRC2_DEC1_ENA_WIDTH                         1
  #define MADERA_ISRC2_DEC2_ENA                          0x0100
  #define MADERA_ISRC2_DEC2_ENA_MASK                     0x0100
  #define MADERA_ISRC2_DEC2_ENA_SHIFT                         8
-#define MADERA_ISRC2_DEC2_ENA_WIDTH                         1
  #define MADERA_ISRC2_DEC3_ENA                          0x0080
  #define MADERA_ISRC2_DEC3_ENA_MASK                     0x0080
  #define MADERA_ISRC2_DEC3_ENA_SHIFT                         7
-#define MADERA_ISRC2_DEC3_ENA_WIDTH                         1
  #define MADERA_ISRC2_DEC4_ENA                          0x0040
  #define MADERA_ISRC2_DEC4_ENA_MASK                     0x0040
  #define MADERA_ISRC2_DEC4_ENA_SHIFT                         6
-#define MADERA_ISRC2_DEC4_ENA_WIDTH                         1
  #define MADERA_ISRC2_NOTCH_ENA                         0x0001
  #define MADERA_ISRC2_NOTCH_ENA_MASK                    0x0001
  #define MADERA_ISRC2_NOTCH_ENA_SHIFT                        0
-#define MADERA_ISRC2_NOTCH_ENA_WIDTH                        1
  
  /* (0x0EF6)  ISRC3_CTRL_1 */
  #define MADERA_ISRC3_FSH_MASK                          0xF800
  #define MADERA_ISRC3_FSH_SHIFT                             11
-#define MADERA_ISRC3_FSH_WIDTH                              5
  #define MADERA_ISRC3_CLK_SEL_MASK                      0x0700
  #define MADERA_ISRC3_CLK_SEL_SHIFT                          8
-#define MADERA_ISRC3_CLK_SEL_WIDTH                          3
  
  /* (0x0EF7)  ISRC3_CTRL_2 */
  #define MADERA_ISRC3_FSL_MASK                          0xF800
  #define MADERA_ISRC3_FSL_SHIFT                             11
-#define MADERA_ISRC3_FSL_WIDTH                              5
  
  /* (0x0EF8)  ISRC3_CTRL_3 */
  #define MADERA_ISRC3_INT1_ENA                          0x8000
  #define MADERA_ISRC3_INT1_ENA_MASK                     0x8000
  #define MADERA_ISRC3_INT1_ENA_SHIFT                        15
-#define MADERA_ISRC3_INT1_ENA_WIDTH                         1
  #define MADERA_ISRC3_INT2_ENA                          0x4000
  #define MADERA_ISRC3_INT2_ENA_MASK                     0x4000
  #define MADERA_ISRC3_INT2_ENA_SHIFT                        14
-#define MADERA_ISRC3_INT2_ENA_WIDTH                         1
  #define MADERA_ISRC3_INT3_ENA                          0x2000
  #define MADERA_ISRC3_INT3_ENA_MASK                     0x2000
  #define MADERA_ISRC3_INT3_ENA_SHIFT                        13
-#define MADERA_ISRC3_INT3_ENA_WIDTH                         1
  #define MADERA_ISRC3_INT4_ENA                          0x1000
  #define MADERA_ISRC3_INT4_ENA_MASK                     0x1000
  #define MADERA_ISRC3_INT4_ENA_SHIFT                        12
-#define MADERA_ISRC3_INT4_ENA_WIDTH                         1
  #define MADERA_ISRC3_DEC1_ENA                          0x0200
  #define MADERA_ISRC3_DEC1_ENA_MASK                     0x0200
  #define MADERA_ISRC3_DEC1_ENA_SHIFT                         9
-#define MADERA_ISRC3_DEC1_ENA_WIDTH                         1
  #define MADERA_ISRC3_DEC2_ENA                          0x0100
  #define MADERA_ISRC3_DEC2_ENA_MASK                     0x0100
  #define MADERA_ISRC3_DEC2_ENA_SHIFT                         8
-#define MADERA_ISRC3_DEC2_ENA_WIDTH                         1
  #define MADERA_ISRC3_DEC3_ENA                          0x0080
  #define MADERA_ISRC3_DEC3_ENA_MASK                     0x0080
  #define MADERA_ISRC3_DEC3_ENA_SHIFT                         7
-#define MADERA_ISRC3_DEC3_ENA_WIDTH                         1
  #define MADERA_ISRC3_DEC4_ENA                          0x0040
  #define MADERA_ISRC3_DEC4_ENA_MASK                     0x0040
  #define MADERA_ISRC3_DEC4_ENA_SHIFT                         6
-#define MADERA_ISRC3_DEC4_ENA_WIDTH                         1
  #define MADERA_ISRC3_NOTCH_ENA                         0x0001
  #define MADERA_ISRC3_NOTCH_ENA_MASK                    0x0001
  #define MADERA_ISRC3_NOTCH_ENA_SHIFT                        0
-#define MADERA_ISRC3_NOTCH_ENA_WIDTH                        1
  
  /* (0x0EF9)  ISRC4_CTRL_1 */
  #define MADERA_ISRC4_FSH_MASK                          0xF800
  #define MADERA_ISRC4_FSH_SHIFT                             11
-#define MADERA_ISRC4_FSH_WIDTH                              5
  #define MADERA_ISRC4_CLK_SEL_MASK                      0x0700
  #define MADERA_ISRC4_CLK_SEL_SHIFT                          8
-#define MADERA_ISRC4_CLK_SEL_WIDTH                          3
  
  /* (0x0EFA)  ISRC4_CTRL_2 */
  #define MADERA_ISRC4_FSL_MASK                          0xF800
  #define MADERA_ISRC4_FSL_SHIFT                             11
-#define MADERA_ISRC4_FSL_WIDTH                              5
  
  /* (0x0EFB)  ISRC4_CTRL_3 */
  #define MADERA_ISRC4_INT1_ENA                          0x8000
  #define MADERA_ISRC4_INT1_ENA_MASK                     0x8000
  #define MADERA_ISRC4_INT1_ENA_SHIFT                        15
-#define MADERA_ISRC4_INT1_ENA_WIDTH                         1
  #define MADERA_ISRC4_INT2_ENA                          0x4000
  #define MADERA_ISRC4_INT2_ENA_MASK                     0x4000
  #define MADERA_ISRC4_INT2_ENA_SHIFT                        14
-#define MADERA_ISRC4_INT2_ENA_WIDTH                         1
  #define MADERA_ISRC4_INT3_ENA                          0x2000
  #define MADERA_ISRC4_INT3_ENA_MASK                     0x2000
  #define MADERA_ISRC4_INT3_ENA_SHIFT                        13
-#define MADERA_ISRC4_INT3_ENA_WIDTH                         1
  #define MADERA_ISRC4_INT4_ENA                          0x1000
  #define MADERA_ISRC4_INT4_ENA_MASK                     0x1000
  #define MADERA_ISRC4_INT4_ENA_SHIFT                        12
-#define MADERA_ISRC4_INT4_ENA_WIDTH                         1
  #define MADERA_ISRC4_DEC1_ENA                          0x0200
  #define MADERA_ISRC4_DEC1_ENA_MASK                     0x0200
  #define MADERA_ISRC4_DEC1_ENA_SHIFT                         9
-#define MADERA_ISRC4_DEC1_ENA_WIDTH                         1
  #define MADERA_ISRC4_DEC2_ENA                          0x0100
  #define MADERA_ISRC4_DEC2_ENA_MASK                     0x0100
  #define MADERA_ISRC4_DEC2_ENA_SHIFT                         8
-#define MADERA_ISRC4_DEC2_ENA_WIDTH                         1
  #define MADERA_ISRC4_DEC3_ENA                          0x0080
  #define MADERA_ISRC4_DEC3_ENA_MASK                     0x0080
  #define MADERA_ISRC4_DEC3_ENA_SHIFT                         7
-#define MADERA_ISRC4_DEC3_ENA_WIDTH                         1
  #define MADERA_ISRC4_DEC4_ENA                          0x0040
  #define MADERA_ISRC4_DEC4_ENA_MASK                     0x0040
  #define MADERA_ISRC4_DEC4_ENA_SHIFT                         6
-#define MADERA_ISRC4_DEC4_ENA_WIDTH                         1
  #define MADERA_ISRC4_NOTCH_ENA                         0x0001
  #define MADERA_ISRC4_NOTCH_ENA_MASK                    0x0001
  #define MADERA_ISRC4_NOTCH_ENA_SHIFT                        0
-#define MADERA_ISRC4_NOTCH_ENA_WIDTH                        1
  
  /* (0x0F00)  Clock_Control */
  #define MADERA_EXT_NG_SEL_CLR                          0x0080
  #define MADERA_EXT_NG_SEL_CLR_MASK                     0x0080
  #define MADERA_EXT_NG_SEL_CLR_SHIFT                         7
-#define MADERA_EXT_NG_SEL_CLR_WIDTH                         1
  #define MADERA_EXT_NG_SEL_SET                          0x0040
  #define MADERA_EXT_NG_SEL_SET_MASK                     0x0040
  #define MADERA_EXT_NG_SEL_SET_SHIFT                         6
-#define MADERA_EXT_NG_SEL_SET_WIDTH                         1
  #define MADERA_CLK_R_ENA_CLR                           0x0020
  #define MADERA_CLK_R_ENA_CLR_MASK                      0x0020
  #define MADERA_CLK_R_ENA_CLR_SHIFT                          5
-#define MADERA_CLK_R_ENA_CLR_WIDTH                          1
  #define MADERA_CLK_R_ENA_SET                           0x0010
  #define MADERA_CLK_R_ENA_SET_MASK                      0x0010
  #define MADERA_CLK_R_ENA_SET_SHIFT                          4
-#define MADERA_CLK_R_ENA_SET_WIDTH                          1
  #define MADERA_CLK_NG_ENA_CLR                          0x0008
  #define MADERA_CLK_NG_ENA_CLR_MASK                     0x0008
  #define MADERA_CLK_NG_ENA_CLR_SHIFT                         3
-#define MADERA_CLK_NG_ENA_CLR_WIDTH                         1
  #define MADERA_CLK_NG_ENA_SET                          0x0004
  #define MADERA_CLK_NG_ENA_SET_MASK                     0x0004
  #define MADERA_CLK_NG_ENA_SET_SHIFT                         2
-#define MADERA_CLK_NG_ENA_SET_WIDTH                         1
  #define MADERA_CLK_L_ENA_CLR                           0x0002
  #define MADERA_CLK_L_ENA_CLR_MASK                      0x0002
  #define MADERA_CLK_L_ENA_CLR_SHIFT                          1
-#define MADERA_CLK_L_ENA_CLR_WIDTH                          1
  #define MADERA_CLK_L_ENA_SET                           0x0001
  #define MADERA_CLK_L_ENA_SET_MASK                      0x0001
  #define MADERA_CLK_L_ENA_SET_SHIFT                          0
-#define MADERA_CLK_L_ENA_SET_WIDTH                          1
  
  /* (0x0F01)  ANC_SRC */
  #define MADERA_IN_RXANCR_SEL_MASK                      0x0070
  #define MADERA_IN_RXANCR_SEL_SHIFT                          4
-#define MADERA_IN_RXANCR_SEL_WIDTH                          3
  #define MADERA_IN_RXANCL_SEL_MASK                      0x0007
  #define MADERA_IN_RXANCL_SEL_SHIFT                          0
-#define MADERA_IN_RXANCL_SEL_WIDTH                          3
  
  /* (0x0F17)  FCL_ADC_reformatter_control */
  #define MADERA_FCL_MIC_MODE_SEL                                0x000C
  #define MADERA_FCL_MIC_MODE_SEL_SHIFT                       2
-#define MADERA_FCL_MIC_MODE_SEL_WIDTH                       2
  
  /* (0x0F73)  FCR_ADC_reformatter_control */
  #define MADERA_FCR_MIC_MODE_SEL                                0x000C
  #define MADERA_FCR_MIC_MODE_SEL_SHIFT                       2
-#define MADERA_FCR_MIC_MODE_SEL_WIDTH                       2
  
  /* (0x10C0)  AUXPDM1_CTRL_0 */
  #define MADERA_AUXPDM1_SRC_MASK                                0x0F00
  #define MADERA_AUXPDM1_SRC_SHIFT                            8
-#define MADERA_AUXPDM1_SRC_WIDTH                            4
  #define MADERA_AUXPDM1_TXEDGE_MASK                     0x0010
  #define MADERA_AUXPDM1_TXEDGE_SHIFT                         4
-#define MADERA_AUXPDM1_TXEDGE_WIDTH                         1
  #define MADERA_AUXPDM1_MSTR_MASK                       0x0008
  #define MADERA_AUXPDM1_MSTR_SHIFT                           3
-#define MADERA_AUXPDM1_MSTR_WIDTH                           1
  #define MADERA_AUXPDM1_ENABLE_MASK                     0x0001
  #define MADERA_AUXPDM1_ENABLE_SHIFT                         0
-#define MADERA_AUXPDM1_ENABLE_WIDTH                         1
  
  /* (0x10C1)  AUXPDM1_CTRL_1 */
  #define MADERA_AUXPDM1_CLK_FREQ_MASK                   0xC000
  #define MADERA_AUXPDM1_CLK_FREQ_SHIFT                      14
-#define MADERA_AUXPDM1_CLK_FREQ_WIDTH                       2
  
  /* (0x1480)  DFC1_CTRL_W0 */
  #define MADERA_DFC1_RATE_MASK                          0x007C
  #define MADERA_DFC1_RATE_SHIFT                              2
-#define MADERA_DFC1_RATE_WIDTH                              5
  #define MADERA_DFC1_DITH_ENA                           0x0002
  #define MADERA_DFC1_DITH_ENA_MASK                      0x0002
  #define MADERA_DFC1_DITH_ENA_SHIFT                          1
-#define MADERA_DFC1_DITH_ENA_WIDTH                          1
  #define MADERA_DFC1_ENA                                        0x0001
  #define MADERA_DFC1_ENA_MASK                           0x0001
  #define MADERA_DFC1_ENA_SHIFT                               0
-#define MADERA_DFC1_ENA_WIDTH                               1
  
  /* (0x1482)  DFC1_RX_W0 */
  #define MADERA_DFC1_RX_DATA_WIDTH_MASK                 0x1F00
  #define MADERA_DFC1_RX_DATA_WIDTH_SHIFT                             8
-#define MADERA_DFC1_RX_DATA_WIDTH_WIDTH                             5
  
  #define MADERA_DFC1_RX_DATA_TYPE_MASK                  0x0007
  #define MADERA_DFC1_RX_DATA_TYPE_SHIFT                      0
-#define MADERA_DFC1_RX_DATA_TYPE_WIDTH                      3
  
  /* (0x1484)  DFC1_TX_W0 */
  #define MADERA_DFC1_TX_DATA_WIDTH_MASK                 0x1F00
  #define MADERA_DFC1_TX_DATA_WIDTH_SHIFT                             8
-#define MADERA_DFC1_TX_DATA_WIDTH_WIDTH                             5
  
  #define MADERA_DFC1_TX_DATA_TYPE_MASK                  0x0007
  #define MADERA_DFC1_TX_DATA_TYPE_SHIFT                      0
-#define MADERA_DFC1_TX_DATA_TYPE_WIDTH                      3
  
  /* (0x1600)  ADSP2_IRQ0 */
  #define MADERA_DSP_IRQ2                                        0x0002
@@ -3636,449 +3103,347 @@
  #define MADERA_GP1_LVL                                 0x8000
  #define MADERA_GP1_LVL_MASK                            0x8000
  #define MADERA_GP1_LVL_SHIFT                               15
-#define MADERA_GP1_LVL_WIDTH                                1
  #define MADERA_GP1_OP_CFG                              0x4000
  #define MADERA_GP1_OP_CFG_MASK                         0x4000
  #define MADERA_GP1_OP_CFG_SHIFT                                    14
-#define MADERA_GP1_OP_CFG_WIDTH                                     1
  #define MADERA_GP1_DB                                  0x2000
  #define MADERA_GP1_DB_MASK                             0x2000
  #define MADERA_GP1_DB_SHIFT                                13
-#define MADERA_GP1_DB_WIDTH                                 1
  #define MADERA_GP1_POL                                 0x1000
  #define MADERA_GP1_POL_MASK                            0x1000
  #define MADERA_GP1_POL_SHIFT                               12
-#define MADERA_GP1_POL_WIDTH                                1
  #define MADERA_GP1_IP_CFG                              0x0800
  #define MADERA_GP1_IP_CFG_MASK                         0x0800
  #define MADERA_GP1_IP_CFG_SHIFT                                    11
-#define MADERA_GP1_IP_CFG_WIDTH                                     1
  #define MADERA_GP1_FN_MASK                             0x03FF
  #define MADERA_GP1_FN_SHIFT                                 0
-#define MADERA_GP1_FN_WIDTH                                10
  
  /* (0x1701)  GPIO1_CTRL_2 */
  #define MADERA_GP1_DIR                                 0x8000
  #define MADERA_GP1_DIR_MASK                            0x8000
  #define MADERA_GP1_DIR_SHIFT                               15
-#define MADERA_GP1_DIR_WIDTH                                1
  #define MADERA_GP1_PU                                  0x4000
  #define MADERA_GP1_PU_MASK                             0x4000
  #define MADERA_GP1_PU_SHIFT                                14
-#define MADERA_GP1_PU_WIDTH                                 1
  #define MADERA_GP1_PD                                  0x2000
  #define MADERA_GP1_PD_MASK                             0x2000
  #define MADERA_GP1_PD_SHIFT                                13
-#define MADERA_GP1_PD_WIDTH                                 1
  #define MADERA_GP1_DRV_STR_MASK                                0x1800
  #define MADERA_GP1_DRV_STR_SHIFT                           11
-#define MADERA_GP1_DRV_STR_WIDTH                            2
  
  /* (0x1800)  IRQ1_Status_1 */
  #define MADERA_CTRLIF_ERR_EINT1                                0x1000
  #define MADERA_CTRLIF_ERR_EINT1_MASK                   0x1000
  #define MADERA_CTRLIF_ERR_EINT1_SHIFT                      12
-#define MADERA_CTRLIF_ERR_EINT1_WIDTH                       1
  #define MADERA_SYSCLK_FAIL_EINT1                       0x0200
  #define MADERA_SYSCLK_FAIL_EINT1_MASK                  0x0200
  #define MADERA_SYSCLK_FAIL_EINT1_SHIFT                      9
-#define MADERA_SYSCLK_FAIL_EINT1_WIDTH                      1
  #define MADERA_CLOCK_DETECT_EINT1                      0x0100
  #define MADERA_CLOCK_DETECT_EINT1_MASK                 0x0100
  #define MADERA_CLOCK_DETECT_EINT1_SHIFT                             8
-#define MADERA_CLOCK_DETECT_EINT1_WIDTH                             1
  #define MADERA_BOOT_DONE_EINT1                         0x0080
  #define MADERA_BOOT_DONE_EINT1_MASK                    0x0080
  #define MADERA_BOOT_DONE_EINT1_SHIFT                        7
-#define MADERA_BOOT_DONE_EINT1_WIDTH                        1
  
  /* (0x1801)  IRQ1_Status_2 */
  #define MADERA_FLLAO_LOCK_EINT1                                0x0800
  #define MADERA_FLLAO_LOCK_EINT1_MASK                   0x0800
  #define MADERA_FLLAO_LOCK_EINT1_SHIFT                      11
-#define MADERA_FLLAO_LOCK_EINT1_WIDTH                       1
  #define MADERA_FLL3_LOCK_EINT1                         0x0400
  #define MADERA_FLL3_LOCK_EINT1_MASK                    0x0400
  #define MADERA_FLL3_LOCK_EINT1_SHIFT                       10
-#define MADERA_FLL3_LOCK_EINT1_WIDTH                        1
  #define MADERA_FLL2_LOCK_EINT1                         0x0200
  #define MADERA_FLL2_LOCK_EINT1_MASK                    0x0200
  #define MADERA_FLL2_LOCK_EINT1_SHIFT                        9
-#define MADERA_FLL2_LOCK_EINT1_WIDTH                        1
  #define MADERA_FLL1_LOCK_EINT1                         0x0100
  #define MADERA_FLL1_LOCK_EINT1_MASK                    0x0100
  #define MADERA_FLL1_LOCK_EINT1_SHIFT                        8
-#define MADERA_FLL1_LOCK_EINT1_WIDTH                        1
  
  /* (0x1805)  IRQ1_Status_6 */
  #define MADERA_MICDET2_EINT1                           0x0200
  #define MADERA_MICDET2_EINT1_MASK                      0x0200
  #define MADERA_MICDET2_EINT1_SHIFT                          9
-#define MADERA_MICDET2_EINT1_WIDTH                          1
  #define MADERA_MICDET1_EINT1                           0x0100
  #define MADERA_MICDET1_EINT1_MASK                      0x0100
  #define MADERA_MICDET1_EINT1_SHIFT                          8
-#define MADERA_MICDET1_EINT1_WIDTH                          1
  #define MADERA_HPDET_EINT1                             0x0001
  #define MADERA_HPDET_EINT1_MASK                                0x0001
  #define MADERA_HPDET_EINT1_SHIFT                            0
-#define MADERA_HPDET_EINT1_WIDTH                            1
  
  /* (0x1806)  IRQ1_Status_7 */
  #define MADERA_MICD_CLAMP_FALL_EINT1                   0x0020
  #define MADERA_MICD_CLAMP_FALL_EINT1_MASK              0x0020
  #define MADERA_MICD_CLAMP_FALL_EINT1_SHIFT                  5
-#define MADERA_MICD_CLAMP_FALL_EINT1_WIDTH                  1
  #define MADERA_MICD_CLAMP_RISE_EINT1                   0x0010
  #define MADERA_MICD_CLAMP_RISE_EINT1_MASK              0x0010
  #define MADERA_MICD_CLAMP_RISE_EINT1_SHIFT                  4
-#define MADERA_MICD_CLAMP_RISE_EINT1_WIDTH                  1
  #define MADERA_JD2_FALL_EINT1                          0x0008
  #define MADERA_JD2_FALL_EINT1_MASK                     0x0008
  #define MADERA_JD2_FALL_EINT1_SHIFT                         3
-#define MADERA_JD2_FALL_EINT1_WIDTH                         1
  #define MADERA_JD2_RISE_EINT1                          0x0004
  #define MADERA_JD2_RISE_EINT1_MASK                     0x0004
  #define MADERA_JD2_RISE_EINT1_SHIFT                         2
-#define MADERA_JD2_RISE_EINT1_WIDTH                         1
  #define MADERA_JD1_FALL_EINT1                          0x0002
  #define MADERA_JD1_FALL_EINT1_MASK                     0x0002
  #define MADERA_JD1_FALL_EINT1_SHIFT                         1
-#define MADERA_JD1_FALL_EINT1_WIDTH                         1
  #define MADERA_JD1_RISE_EINT1                          0x0001
  #define MADERA_JD1_RISE_EINT1_MASK                     0x0001
  #define MADERA_JD1_RISE_EINT1_SHIFT                         0
-#define MADERA_JD1_RISE_EINT1_WIDTH                         1
  
  /* (0x1808)  IRQ1_Status_9 */
  #define MADERA_ASRC2_IN2_LOCK_EINT1                    0x0800
  #define MADERA_ASRC2_IN2_LOCK_EINT1_MASK               0x0800
  #define MADERA_ASRC2_IN2_LOCK_EINT1_SHIFT                  11
-#define MADERA_ASRC2_IN2_LOCK_EINT1_WIDTH                   1
  #define MADERA_ASRC2_IN1_LOCK_EINT1                    0x0400
  #define MADERA_ASRC2_IN1_LOCK_EINT1_MASK               0x0400
  #define MADERA_ASRC2_IN1_LOCK_EINT1_SHIFT                  10
-#define MADERA_ASRC2_IN1_LOCK_EINT1_WIDTH                   1
  #define MADERA_ASRC1_IN2_LOCK_EINT1                    0x0200
  #define MADERA_ASRC1_IN2_LOCK_EINT1_MASK               0x0200
  #define MADERA_ASRC1_IN2_LOCK_EINT1_SHIFT                   9
-#define MADERA_ASRC1_IN2_LOCK_EINT1_WIDTH                   1
  #define MADERA_ASRC1_IN1_LOCK_EINT1                    0x0100
  #define MADERA_ASRC1_IN1_LOCK_EINT1_MASK               0x0100
  #define MADERA_ASRC1_IN1_LOCK_EINT1_SHIFT                   8
-#define MADERA_ASRC1_IN1_LOCK_EINT1_WIDTH                   1
  #define MADERA_DRC2_SIG_DET_EINT1                      0x0002
  #define MADERA_DRC2_SIG_DET_EINT1_MASK                 0x0002
  #define MADERA_DRC2_SIG_DET_EINT1_SHIFT                             1
-#define MADERA_DRC2_SIG_DET_EINT1_WIDTH                             1
  #define MADERA_DRC1_SIG_DET_EINT1                      0x0001
  #define MADERA_DRC1_SIG_DET_EINT1_MASK                 0x0001
  #define MADERA_DRC1_SIG_DET_EINT1_SHIFT                             0
-#define MADERA_DRC1_SIG_DET_EINT1_WIDTH                             1
  
  /* (0x180A)  IRQ1_Status_11 */
  #define MADERA_DSP_IRQ16_EINT1                         0x8000
  #define MADERA_DSP_IRQ16_EINT1_MASK                    0x8000
  #define MADERA_DSP_IRQ16_EINT1_SHIFT                       15
-#define MADERA_DSP_IRQ16_EINT1_WIDTH                        1
  #define MADERA_DSP_IRQ15_EINT1                         0x4000
  #define MADERA_DSP_IRQ15_EINT1_MASK                    0x4000
  #define MADERA_DSP_IRQ15_EINT1_SHIFT                       14
-#define MADERA_DSP_IRQ15_EINT1_WIDTH                        1
  #define MADERA_DSP_IRQ14_EINT1                         0x2000
  #define MADERA_DSP_IRQ14_EINT1_MASK                    0x2000
  #define MADERA_DSP_IRQ14_EINT1_SHIFT                       13
-#define MADERA_DSP_IRQ14_EINT1_WIDTH                        1
  #define MADERA_DSP_IRQ13_EINT1                         0x1000
  #define MADERA_DSP_IRQ13_EINT1_MASK                    0x1000
  #define MADERA_DSP_IRQ13_EINT1_SHIFT                       12
-#define MADERA_DSP_IRQ13_EINT1_WIDTH                        1
  #define MADERA_DSP_IRQ12_EINT1                         0x0800
  #define MADERA_DSP_IRQ12_EINT1_MASK                    0x0800
  #define MADERA_DSP_IRQ12_EINT1_SHIFT                       11
-#define MADERA_DSP_IRQ12_EINT1_WIDTH                        1
  #define MADERA_DSP_IRQ11_EINT1                         0x0400
  #define MADERA_DSP_IRQ11_EINT1_MASK                    0x0400
  #define MADERA_DSP_IRQ11_EINT1_SHIFT                       10
-#define MADERA_DSP_IRQ11_EINT1_WIDTH                        1
  #define MADERA_DSP_IRQ10_EINT1                         0x0200
  #define MADERA_DSP_IRQ10_EINT1_MASK                    0x0200
  #define MADERA_DSP_IRQ10_EINT1_SHIFT                        9
-#define MADERA_DSP_IRQ10_EINT1_WIDTH                        1
  #define MADERA_DSP_IRQ9_EINT1                          0x0100
  #define MADERA_DSP_IRQ9_EINT1_MASK                     0x0100
  #define MADERA_DSP_IRQ9_EINT1_SHIFT                         8
-#define MADERA_DSP_IRQ9_EINT1_WIDTH                         1
  #define MADERA_DSP_IRQ8_EINT1                          0x0080
  #define MADERA_DSP_IRQ8_EINT1_MASK                     0x0080
  #define MADERA_DSP_IRQ8_EINT1_SHIFT                         7
-#define MADERA_DSP_IRQ8_EINT1_WIDTH                         1
  #define MADERA_DSP_IRQ7_EINT1                          0x0040
  #define MADERA_DSP_IRQ7_EINT1_MASK                     0x0040
  #define MADERA_DSP_IRQ7_EINT1_SHIFT                         6
-#define MADERA_DSP_IRQ7_EINT1_WIDTH                         1
  #define MADERA_DSP_IRQ6_EINT1                          0x0020
  #define MADERA_DSP_IRQ6_EINT1_MASK                     0x0020
  #define MADERA_DSP_IRQ6_EINT1_SHIFT                         5
-#define MADERA_DSP_IRQ6_EINT1_WIDTH                         1
  #define MADERA_DSP_IRQ5_EINT1                          0x0010
  #define MADERA_DSP_IRQ5_EINT1_MASK                     0x0010
  #define MADERA_DSP_IRQ5_EINT1_SHIFT                         4
-#define MADERA_DSP_IRQ5_EINT1_WIDTH                         1
  #define MADERA_DSP_IRQ4_EINT1                          0x0008
  #define MADERA_DSP_IRQ4_EINT1_MASK                     0x0008
  #define MADERA_DSP_IRQ4_EINT1_SHIFT                         3
-#define MADERA_DSP_IRQ4_EINT1_WIDTH                         1
  #define MADERA_DSP_IRQ3_EINT1                          0x0004
  #define MADERA_DSP_IRQ3_EINT1_MASK                     0x0004
  #define MADERA_DSP_IRQ3_EINT1_SHIFT                         2
-#define MADERA_DSP_IRQ3_EINT1_WIDTH                         1
  #define MADERA_DSP_IRQ2_EINT1                          0x0002
  #define MADERA_DSP_IRQ2_EINT1_MASK                     0x0002
  #define MADERA_DSP_IRQ2_EINT1_SHIFT                         1
-#define MADERA_DSP_IRQ2_EINT1_WIDTH                         1
  #define MADERA_DSP_IRQ1_EINT1                          0x0001
  #define MADERA_DSP_IRQ1_EINT1_MASK                     0x0001
  #define MADERA_DSP_IRQ1_EINT1_SHIFT                         0
-#define MADERA_DSP_IRQ1_EINT1_WIDTH                         1
  
  /* (0x180B)  IRQ1_Status_12 */
  #define MADERA_SPKOUTR_SC_EINT1                                0x0080
  #define MADERA_SPKOUTR_SC_EINT1_MASK                   0x0080
  #define MADERA_SPKOUTR_SC_EINT1_SHIFT                       7
-#define MADERA_SPKOUTR_SC_EINT1_WIDTH                       1
  #define MADERA_SPKOUTL_SC_EINT1                                0x0040
  #define MADERA_SPKOUTL_SC_EINT1_MASK                   0x0040
  #define MADERA_SPKOUTL_SC_EINT1_SHIFT                       6
-#define MADERA_SPKOUTL_SC_EINT1_WIDTH                       1
  #define MADERA_HP3R_SC_EINT1                           0x0020
  #define MADERA_HP3R_SC_EINT1_MASK                      0x0020
  #define MADERA_HP3R_SC_EINT1_SHIFT                          5
-#define MADERA_HP3R_SC_EINT1_WIDTH                          1
  #define MADERA_HP3L_SC_EINT1                           0x0010
  #define MADERA_HP3L_SC_EINT1_MASK                      0x0010
  #define MADERA_HP3L_SC_EINT1_SHIFT                          4
-#define MADERA_HP3L_SC_EINT1_WIDTH                          1
  #define MADERA_HP2R_SC_EINT1                           0x0008
  #define MADERA_HP2R_SC_EINT1_MASK                      0x0008
  #define MADERA_HP2R_SC_EINT1_SHIFT                          3
-#define MADERA_HP2R_SC_EINT1_WIDTH                          1
  #define MADERA_HP2L_SC_EINT1                           0x0004
  #define MADERA_HP2L_SC_EINT1_MASK                      0x0004
  #define MADERA_HP2L_SC_EINT1_SHIFT                          2
-#define MADERA_HP2L_SC_EINT1_WIDTH                          1
  #define MADERA_HP1R_SC_EINT1                           0x0002
  #define MADERA_HP1R_SC_EINT1_MASK                      0x0002
  #define MADERA_HP1R_SC_EINT1_SHIFT                          1
-#define MADERA_HP1R_SC_EINT1_WIDTH                          1
  #define MADERA_HP1L_SC_EINT1                           0x0001
  #define MADERA_HP1L_SC_EINT1_MASK                      0x0001
  #define MADERA_HP1L_SC_EINT1_SHIFT                          0
-#define MADERA_HP1L_SC_EINT1_WIDTH                          1
  
  /* (0x180E)  IRQ1_Status_15 */
  #define MADERA_SPK_OVERHEAT_WARN_EINT1                 0x0004
  #define MADERA_SPK_OVERHEAT_WARN_EINT1_MASK            0x0004
  #define MADERA_SPK_OVERHEAT_WARN_EINT1_SHIFT                2
-#define MADERA_SPK_OVERHEAT_WARN_EINT1_WIDTH                1
  #define MADERA_SPK_OVERHEAT_EINT1                      0x0002
  #define MADERA_SPK_OVERHEAT_EINT1_MASK                 0x0002
  #define MADERA_SPK_OVERHEAT_EINT1_SHIFT                             1
-#define MADERA_SPK_OVERHEAT_EINT1_WIDTH                             1
  #define MADERA_SPK_SHUTDOWN_EINT1                      0x0001
  #define MADERA_SPK_SHUTDOWN_EINT1_MASK                 0x0001
  #define MADERA_SPK_SHUTDOWN_EINT1_SHIFT                             0
-#define MADERA_SPK_SHUTDOWN_EINT1_WIDTH                             1
  
  /* (0x1820) - IRQ1 Status 33 */
  #define MADERA_DSP7_BUS_ERR_EINT1                      0x0040
  #define MADERA_DSP7_BUS_ERR_EINT1_MASK                 0x0040
  #define MADERA_DSP7_BUS_ERR_EINT1_SHIFT                             6
-#define MADERA_DSP7_BUS_ERR_EINT1_WIDTH                             1
  #define MADERA_DSP6_BUS_ERR_EINT1                      0x0020
  #define MADERA_DSP6_BUS_ERR_EINT1_MASK                 0x0020
  #define MADERA_DSP6_BUS_ERR_EINT1_SHIFT                             5
-#define MADERA_DSP6_BUS_ERR_EINT1_WIDTH                             1
  #define MADERA_DSP5_BUS_ERR_EINT1                      0x0010
  #define MADERA_DSP5_BUS_ERR_EINT1_MASK                 0x0010
  #define MADERA_DSP5_BUS_ERR_EINT1_SHIFT                             4
-#define MADERA_DSP5_BUS_ERR_EINT1_WIDTH                             1
  #define MADERA_DSP4_BUS_ERR_EINT1                      0x0008
  #define MADERA_DSP4_BUS_ERR_EINT1_MASK                 0x0008
  #define MADERA_DSP4_BUS_ERR_EINT1_SHIFT                             3
-#define MADERA_DSP4_BUS_ERR_EINT1_WIDTH                             1
  #define MADERA_DSP3_BUS_ERR_EINT1                      0x0004
  #define MADERA_DSP3_BUS_ERR_EINT1_MASK                 0x0004
  #define MADERA_DSP3_BUS_ERR_EINT1_SHIFT                             2
-#define MADERA_DSP3_BUS_ERR_EINT1_WIDTH                             1
  #define MADERA_DSP2_BUS_ERR_EINT1                      0x0002
  #define MADERA_DSP2_BUS_ERR_EINT1_MASK                 0x0002
  #define MADERA_DSP2_BUS_ERR_EINT1_SHIFT                             1
-#define MADERA_DSP2_BUS_ERR_EINT1_WIDTH                             1
  #define MADERA_DSP1_BUS_ERR_EINT1                      0x0001
  #define MADERA_DSP1_BUS_ERR_EINT1_MASK                 0x0001
  #define MADERA_DSP1_BUS_ERR_EINT1_SHIFT                             0
-#define MADERA_DSP1_BUS_ERR_EINT1_WIDTH                             1
  
  /* (0x1845)  IRQ1_Mask_6 */
  #define MADERA_IM_MICDET2_EINT1                                0x0200
  #define MADERA_IM_MICDET2_EINT1_MASK                   0x0200
  #define MADERA_IM_MICDET2_EINT1_SHIFT                       9
-#define MADERA_IM_MICDET2_EINT1_WIDTH                       1
  #define MADERA_IM_MICDET1_EINT1                                0x0100
  #define MADERA_IM_MICDET1_EINT1_MASK                   0x0100
  #define MADERA_IM_MICDET1_EINT1_SHIFT                       8
-#define MADERA_IM_MICDET1_EINT1_WIDTH                       1
  #define MADERA_IM_HPDET_EINT1                          0x0001
  #define MADERA_IM_HPDET_EINT1_MASK                     0x0001
  #define MADERA_IM_HPDET_EINT1_SHIFT                         0
-#define MADERA_IM_HPDET_EINT1_WIDTH                         1
  /* (0x184E)  IRQ1_Mask_15 */
  #define MADERA_IM_SPK_OVERHEAT_WARN_EINT1              0x0004
  #define MADERA_IM_SPK_OVERHEAT_WARN_EINT1_MASK         0x0004
  #define MADERA_IM_SPK_OVERHEAT_WARN_EINT1_SHIFT                     2
-#define MADERA_IM_SPK_OVERHEAT_WARN_EINT1_WIDTH                     1
  #define MADERA_IM_SPK_OVERHEAT_EINT1                   0x0002
  #define MADERA_IM_SPK_OVERHEAT_EINT1_MASK              0x0002
  #define MADERA_IM_SPK_OVERHEAT_EINT1_SHIFT                  1
-#define MADERA_IM_SPK_OVERHEAT_EINT1_WIDTH                  1
  #define MADERA_IM_SPK_SHUTDOWN_EINT1                   0x0001
  #define MADERA_IM_SPK_SHUTDOWN_EINT1_MASK              0x0001
  #define MADERA_IM_SPK_SHUTDOWN_EINT1_SHIFT                  0
-#define MADERA_IM_SPK_SHUTDOWN_EINT1_WIDTH                  1
  
  /* (0x1880) - IRQ1 Raw Status 1 */
  #define MADERA_CTRLIF_ERR_STS1                         0x1000
  #define MADERA_CTRLIF_ERR_STS1_MASK                    0x1000
  #define MADERA_CTRLIF_ERR_STS1_SHIFT                       12
-#define MADERA_CTRLIF_ERR_STS1_WIDTH                        1
  #define MADERA_SYSCLK_FAIL_STS1                                0x0200
  #define MADERA_SYSCLK_FAIL_STS1_MASK                   0x0200
  #define MADERA_SYSCLK_FAIL_STS1_SHIFT                       9
-#define MADERA_SYSCLK_FAIL_STS1_WIDTH                       1
  #define MADERA_CLOCK_DETECT_STS1                       0x0100
  #define MADERA_CLOCK_DETECT_STS1_MASK                  0x0100
  #define MADERA_CLOCK_DETECT_STS1_SHIFT                      8
-#define MADERA_CLOCK_DETECT_STS1_WIDTH                      1
  #define MADERA_BOOT_DONE_STS1                          0x0080
  #define MADERA_BOOT_DONE_STS1_MASK                     0x0080
  #define MADERA_BOOT_DONE_STS1_SHIFT                         7
-#define MADERA_BOOT_DONE_STS1_WIDTH                         1
  
  /* (0x1881) - IRQ1 Raw Status 2 */
  #define MADERA_FLL3_LOCK_STS1                          0x0400
  #define MADERA_FLL3_LOCK_STS1_MASK                     0x0400
  #define MADERA_FLL3_LOCK_STS1_SHIFT                        10
-#define MADERA_FLL3_LOCK_STS1_WIDTH                         1
  #define MADERA_FLL2_LOCK_STS1                          0x0200
  #define MADERA_FLL2_LOCK_STS1_MASK                     0x0200
  #define MADERA_FLL2_LOCK_STS1_SHIFT                         9
-#define MADERA_FLL2_LOCK_STS1_WIDTH                         1
  #define MADERA_FLL1_LOCK_STS1                          0x0100
  #define MADERA_FLL1_LOCK_STS1_MASK                     0x0100
  #define MADERA_FLL1_LOCK_STS1_SHIFT                         8
-#define MADERA_FLL1_LOCK_STS1_WIDTH                         1
  
  /* (0x1886) - IRQ1 Raw Status 7 */
  #define MADERA_MICD_CLAMP_FALL_STS1                    0x0020
  #define MADERA_MICD_CLAMP_FALL_STS1_MASK               0x0020
  #define MADERA_MICD_CLAMP_FALL_STS1_SHIFT                   5
-#define MADERA_MICD_CLAMP_FALL_STS1_WIDTH                   1
  #define MADERA_MICD_CLAMP_RISE_STS1                    0x0010
  #define MADERA_MICD_CLAMP_RISE_STS1_MASK               0x0010
  #define MADERA_MICD_CLAMP_RISE_STS1_SHIFT                   4
-#define MADERA_MICD_CLAMP_RISE_STS1_WIDTH                   1
  #define MADERA_JD2_FALL_STS1                           0x0008
  #define MADERA_JD2_FALL_STS1_MASK                      0x0008
  #define MADERA_JD2_FALL_STS1_SHIFT                          3
-#define MADERA_JD2_FALL_STS1_WIDTH                          1
  #define MADERA_JD2_RISE_STS1                           0x0004
  #define MADERA_JD2_RISE_STS1_MASK                      0x0004
  #define MADERA_JD2_RISE_STS1_SHIFT                          2
-#define MADERA_JD2_RISE_STS1_WIDTH                          1
  #define MADERA_JD1_FALL_STS1                           0x0002
  #define MADERA_JD1_FALL_STS1_MASK                      0x0002
  #define MADERA_JD1_FALL_STS1_SHIFT                          1
-#define MADERA_JD1_FALL_STS1_WIDTH                          1
  #define MADERA_JD1_RISE_STS1                           0x0001
  #define MADERA_JD1_RISE_STS1_MASK                      0x0001
  #define MADERA_JD1_RISE_STS1_SHIFT                          0
-#define MADERA_JD1_RISE_STS1_WIDTH                          1
  
  /* (0x188E) - IRQ1 Raw Status 15 */
  #define MADERA_SPK_OVERHEAT_WARN_STS1                  0x0004
  #define MADERA_SPK_OVERHEAT_WARN_STS1_MASK             0x0004
  #define MADERA_SPK_OVERHEAT_WARN_STS1_SHIFT                 2
-#define MADERA_SPK_OVERHEAT_WARN_STS1_WIDTH                 1
  #define MADERA_SPK_OVERHEAT_STS1                       0x0002
  #define MADERA_SPK_OVERHEAT_STS1_MASK                  0x0002
  #define MADERA_SPK_OVERHEAT_STS1_SHIFT                      1
-#define MADERA_SPK_OVERHEAT_STS1_WIDTH                      1
  #define MADERA_SPK_SHUTDOWN_STS1                       0x0001
  #define MADERA_SPK_SHUTDOWN_STS1_MASK                  0x0001
  #define MADERA_SPK_SHUTDOWN_STS1_SHIFT                      0
-#define MADERA_SPK_SHUTDOWN_STS1_WIDTH                      1
  
  /* (0x1A06)  Interrupt_Debounce_7 */
  #define MADERA_MICD_CLAMP_DB                           0x0010
  #define MADERA_MICD_CLAMP_DB_MASK                      0x0010
  #define MADERA_MICD_CLAMP_DB_SHIFT                          4
-#define MADERA_MICD_CLAMP_DB_WIDTH                          1
  #define MADERA_JD2_DB                                  0x0004
  #define MADERA_JD2_DB_MASK                             0x0004
  #define MADERA_JD2_DB_SHIFT                                 2
-#define MADERA_JD2_DB_WIDTH                                 1
  #define MADERA_JD1_DB                                  0x0001
  #define MADERA_JD1_DB_MASK                             0x0001
  #define MADERA_JD1_DB_SHIFT                                 0
-#define MADERA_JD1_DB_WIDTH                                 1
  
  /* (0x1A0E)  Interrupt_Debounce_15 */
  #define MADERA_SPK_OVERHEAT_WARN_DB                    0x0004
  #define MADERA_SPK_OVERHEAT_WARN_DB_MASK               0x0004
  #define MADERA_SPK_OVERHEAT_WARN_DB_SHIFT                   2
-#define MADERA_SPK_OVERHEAT_WARN_DB_WIDTH                   1
  #define MADERA_SPK_OVERHEAT_DB                         0x0002
  #define MADERA_SPK_OVERHEAT_DB_MASK                    0x0002
  #define MADERA_SPK_OVERHEAT_DB_SHIFT                        1
-#define MADERA_SPK_OVERHEAT_DB_WIDTH                        1
  
  /* (0x1A80)  IRQ1_CTRL */
  #define MADERA_IM_IRQ1                                 0x0800
  #define MADERA_IM_IRQ1_MASK                            0x0800
  #define MADERA_IM_IRQ1_SHIFT                               11
-#define MADERA_IM_IRQ1_WIDTH                                1
  #define MADERA_IRQ_POL                                 0x0400
  #define MADERA_IRQ_POL_MASK                            0x0400
  #define MADERA_IRQ_POL_SHIFT                               10
-#define MADERA_IRQ_POL_WIDTH                                1
  
  /* (0x20004)  OTP_HPDET_Cal_1 */
  #define MADERA_OTP_HPDET_CALIB_OFFSET_11           0xFF000000
  #define MADERA_OTP_HPDET_CALIB_OFFSET_11_MASK      0xFF000000
  #define MADERA_OTP_HPDET_CALIB_OFFSET_11_SHIFT             24
-#define MADERA_OTP_HPDET_CALIB_OFFSET_11_WIDTH              8
  #define MADERA_OTP_HPDET_CALIB_OFFSET_10           0x00FF0000
  #define MADERA_OTP_HPDET_CALIB_OFFSET_10_MASK      0x00FF0000
  #define MADERA_OTP_HPDET_CALIB_OFFSET_10_SHIFT             16
-#define MADERA_OTP_HPDET_CALIB_OFFSET_10_WIDTH              8
  #define MADERA_OTP_HPDET_CALIB_OFFSET_01           0x0000FF00
  #define MADERA_OTP_HPDET_CALIB_OFFSET_01_MASK      0x0000FF00
  #define MADERA_OTP_HPDET_CALIB_OFFSET_01_SHIFT              8
-#define MADERA_OTP_HPDET_CALIB_OFFSET_01_WIDTH              8
  #define MADERA_OTP_HPDET_CALIB_OFFSET_00           0x000000FF
  #define MADERA_OTP_HPDET_CALIB_OFFSET_00_MASK      0x000000FF
  #define MADERA_OTP_HPDET_CALIB_OFFSET_00_SHIFT              0
-#define MADERA_OTP_HPDET_CALIB_OFFSET_00_WIDTH              8
  
  /* (0x20006)  OTP_HPDET_Cal_2 */
  #define MADERA_OTP_HPDET_GRADIENT_1X               0x0000FF00
  #define MADERA_OTP_HPDET_GRADIENT_1X_MASK          0x0000FF00
  #define MADERA_OTP_HPDET_GRADIENT_1X_SHIFT                  8
-#define MADERA_OTP_HPDET_GRADIENT_1X_WIDTH                  8
  #define MADERA_OTP_HPDET_GRADIENT_0X               0x000000FF
  #define MADERA_OTP_HPDET_GRADIENT_0X_MASK          0x000000FF
  #define MADERA_OTP_HPDET_GRADIENT_0X_SHIFT                  0
-#define MADERA_OTP_HPDET_GRADIENT_0X_WIDTH                  8
  
  #endif
diff --git a/include/linux/mfd/rt5033-private.h b/include/linux/mfd/rt5033-private.h

index f812105..2d1895c 100644 (file)
--- a/include/linux/mfd/rt5033-private.h
+++ b/include/linux/mfd/rt5033-private.h
@@ -91,14 +91,14 @@ enum rt5033_reg {
  #define RT5033_RT_HZ_MASK              0x01
  
  /* RT5033 control register */
-#define RT5033_CTRL_FCCM_BUCK_MASK             0x00
-#define RT5033_CTRL_BUCKOMS_MASK               0x01
-#define RT5033_CTRL_LDOOMS_MASK                        0x02
-#define RT5033_CTRL_SLDOOMS_MASK               0x03
-#define RT5033_CTRL_EN_BUCK_MASK               0x04
-#define RT5033_CTRL_EN_LDO_MASK                        0x05
-#define RT5033_CTRL_EN_SAFE_LDO_MASK           0x06
-#define RT5033_CTRL_LDO_SLEEP_MASK             0x07
+#define RT5033_CTRL_FCCM_BUCK_MASK             BIT(0)
+#define RT5033_CTRL_BUCKOMS_MASK               BIT(1)
+#define RT5033_CTRL_LDOOMS_MASK                        BIT(2)
+#define RT5033_CTRL_SLDOOMS_MASK               BIT(3)
+#define RT5033_CTRL_EN_BUCK_MASK               BIT(4)
+#define RT5033_CTRL_EN_LDO_MASK                        BIT(5)
+#define RT5033_CTRL_EN_SAFE_LDO_MASK           BIT(6)
+#define RT5033_CTRL_LDO_SLEEP_MASK             BIT(7)
  
  /* RT5033 BUCK control register */
  #define RT5033_BUCK_CTRL_MASK                  0x1f
@@ -247,11 +247,11 @@ enum rt5033_fuel_reg {
  #define RT5033_FUEL_BAT_PRESENT                0x02
  
  /* RT5033 PMIC interrupts */
-#define RT5033_PMIC_IRQ_BUCKOCP                2
-#define RT5033_PMIC_IRQ_BUCKLV         3
-#define RT5033_PMIC_IRQ_SAFELDOLV      4
-#define RT5033_PMIC_IRQ_LDOLV          5
-#define RT5033_PMIC_IRQ_OT             6
-#define RT5033_PMIC_IRQ_VDDA_UV                7
+#define RT5033_PMIC_IRQ_BUCKOCP                BIT(2)
+#define RT5033_PMIC_IRQ_BUCKLV         BIT(3)
+#define RT5033_PMIC_IRQ_SAFELDOLV      BIT(4)
+#define RT5033_PMIC_IRQ_LDOLV          BIT(5)
+#define RT5033_PMIC_IRQ_OT             BIT(6)
+#define RT5033_PMIC_IRQ_VDDA_UV                BIT(7)
  
  #endif /* __RT5033_PRIVATE_H__ */
diff --git a/include/linux/mfd/si476x-core.h b/include/linux/mfd/si476x-core.h

index 4708c2b..dd95c37 100644 (file)
--- a/include/linux/mfd/si476x-core.h
+++ b/include/linux/mfd/si476x-core.h
@@ -57,7 +57,7 @@ enum si476x_mfd_cells {
   * @SI476X_POWER_DOWN: In this state all regulators are turned off
   * and the reset line is pulled low. The device is completely
   * inactive.
- * @SI476X_POWER_UP_FULL: In this state all the power regualtors are
+ * @SI476X_POWER_UP_FULL: In this state all the power regulators are
   * turned on, reset line pulled high, IRQ line is enabled(polling is
   * active for polling use scenario) and device is turned on with
   * POWER_UP command. The device is ready to be used.
diff --git a/include/linux/mfd/syscon.h b/include/linux/mfd/syscon.h

index 7f20e9b..fecc2fa 100644 (file)
--- a/include/linux/mfd/syscon.h
+++ b/include/linux/mfd/syscon.h
@@ -28,6 +28,9 @@ extern struct regmap *syscon_regmap_lookup_by_phandle_args(
                                         const char *property,
                                         int arg_count,
                                         unsigned int *out_args);
+extern struct regmap *syscon_regmap_lookup_by_phandle_optional(
+                                       struct device_node *np,
+                                       const char *property);
  #else
  static inline struct regmap *device_node_to_regmap(struct device_node *np)
  {
@@ -59,6 +62,14 @@ static inline struct regmap *syscon_regmap_lookup_by_phandle_args(
  {
         return ERR_PTR(-ENOTSUPP);
  }
+
+static inline struct regmap *syscon_regmap_lookup_by_phandle_optional(
+                                       struct device_node *np,
+                                       const char *property)
+{
+       return NULL;
+}
+
  #endif
  
  #endif /* __LINUX_MFD_SYSCON_H__ */
diff --git a/include/linux/mfd/tps65910.h b/include/linux/mfd/tps65910.h

index ce4b9e7..701925d 100644 (file)
--- a/include/linux/mfd/tps65910.h
+++ b/include/linux/mfd/tps65910.h
@@ -890,11 +890,6 @@ struct tps65910 {
         struct regmap *regmap;
         unsigned long id;
  
-       /* Client devices */
-       struct tps65910_pmic *pmic;
-       struct tps65910_rtc *rtc;
-       struct tps65910_power *power;
-
         /* Device node parsed board data */
         struct tps65910_board *of_plat_data;
  
@@ -913,39 +908,4 @@ static inline int tps65910_chip_id(struct tps65910 *tps65910)
         return tps65910->id;
  }
  
-static inline int tps65910_reg_read(struct tps65910 *tps65910, u8 reg,
-               unsigned int *val)
-{
-       return regmap_read(tps65910->regmap, reg, val);
-}
-
-static inline int tps65910_reg_write(struct tps65910 *tps65910, u8 reg,
-               unsigned int val)
-{
-       return regmap_write(tps65910->regmap, reg, val);
-}
-
-static inline int tps65910_reg_set_bits(struct tps65910 *tps65910, u8 reg,
-               u8 mask)
-{
-       return regmap_update_bits(tps65910->regmap, reg, mask, mask);
-}
-
-static inline int tps65910_reg_clear_bits(struct tps65910 *tps65910, u8 reg,
-               u8 mask)
-{
-       return regmap_update_bits(tps65910->regmap, reg, mask, 0);
-}
-
-static inline int tps65910_reg_update_bits(struct tps65910 *tps65910, u8 reg,
-                                          u8 mask, u8 val)
-{
-       return regmap_update_bits(tps65910->regmap, reg, mask, val);
-}
-
-static inline int tps65910_irq_get_virq(struct tps65910 *tps65910, int irq)
-{
-       return regmap_irq_get_virq(tps65910->irq_data, irq);
-}
-
  #endif /*  __LINUX_MFD_TPS65910_H */
author	Linus Torvalds <torvalds@linux-foundation.org>
	Wed, 16 Dec 2020 22:48:32 +0000 (14:48 -0800)
committer	Linus Torvalds <torvalds@linux-foundation.org>
	Wed, 16 Dec 2020 22:48:32 +0000 (14:48 -0800)
Documentation/devicetree/bindings/mfd/rohm,bd71837-pmic.yaml		patch \| blob \| history
Documentation/devicetree/bindings/mfd/syscon.yaml		patch \| blob \| history
drivers/gpio/gpio-tps65910.c		patch \| blob \| history
drivers/mfd/88pm800.c		patch \| blob \| history
drivers/mfd/88pm860x-core.c		patch \| blob \| history
drivers/mfd/Kconfig		patch \| blob \| history
drivers/mfd/altera-sysmgr.c		patch \| blob \| history
drivers/mfd/at91-usart.c		patch \| blob \| history
drivers/mfd/axp20x-i2c.c		patch \| blob \| history
drivers/mfd/bcm590xx.c		patch \| blob \| history
drivers/mfd/da9055-core.c		patch \| blob \| history
drivers/mfd/da9055-i2c.c		patch \| blob \| history
drivers/mfd/da9062-core.c		patch \| blob \| history
drivers/mfd/da9063-core.c		patch \| blob \| history
drivers/mfd/da9063-i2c.c		patch \| blob \| history
drivers/mfd/da9150-core.c		patch \| blob \| history
drivers/mfd/ene-kb3930.c		patch \| blob \| history
drivers/mfd/fsl-imx25-tsadc.c		patch \| blob \| history
drivers/mfd/hi655x-pmic.c		patch \| blob \| history
drivers/mfd/htc-i2cpld.c		patch \| blob \| history
drivers/mfd/intel_msic.c		patch \| blob \| history
drivers/mfd/intel_quark_i2c_gpio.c		patch \| blob \| history
drivers/mfd/intel_soc_pmic_bxtwc.c		patch \| blob \| history
drivers/mfd/intel_soc_pmic_chtdc_ti.c		patch \| blob \| history
drivers/mfd/intel_soc_pmic_chtwc.c		patch \| blob \| history
drivers/mfd/intel_soc_pmic_crc.c		patch \| blob \| history
drivers/mfd/ioc3.c		patch \| blob \| history
drivers/mfd/kempld-core.c		patch \| blob \| history
drivers/mfd/lp8788.c		patch \| blob \| history
drivers/mfd/madera-core.c		patch \| blob \| history
drivers/mfd/max77650.c		patch \| blob \| history
drivers/mfd/max77686.c		patch \| blob \| history
drivers/mfd/max8925-core.c		patch \| blob \| history
drivers/mfd/motorola-cpcap.c		patch \| blob \| history
drivers/mfd/mt6397-core.c		patch \| blob \| history
drivers/mfd/qcom-spmi-pmic.c		patch \| blob \| history
drivers/mfd/rdc321x-southbridge.c		patch \| blob \| history
drivers/mfd/retu-mfd.c		patch \| blob \| history
drivers/mfd/rk808.c		patch \| blob \| history
drivers/mfd/rt5033.c		patch \| blob \| history
drivers/mfd/stmfx.c		patch \| blob \| history
drivers/mfd/stmpe.c		patch \| blob \| history
drivers/mfd/sun4i-gpadc.c		patch \| blob \| history
drivers/mfd/syscon.c		patch \| blob \| history
drivers/mfd/tc3589x.c		patch \| blob \| history
drivers/mfd/tc6387xb.c		patch \| blob \| history
drivers/mfd/tc6393xb.c		patch \| blob \| history
drivers/mfd/tps65090.c		patch \| blob \| history
drivers/mfd/tps65217.c		patch \| blob \| history
drivers/mfd/tps6586x.c		patch \| blob \| history
drivers/mfd/tps65910.c		patch \| blob \| history
drivers/mfd/tps65911-comparator.c		patch \| blob \| history
drivers/mfd/tps80031.c		patch \| blob \| history
drivers/mfd/twl6030-irq.c		patch \| blob \| history
drivers/mfd/wm831x-core.c		patch \| blob \| history
drivers/mfd/wm8994-core.c		patch \| blob \| history
include/linux/mfd/madera/core.h		patch \| blob \| history
include/linux/mfd/madera/registers.h		patch \| blob \| history
include/linux/mfd/rt5033-private.h		patch \| blob \| history
include/linux/mfd/si476x-core.h		patch \| blob \| history
include/linux/mfd/syscon.h		patch \| blob \| history
include/linux/mfd/tps65910.h		patch \| blob \| history