|
@@ -20,7 +20,6 @@
|
|
|
#include <linux/platform_device.h>
|
|
|
#include <linux/slab.h>
|
|
|
#include <linux/clk.h>
|
|
|
-#include <asm/cpu_device_id.h>
|
|
|
#include <sound/pcm.h>
|
|
|
#include <sound/pcm_params.h>
|
|
|
#include <sound/soc.h>
|
|
@@ -394,18 +393,6 @@ static struct snd_soc_card snd_soc_card_cht = {
|
|
|
.resume_post = cht_resume_post,
|
|
|
};
|
|
|
|
|
|
-static bool is_valleyview(void)
|
|
|
-{
|
|
|
- static const struct x86_cpu_id cpu_ids[] = {
|
|
|
- { X86_VENDOR_INTEL, 6, 55 }, /* Valleyview, Bay Trail */
|
|
|
- {}
|
|
|
- };
|
|
|
-
|
|
|
- if (!x86_match_cpu(cpu_ids))
|
|
|
- return false;
|
|
|
- return true;
|
|
|
-}
|
|
|
-
|
|
|
#define RT5672_I2C_DEFAULT "i2c-10EC5670:00"
|
|
|
|
|
|
static int snd_cht_mc_probe(struct platform_device *pdev)
|
|
@@ -439,14 +426,12 @@ static int snd_cht_mc_probe(struct platform_device *pdev)
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- if (is_valleyview()) {
|
|
|
- drv->mclk = devm_clk_get(&pdev->dev, "pmc_plt_clk_3");
|
|
|
- if (IS_ERR(drv->mclk)) {
|
|
|
- dev_err(&pdev->dev,
|
|
|
- "Failed to get MCLK from pmc_plt_clk_3: %ld\n",
|
|
|
- PTR_ERR(drv->mclk));
|
|
|
- return PTR_ERR(drv->mclk);
|
|
|
- }
|
|
|
+ drv->mclk = devm_clk_get(&pdev->dev, "pmc_plt_clk_3");
|
|
|
+ if (IS_ERR(drv->mclk)) {
|
|
|
+ dev_err(&pdev->dev,
|
|
|
+ "Failed to get MCLK from pmc_plt_clk_3: %ld\n",
|
|
|
+ PTR_ERR(drv->mclk));
|
|
|
+ return PTR_ERR(drv->mclk);
|
|
|
}
|
|
|
snd_soc_card_set_drvdata(&snd_soc_card_cht, drv);
|
|
|
|