[PATCH 08/11] GTA02: Fix WM8753 device registration

[Jonas Bonn]

This makes the GTA02 work with the new-style WM8753 ALSA I2C driver.
---
 arch/arm/mach-s3c2440/mach-gta02.c       |    9 +++++++++
 sound/soc/s3c24xx/neo1973_gta02_wm8753.c |    5 -----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
index 2a5eae0..a085c90 100644
--- a/arch/arm/mach-s3c2440/mach-gta02.c
+++ b/arch/arm/mach-s3c2440/mach-gta02.c
@@ -848,6 +848,11 @@ struct platform_device s3c24xx_pwm_device = {
 	.num_resources	= 0,
 };
 
+static struct i2c_board_info gta02_i2c_devs[] __initdata = {
+        {
+                I2C_BOARD_INFO("wm8753", 0x1a),
+        },
+};
 
 static struct platform_device *gta02_devices[] __initdata = {
 	&s3c_device_usb,
@@ -1665,6 +1670,10 @@ static void __init gta02_machine_init(void)
 		break;
 	}
 #endif
+
+        i2c_register_board_info(0, gta02_i2c_devs,
+                ARRAY_SIZE(gta02_i2c_devs));
+
 	s3c2410_pm_init();
 
 	/* Make sure the modem can wake us up */
diff --git a/sound/soc/s3c24xx/neo1973_gta02_wm8753.c b/sound/soc/s3c24xx/neo1973_gta02_wm8753.c
index 13c48ba..e847acc 100644
--- a/sound/soc/s3c24xx/neo1973_gta02_wm8753.c
+++ b/sound/soc/s3c24xx/neo1973_gta02_wm8753.c
@@ -604,15 +604,10 @@ static struct snd_soc_machine neo1973_gta02 = {
 	.num_links = ARRAY_SIZE(neo1973_gta02_dai),
 };
 
-static struct wm8753_setup_data neo1973_gta02_wm8753_setup = {
-	.i2c_address = 0x1a,
-};
-
 static struct snd_soc_device neo1973_gta02_snd_devdata = {
 	.machine = &neo1973_gta02,
 	.platform = &s3c24xx_soc_platform,
 	.codec_dev = &soc_codec_dev_wm8753,
-	.codec_data = &neo1973_gta02_wm8753_setup,
 };
 
 static struct platform_device *neo1973_gta02_snd_device;
-- 
1.5.4.3