diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2014-03-13 20:48:49 +0100 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2014-03-13 20:48:49 +0100 |
| commit | b73e3f3a566816466cb495ea37ebfce67909519d (patch) | |
| tree | 7065abea97bcbc1b2d854e2be740b749bb3f0aa7 | |
| parent | 145c1e997fec52bc63fc10716dbc7f84e4b99f20 (diff) | |
apalis-imx6: change sgtl5000 platform data
- sgtl5000 is on I2C bus 1
- correct used voltages for vddd and vdda
| -rw-r--r-- | arch/arm/mach-mx6/board-apalis_imx6.c | 11 | ||||
| -rw-r--r-- | sound/soc/imx/imx-sgtl5000.c | 6 |
2 files changed, 9 insertions, 8 deletions
diff --git a/arch/arm/mach-mx6/board-apalis_imx6.c b/arch/arm/mach-mx6/board-apalis_imx6.c index e86e16502ecd..0d343c39b528 100644 --- a/arch/arm/mach-mx6/board-apalis_imx6.c +++ b/arch/arm/mach-mx6/board-apalis_imx6.c @@ -1194,17 +1194,17 @@ static struct platform_device vmmc_reg_devices = { static struct regulator_consumer_supply sgtl5000_consumer_vdda = { .supply = "VDDA", - .dev_name = "0-000a", + .dev_name = "1-000a", }; static struct regulator_consumer_supply sgtl5000_consumer_vddio = { .supply = "VDDIO", - .dev_name = "0-000a", + .dev_name = "1-000a", }; static struct regulator_consumer_supply sgtl5000_consumer_vddd = { .supply = "VDDD", - .dev_name = "0-000a", + .dev_name = "1-000a", }; static struct regulator_init_data sgtl5000_vdda_reg_initdata = { @@ -1224,7 +1224,7 @@ static struct regulator_init_data sgtl5000_vddd_reg_initdata = { static struct fixed_voltage_config sgtl5000_vdda_reg_config = { .supply_name = "VDDA", - .microvolts = 2500000, + .microvolts = 3300000, .gpio = -1, .init_data = &sgtl5000_vdda_reg_initdata, }; @@ -1238,7 +1238,7 @@ static struct fixed_voltage_config sgtl5000_vddio_reg_config = { static struct fixed_voltage_config sgtl5000_vddd_reg_config = { .supply_name = "VDDD", - .microvolts = 0, + .microvolts = 1800000, .gpio = -1, .init_data = &sgtl5000_vddd_reg_initdata, }; @@ -1484,7 +1484,6 @@ static void __init board_init(void) /* enable touch interrupt GPIO */ gpio_request(TOUCH_PEN_INT, "TOUCH_PEN_INT"); gpio_direction_input(TOUCH_PEN_INT); - mxc_i2c1_board_info[1].irq = gpio_to_irq(TOUCH_PEN_INT); i2c_register_board_info(0, mxc_i2c0_board_info, diff --git a/sound/soc/imx/imx-sgtl5000.c b/sound/soc/imx/imx-sgtl5000.c index d1f473182bce..6a3268dec2b2 100644 --- a/sound/soc/imx/imx-sgtl5000.c +++ b/sound/soc/imx/imx-sgtl5000.c @@ -289,7 +289,11 @@ static struct snd_soc_dai_link imx_sgtl5000_dai[] = { .name = "HiFi", .stream_name = "HiFi", .codec_dai_name = "sgtl5000", +#if !defined(CONFIG_MACH_APALIS_IMX6) + .codec_name = "sgtl5000.0-000a", +#else .codec_name = "sgtl5000.1-000a", +#endif .cpu_dai_name = "imx-ssi.1", .platform_name = "imx-pcm-audio.1", .init = imx_3stack_sgtl5000_init, @@ -375,8 +379,6 @@ static int __init imx_sgtl5000_init(void) if (ret) return -ENOMEM; - imx_sgtl5000_dai[0].codec_name = "sgtl5000.0-000a"; - imx_sgtl5000_snd_device = platform_device_alloc("soc-audio", 1); if (!imx_sgtl5000_snd_device) return -ENOMEM; |