diff options
Diffstat (limited to 'arch/arm/mach-s3c64xx/mach-crag6410.c')
-rw-r--r-- | arch/arm/mach-s3c64xx/mach-crag6410.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/arch/arm/mach-s3c64xx/mach-crag6410.c b/arch/arm/mach-s3c64xx/mach-crag6410.c index 9026249233ad..af0c2fe1ea37 100644 --- a/arch/arm/mach-s3c64xx/mach-crag6410.c +++ b/arch/arm/mach-s3c64xx/mach-crag6410.c | |||
@@ -65,7 +65,7 @@ | |||
65 | #include <plat/iic.h> | 65 | #include <plat/iic.h> |
66 | #include <plat/pm.h> | 66 | #include <plat/pm.h> |
67 | 67 | ||
68 | #include <sound/wm8915.h> | 68 | #include <sound/wm8996.h> |
69 | #include <sound/wm8962.h> | 69 | #include <sound/wm8962.h> |
70 | #include <sound/wm9081.h> | 70 | #include <sound/wm9081.h> |
71 | 71 | ||
@@ -614,7 +614,7 @@ static struct wm831x_pdata glenfarclas_pmic_pdata __initdata = { | |||
614 | .disable_touch = true, | 614 | .disable_touch = true, |
615 | }; | 615 | }; |
616 | 616 | ||
617 | static struct wm8915_retune_mobile_config wm8915_retune[] = { | 617 | static struct wm8996_retune_mobile_config wm8996_retune[] = { |
618 | { | 618 | { |
619 | .name = "Sub LPF", | 619 | .name = "Sub LPF", |
620 | .rate = 48000, | 620 | .rate = 48000, |
@@ -635,12 +635,12 @@ static struct wm8915_retune_mobile_config wm8915_retune[] = { | |||
635 | }, | 635 | }, |
636 | }; | 636 | }; |
637 | 637 | ||
638 | static struct wm8915_pdata wm8915_pdata __initdata = { | 638 | static struct wm8996_pdata wm8996_pdata __initdata = { |
639 | .ldo_ena = S3C64XX_GPN(7), | 639 | .ldo_ena = S3C64XX_GPN(7), |
640 | .gpio_base = CODEC_GPIO_BASE, | 640 | .gpio_base = CODEC_GPIO_BASE, |
641 | .micdet_def = 1, | 641 | .micdet_def = 1, |
642 | .inl_mode = WM8915_DIFFERRENTIAL_1, | 642 | .inl_mode = WM8996_DIFFERRENTIAL_1, |
643 | .inr_mode = WM8915_DIFFERRENTIAL_1, | 643 | .inr_mode = WM8996_DIFFERRENTIAL_1, |
644 | 644 | ||
645 | .irq_flags = IRQF_TRIGGER_RISING, | 645 | .irq_flags = IRQF_TRIGGER_RISING, |
646 | 646 | ||
@@ -652,8 +652,8 @@ static struct wm8915_pdata wm8915_pdata __initdata = { | |||
652 | 0x020e, /* GPIO5 == CLKOUT */ | 652 | 0x020e, /* GPIO5 == CLKOUT */ |
653 | }, | 653 | }, |
654 | 654 | ||
655 | .retune_mobile_cfgs = wm8915_retune, | 655 | .retune_mobile_cfgs = wm8996_retune, |
656 | .num_retune_mobile_cfgs = ARRAY_SIZE(wm8915_retune), | 656 | .num_retune_mobile_cfgs = ARRAY_SIZE(wm8996_retune), |
657 | }; | 657 | }; |
658 | 658 | ||
659 | static struct wm8962_pdata wm8962_pdata __initdata = { | 659 | static struct wm8962_pdata wm8962_pdata __initdata = { |
@@ -679,8 +679,8 @@ static struct i2c_board_info i2c_devs1[] __initdata = { | |||
679 | .platform_data = &glenfarclas_pmic_pdata }, | 679 | .platform_data = &glenfarclas_pmic_pdata }, |
680 | 680 | ||
681 | { I2C_BOARD_INFO("wm1250-ev1", 0x27) }, | 681 | { I2C_BOARD_INFO("wm1250-ev1", 0x27) }, |
682 | { I2C_BOARD_INFO("wm8915", 0x1a), | 682 | { I2C_BOARD_INFO("wm8996", 0x1a), |
683 | .platform_data = &wm8915_pdata, | 683 | .platform_data = &wm8996_pdata, |
684 | .irq = GLENFARCLAS_PMIC_IRQ_BASE + WM831X_IRQ_GPIO_2, | 684 | .irq = GLENFARCLAS_PMIC_IRQ_BASE + WM831X_IRQ_GPIO_2, |
685 | }, | 685 | }, |
686 | { I2C_BOARD_INFO("wm9081", 0x6c), | 686 | { I2C_BOARD_INFO("wm9081", 0x6c), |