Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit df0fd5e5 authored by Cliff Cai's avatar Cliff Cai Committed by Mark Brown
Browse files

ASoC: Blackfin: fix inverted handling of SPORT0 on PORT F/G 



Signed-off-by: default avatarCliff Cai <cliff.cai@analog.com>
Signed-off-by: default avatarBarry Song <barry.song@analog.com>
Signed-off-by: default avatarMike Frysinger <vapier@gentoo.org>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 877ae707

sound/soc/blackfin/bf5xx-i2s.c

+4 −4
Original line number Diff line number Diff line
@@ -77,12 +77,12 @@ static struct sport_param sport_params[2] = { 
 * TFS. When Port G is selected and EMAC then there is a conflict between

 * the PHY interrupt line and TFS.  Current settings prevent the conflict

 * by ignoring the TFS pin when Port G is selected. This allows both

 * ssm2602 using Port G and EMAC concurrently.

 * codecs and EMAC using Port G concurrently.

 */

#ifdef CONFIG_BF527_SPORT0_PORTF

#define LOCAL_SPORT0_TFS (P_SPORT0_TFS)

#else

#ifdef CONFIG_BF527_SPORT0_PORTG

#define LOCAL_SPORT0_TFS (0)

#else

#define LOCAL_SPORT0_TFS (P_SPORT0_TFS)

#endif



static u16 sport_req[][7] = { {P_SPORT0_DTPRI, P_SPORT0_TSCLK, P_SPORT0_RFS,

sound/soc/blackfin/bf5xx-tdm.c

+4 −4
Original line number Diff line number Diff line
@@ -78,12 +78,12 @@ static struct sport_param sport_params[2] = { 
 * TFS. When Port G is selected and EMAC then there is a conflict between

 * the PHY interrupt line and TFS.  Current settings prevent the conflict

 * by ignoring the TFS pin when Port G is selected. This allows both

 * ssm2602 using Port G and EMAC concurrently.

 * codecs and EMAC using Port G concurrently.

 */

#ifdef CONFIG_BF527_SPORT0_PORTF

#define LOCAL_SPORT0_TFS (P_SPORT0_TFS)

#else

#ifdef CONFIG_BF527_SPORT0_PORTG

#define LOCAL_SPORT0_TFS (0)

#else

#define LOCAL_SPORT0_TFS (P_SPORT0_TFS)

#endif



static u16 sport_req[][7] = { {P_SPORT0_DTPRI, P_SPORT0_TSCLK, P_SPORT0_RFS,