aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/blackfin
diff options
context:
space:
mode:
Diffstat (limited to 'sound/soc/blackfin')
-rw-r--r--sound/soc/blackfin/bf5xx-i2s.c8
-rw-r--r--sound/soc/blackfin/bf5xx-tdm.c8
2 files changed, 8 insertions, 8 deletions
diff --git a/sound/soc/blackfin/bf5xx-i2s.c b/sound/soc/blackfin/bf5xx-i2s.c
index fe2c35ddcbf4..3e6ada0dd1c4 100644
--- a/sound/soc/blackfin/bf5xx-i2s.c
+++ b/sound/soc/blackfin/bf5xx-i2s.c
@@ -76,12 +76,12 @@ static struct sport_param sport_params[2] = {
76 * TFS. When Port G is selected and EMAC then there is a conflict between 76 * TFS. When Port G is selected and EMAC then there is a conflict between
77 * the PHY interrupt line and TFS. Current settings prevent the conflict 77 * the PHY interrupt line and TFS. Current settings prevent the conflict
78 * by ignoring the TFS pin when Port G is selected. This allows both 78 * by ignoring the TFS pin when Port G is selected. This allows both
79 * ssm2602 using Port G and EMAC concurrently. 79 * codecs and EMAC using Port G concurrently.
80 */ 80 */
81#ifdef CONFIG_BF527_SPORT0_PORTF 81#ifdef CONFIG_BF527_SPORT0_PORTG
82#define LOCAL_SPORT0_TFS (P_SPORT0_TFS)
83#else
84#define LOCAL_SPORT0_TFS (0) 82#define LOCAL_SPORT0_TFS (0)
83#else
84#define LOCAL_SPORT0_TFS (P_SPORT0_TFS)
85#endif 85#endif
86 86
87static u16 sport_req[][7] = { {P_SPORT0_DTPRI, P_SPORT0_TSCLK, P_SPORT0_RFS, 87static u16 sport_req[][7] = { {P_SPORT0_DTPRI, P_SPORT0_TSCLK, P_SPORT0_RFS,
diff --git a/sound/soc/blackfin/bf5xx-tdm.c b/sound/soc/blackfin/bf5xx-tdm.c
index 600987d8a871..4b360124083e 100644
--- a/sound/soc/blackfin/bf5xx-tdm.c
+++ b/sound/soc/blackfin/bf5xx-tdm.c
@@ -70,12 +70,12 @@ static struct sport_param sport_params[2] = {
70 * TFS. When Port G is selected and EMAC then there is a conflict between 70 * TFS. When Port G is selected and EMAC then there is a conflict between
71 * the PHY interrupt line and TFS. Current settings prevent the conflict 71 * the PHY interrupt line and TFS. Current settings prevent the conflict
72 * by ignoring the TFS pin when Port G is selected. This allows both 72 * by ignoring the TFS pin when Port G is selected. This allows both
73 * ssm2602 using Port G and EMAC concurrently. 73 * codecs and EMAC using Port G concurrently.
74 */ 74 */
75#ifdef CONFIG_BF527_SPORT0_PORTF 75#ifdef CONFIG_BF527_SPORT0_PORTG
76#define LOCAL_SPORT0_TFS (P_SPORT0_TFS)
77#else
78#define LOCAL_SPORT0_TFS (0) 76#define LOCAL_SPORT0_TFS (0)
77#else
78#define LOCAL_SPORT0_TFS (P_SPORT0_TFS)
79#endif 79#endif
80 80
81static u16 sport_req[][7] = { {P_SPORT0_DTPRI, P_SPORT0_TSCLK, P_SPORT0_RFS, 81static u16 sport_req[][7] = { {P_SPORT0_DTPRI, P_SPORT0_TSCLK, P_SPORT0_RFS,