From 099d334e3d5c0b26480dffc44fe6272c90898237 Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Tue, 17 Jun 2014 12:41:31 +0800 Subject: ASoC: rt5677: Convert to use rl6231_pll_calc The implementation of rt5677_pll_calc() has the same logic of rl6231_pll_calc(). The only difference is the lower boundary checking for freq_in. This patch calls rl6231_pll_calc() instead of open-coded. The k_bp of struct rt5677_pll_code is always false, thus also remove the code to check pll_code.k_bp. Signed-off-by: Axel Lin Tested-by: Oder Chiou Signed-off-by: Mark Brown --- sound/soc/codecs/rt5677.h | 8 -------- 1 file changed, 8 deletions(-) (limited to 'sound/soc/codecs/rt5677.h') diff --git a/sound/soc/codecs/rt5677.h b/sound/soc/codecs/rt5677.h index af4e9c797408..08252e7c1ab4 100644 --- a/sound/soc/codecs/rt5677.h +++ b/sound/soc/codecs/rt5677.h @@ -1425,14 +1425,6 @@ enum { RT5677_AIFS, }; -struct rt5677_pll_code { - bool m_bp; /* Indicates bypass m code or not. */ - bool k_bp; /* Indicates bypass k code or not. */ - int m_code; - int n_code; - int k_code; -}; - struct rt5677_priv { struct snd_soc_codec *codec; struct rt5677_platform_data pdata; -- cgit v1.2.3 From cc6b0ae96239ac77fac569e871704a4f1bf3c595 Mon Sep 17 00:00:00 2001 From: Oder Chiou Date: Mon, 7 Jul 2014 15:36:59 +0800 Subject: ASoC: rt5677: Remove the redundant definition in head file The patch removes the redundant definition in head file Signed-off-by: Oder Chiou Signed-off-by: Mark Brown --- sound/soc/codecs/rt5677.h | 7 ------- 1 file changed, 7 deletions(-) (limited to 'sound/soc/codecs/rt5677.h') diff --git a/sound/soc/codecs/rt5677.h b/sound/soc/codecs/rt5677.h index 08252e7c1ab4..863393e62096 100644 --- a/sound/soc/codecs/rt5677.h +++ b/sound/soc/codecs/rt5677.h @@ -1393,13 +1393,6 @@ #define RT5677_DSP_IB_9_L (0x1 << 1) #define RT5677_DSP_IB_9_L_SFT 1 -/* Debug String Length */ -#define RT5677_REG_DISP_LEN 23 - -#define RT5677_NO_JACK BIT(0) -#define RT5677_HEADSET_DET BIT(1) -#define RT5677_HEADPHO_DET BIT(2) - /* System Clock Source */ enum { RT5677_SCLK_S_MCLK, -- cgit v1.2.3