intel_pstate: Turn per cpu printk into pr_debug

[cascardo/linux.git] / drivers / mfd / wm8997-tables.c

diff --git a/drivers/mfd/wm8997-tables.c b/drivers/mfd/wm8997-tables.c
index c7a81da..510da3b 100644 (file)
--- a/drivers/mfd/wm8997-tables.c
+++ b/drivers/mfd/wm8997-tables.c
@@ -65,11 +65,11 @@ static const struct regmap_irq wm8997_irqs[ARIZONA_NUM_IRQ] = {
        [ARIZONA_IRQ_GP2] = { .reg_offset = 0, .mask = ARIZONA_GP2_EINT1 },
        [ARIZONA_IRQ_GP1] = { .reg_offset = 0, .mask = ARIZONA_GP1_EINT1 },
 
-       [ARIZONA_IRQ_SPK_SHUTDOWN_WARN] = {
-               .reg_offset = 2, .mask = ARIZONA_SPK_SHUTDOWN_WARN_EINT1
+       [ARIZONA_IRQ_SPK_OVERHEAT_WARN] = {
+               .reg_offset = 2, .mask = ARIZONA_SPK_OVERHEAT_WARN_EINT1
        },
-       [ARIZONA_IRQ_SPK_SHUTDOWN] = {
-               .reg_offset = 2, .mask = ARIZONA_SPK_SHUTDOWN_EINT1
+       [ARIZONA_IRQ_SPK_OVERHEAT] = {
+               .reg_offset = 2, .mask = ARIZONA_SPK_OVERHEAT_EINT1
        },
        [ARIZONA_IRQ_HPDET] = {
                .reg_offset = 2, .mask = ARIZONA_HPDET_EINT1
@@ -174,10 +174,10 @@ static const struct reg_default wm8997_reg_default[] = {
        { 0x00000062, 0x01FF },    /* R98    - Sample Rate Sequence Select 2 */
        { 0x00000063, 0x01FF },    /* R99    - Sample Rate Sequence Select 3 */
        { 0x00000064, 0x01FF },    /* R100   - Sample Rate Sequence Select 4 */
-       { 0x00000068, 0x01FF },    /* R104   - Always On Triggers Sequence Select 3 */
-       { 0x00000069, 0x01FF },    /* R105   - Always On Triggers Sequence Select 4 */
-       { 0x0000006A, 0x01FF },    /* R106   - Always On Triggers Sequence Select 5 */
-       { 0x0000006B, 0x01FF },    /* R107   - Always On Triggers Sequence Select 6 */
+       { 0x00000068, 0x01FF },    /* R104   - AlwaysOn Triggers Seq Select 3 */
+       { 0x00000069, 0x01FF },    /* R105   - AlwaysOn Triggers Seq Select 4 */
+       { 0x0000006A, 0x01FF },    /* R106   - AlwaysOn Triggers Seq Select 5 */
+       { 0x0000006B, 0x01FF },    /* R107   - AlwaysOn Triggers Seq Select 6 */
        { 0x00000070, 0x0000 },    /* R112   - Comfort Noise Generator */
        { 0x00000090, 0x0000 },    /* R144   - Haptics Control 1 */
        { 0x00000091, 0x7FFF },    /* R145   - Haptics Control 2 */