diff options
| author | Cliff Cai <cliff.cai@analog.com> | 2009-09-23 11:51:05 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-09-23 12:10:01 -0400 |
| commit | df0fd5e5e117329436fdea568455545ca18a71f0 (patch) | |
| tree | 8d31abfbb03d0b0578a8eaa52510dee540f5e8a6 | |
| parent | 877ae70763fa0b19ffbe25e7e119fc96f52fbbd3 (diff) | |
ASoC: Blackfin: fix inverted handling of SPORT0 on PORT F/G
Signed-off-by: Cliff Cai <cliff.cai@analog.com>
Signed-off-by: Barry Song <barry.song@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| -rw-r--r-- | sound/soc/blackfin/bf5xx-i2s.c | 8 | ||||
| -rw-r--r-- | sound/soc/blackfin/bf5xx-tdm.c | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/sound/soc/blackfin/bf5xx-i2s.c b/sound/soc/blackfin/bf5xx-i2s.c index 1e9d161c76c..084b68884ad 100644 --- a/sound/soc/blackfin/bf5xx-i2s.c +++ b/sound/soc/blackfin/bf5xx-i2s.c | |||
| @@ -77,12 +77,12 @@ static struct sport_param sport_params[2] = { | |||
| 77 | * TFS. When Port G is selected and EMAC then there is a conflict between | 77 | * TFS. When Port G is selected and EMAC then there is a conflict between |
| 78 | * the PHY interrupt line and TFS. Current settings prevent the conflict | 78 | * the PHY interrupt line and TFS. Current settings prevent the conflict |
| 79 | * by ignoring the TFS pin when Port G is selected. This allows both | 79 | * by ignoring the TFS pin when Port G is selected. This allows both |
| 80 | * ssm2602 using Port G and EMAC concurrently. | 80 | * codecs and EMAC using Port G concurrently. |
| 81 | */ | 81 | */ |
| 82 | #ifdef CONFIG_BF527_SPORT0_PORTF | 82 | #ifdef CONFIG_BF527_SPORT0_PORTG |
| 83 | #define LOCAL_SPORT0_TFS (P_SPORT0_TFS) | ||
| 84 | #else | ||
| 85 | #define LOCAL_SPORT0_TFS (0) | 83 | #define LOCAL_SPORT0_TFS (0) |
| 84 | #else | ||
| 85 | #define LOCAL_SPORT0_TFS (P_SPORT0_TFS) | ||
| 86 | #endif | 86 | #endif |
| 87 | 87 | ||
| 88 | static u16 sport_req[][7] = { {P_SPORT0_DTPRI, P_SPORT0_TSCLK, P_SPORT0_RFS, | 88 | static 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 3096badf09a..ff546e91a22 100644 --- a/sound/soc/blackfin/bf5xx-tdm.c +++ b/sound/soc/blackfin/bf5xx-tdm.c | |||
| @@ -78,12 +78,12 @@ static struct sport_param sport_params[2] = { | |||
| 78 | * TFS. When Port G is selected and EMAC then there is a conflict between | 78 | * TFS. When Port G is selected and EMAC then there is a conflict between |
| 79 | * the PHY interrupt line and TFS. Current settings prevent the conflict | 79 | * the PHY interrupt line and TFS. Current settings prevent the conflict |
| 80 | * by ignoring the TFS pin when Port G is selected. This allows both | 80 | * by ignoring the TFS pin when Port G is selected. This allows both |
| 81 | * ssm2602 using Port G and EMAC concurrently. | 81 | * codecs and EMAC using Port G concurrently. |
| 82 | */ | 82 | */ |
| 83 | #ifdef CONFIG_BF527_SPORT0_PORTF | 83 | #ifdef CONFIG_BF527_SPORT0_PORTG |
| 84 | #define LOCAL_SPORT0_TFS (P_SPORT0_TFS) | ||
| 85 | #else | ||
| 86 | #define LOCAL_SPORT0_TFS (0) | 84 | #define LOCAL_SPORT0_TFS (0) |
| 85 | #else | ||
| 86 | #define LOCAL_SPORT0_TFS (P_SPORT0_TFS) | ||
| 87 | #endif | 87 | #endif |
| 88 | 88 | ||
| 89 | static u16 sport_req[][7] = { {P_SPORT0_DTPRI, P_SPORT0_TSCLK, P_SPORT0_RFS, | 89 | static u16 sport_req[][7] = { {P_SPORT0_DTPRI, P_SPORT0_TSCLK, P_SPORT0_RFS, |