[PATCH 5/5] OpenMoko: Update for normal WM8753 device registration.

[Mark Brown]

The WM8753 driver now uses the standard I2C device registration model and
so requires the platform to register the device. Convert the OpenMoko
GTA0x series devices to do so.

Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
---
 arch/arm/mach-s3c2410/mach-gta01.c       |    5 ++++-
 arch/arm/mach-s3c2442/mach-gta02.c       |    3 +++
 arch/arm/mach-s3c6410/mach-om-gta03.c    |    4 +++-
 sound/soc/s3c24xx/neo1973_gta02_wm8753.c |    9 ---------
 sound/soc/s3c24xx/om_gta03_wm8753.c      |    7 -------
 5 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/arch/arm/mach-s3c2410/mach-gta01.c b/arch/arm/mach-s3c2410/mach-gta01.c
index d424211..24bfde4 100644
--- a/arch/arm/mach-s3c2410/mach-gta01.c
+++ b/arch/arm/mach-s3c2410/mach-gta01.c
@@ -925,7 +925,10 @@ static struct i2c_board_info gta01_i2c_devs[] __initdata = {
 	},
 	{
 		I2C_BOARD_INFO("lm4587", 0x7c),
-	}
+	},
+	{
+		I2C_BOARD_INFO("wm8753", 0x1a),
+	},
 };
 
 static void __init gta01_machine_init(void)
diff --git a/arch/arm/mach-s3c2442/mach-gta02.c b/arch/arm/mach-s3c2442/mach-gta02.c
index 55f9d94..4651c01 100644
--- a/arch/arm/mach-s3c2442/mach-gta02.c
+++ b/arch/arm/mach-s3c2442/mach-gta02.c
@@ -863,6 +863,9 @@ static struct i2c_board_info gta02_i2c_devs[] __initdata = {
 		.irq = GTA02_IRQ_PCF50633,
 		.platform_data = &gta02_pcf_pdata,
 	},
+	{
+		I2C_BOARD_INFO("wm8753", 0x1a),
+	},
 };
 
 static struct s3c2410_nand_set gta02_nand_sets[] = {
diff --git a/arch/arm/mach-s3c6410/mach-om-gta03.c b/arch/arm/mach-s3c6410/mach-om-gta03.c
index 4f90239..f1989dc 100644
--- a/arch/arm/mach-s3c6410/mach-om-gta03.c
+++ b/arch/arm/mach-s3c6410/mach-om-gta03.c
@@ -878,7 +878,9 @@ static struct i2c_board_info om_gta03_i2c_devs[] __initdata = {
 		.irq = GTA03_IRQ_LED,
 		.platform_data = &om_gta03_lp5521_pdata,
 	},
-
+	{
+		I2C_BOARD_INFO("wm8753", 0x1a),
+	},
 };
 
 struct platform_device s3c24xx_pwm_device = {
diff --git a/sound/soc/s3c24xx/neo1973_gta02_wm8753.c b/sound/soc/s3c24xx/neo1973_gta02_wm8753.c
index 77a58b3..5ecab55 100644
--- a/sound/soc/s3c24xx/neo1973_gta02_wm8753.c
+++ b/sound/soc/s3c24xx/neo1973_gta02_wm8753.c
@@ -612,18 +612,9 @@ static struct snd_soc_card neo1973_gta02 = {
 	.num_links = ARRAY_SIZE(neo1973_gta02_dai),
 };
 
-/* Audio private data */
-static struct wm8753_setup_data soc_codec_data_wm8753_gta02 = {
-	.i2c_bus = 0,
-	.i2c_address = 0x1a,
-//	.gpio_func[0] = AIC3X_GPIO1_FUNC_DISABLED,
-//	.gpio_func[1] = AIC3X_GPIO2_FUNC_DIGITAL_MIC_INPUT,
-};
-
 static struct snd_soc_device neo1973_gta02_snd_devdata = {
 	.card = &neo1973_gta02,
 	.codec_dev = &soc_codec_dev_wm8753,
-	.codec_data = &soc_codec_data_wm8753_gta02,
 };
 
 
diff --git a/sound/soc/s3c24xx/om_gta03_wm8753.c b/sound/soc/s3c24xx/om_gta03_wm8753.c
index c55c0b1..8df3c75 100644
--- a/sound/soc/s3c24xx/om_gta03_wm8753.c
+++ b/sound/soc/s3c24xx/om_gta03_wm8753.c
@@ -517,16 +517,9 @@ static struct snd_soc_card om_gta03 = {
 	.num_links	= ARRAY_SIZE(om_gta03_dai),
 };
 
-/* Audio private data */
-static struct wm8753_setup_data soc_codec_data_wm8753_gta02 = {
-	.i2c_bus	= 0,
-	.i2c_address	= 0x1a,
-};
-
 static struct snd_soc_device om_gta03_snd_devdata = {
 	.card		= &om_gta03,
 	.codec_dev	= &soc_codec_dev_wm8753,
-	.codec_data	= &soc_codec_data_wm8753_gta02,
 };
 
 static struct platform_device *om_gta03_snd_device;
-- 
1.5.6.3