diff options
Diffstat (limited to 'sound/soc/codecs/sgtl5000.c')
| -rw-r--r-- | sound/soc/codecs/sgtl5000.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sound/soc/codecs/sgtl5000.c b/sound/soc/codecs/sgtl5000.c index d441559dc92c..6c8a9e7bee25 100644 --- a/sound/soc/codecs/sgtl5000.c +++ b/sound/soc/codecs/sgtl5000.c | |||
| @@ -38,7 +38,7 @@ | |||
| 38 | static const struct reg_default sgtl5000_reg_defaults[] = { | 38 | static const struct reg_default sgtl5000_reg_defaults[] = { |
| 39 | { SGTL5000_CHIP_CLK_CTRL, 0x0008 }, | 39 | { SGTL5000_CHIP_CLK_CTRL, 0x0008 }, |
| 40 | { SGTL5000_CHIP_I2S_CTRL, 0x0010 }, | 40 | { SGTL5000_CHIP_I2S_CTRL, 0x0010 }, |
| 41 | { SGTL5000_CHIP_SSS_CTRL, 0x0008 }, | 41 | { SGTL5000_CHIP_SSS_CTRL, 0x0010 }, |
| 42 | { SGTL5000_CHIP_DAC_VOL, 0x3c3c }, | 42 | { SGTL5000_CHIP_DAC_VOL, 0x3c3c }, |
| 43 | { SGTL5000_CHIP_PAD_STRENGTH, 0x015f }, | 43 | { SGTL5000_CHIP_PAD_STRENGTH, 0x015f }, |
| 44 | { SGTL5000_CHIP_ANA_HP_CTRL, 0x1818 }, | 44 | { SGTL5000_CHIP_ANA_HP_CTRL, 0x1818 }, |
| @@ -1527,6 +1527,9 @@ static int sgtl5000_i2c_probe(struct i2c_client *client, | |||
| 1527 | if (IS_ERR(sgtl5000->mclk)) { | 1527 | if (IS_ERR(sgtl5000->mclk)) { |
| 1528 | ret = PTR_ERR(sgtl5000->mclk); | 1528 | ret = PTR_ERR(sgtl5000->mclk); |
| 1529 | dev_err(&client->dev, "Failed to get mclock: %d\n", ret); | 1529 | dev_err(&client->dev, "Failed to get mclock: %d\n", ret); |
| 1530 | /* Defer the probe to see if the clk will be provided later */ | ||
| 1531 | if (ret == -ENOENT) | ||
| 1532 | return -EPROBE_DEFER; | ||
| 1530 | return ret; | 1533 | return ret; |
| 1531 | } | 1534 | } |
| 1532 | 1535 | ||
