From 19c048344d80fee1c2cd913aecf7162d2d457beb Mon Sep 17 00:00:00 2001 From: Bertrik Sikken Date: Tue, 9 Nov 2010 21:53:44 +0000 Subject: Apply FS#11729 - Remove unneeded I2SIN clock configuration for AS3525 and AS3525v2 git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28541 a1c6a512-1295-4272-9138-f99709370657 --- firmware/target/arm/as3525/pcm-as3525.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/firmware/target/arm/as3525/pcm-as3525.c b/firmware/target/arm/as3525/pcm-as3525.c index 720f615ba9..e0cb9aa441 100644 --- a/firmware/target/arm/as3525/pcm-as3525.c +++ b/firmware/target/arm/as3525/pcm-as3525.c @@ -177,6 +177,8 @@ void pcm_dma_apply_settings(void) cgu_audio |= (AS3525_MCLK_SEL << 0); /* set i2sout MCLK_SEL */ cgu_audio &= ~(0x1ff << 2); /* clear i2sout divider */ cgu_audio |= mclk_divider() << 2; /* set new i2sout divider */ + cgu_audio &= ~(1 << 23); /* clear I2SI_MCLK_EN */ + cgu_audio &= ~(1 << 24); /* clear I2SI_MCLK2PAD_EN */ CGU_AUDIO = cgu_audio; /* write back register */ } @@ -338,7 +340,7 @@ void pcm_rec_dma_stop(void) I2SIN_CONTROL &= ~(1<<11); /* disable dma */ - CGU_AUDIO &= ~((1<<23)|(1<<11)); + CGU_AUDIO &= ~(1<<11); bitclr32(&CGU_PERI, CGU_I2SIN_APB_CLOCK_ENABLE | CGU_I2SOUT_APB_CLOCK_ENABLE); } @@ -357,7 +359,7 @@ void pcm_rec_dma_start(void *addr, size_t size) bitset32(&CGU_PERI, CGU_I2SIN_APB_CLOCK_ENABLE | CGU_I2SOUT_APB_CLOCK_ENABLE); - CGU_AUDIO |= ((1<<23)|(1<<11)); + CGU_AUDIO |= (1<<11); I2SIN_CONTROL |= (1<<11)|(1<<5); /* enable dma, 14bits samples */ @@ -374,13 +376,6 @@ void pcm_rec_dma_close(void) void pcm_rec_dma_init(void) { - int cgu_audio = CGU_AUDIO; /* read register */ - cgu_audio &= ~(3 << 12); /* clear i2sin MCLK_SEL */ - cgu_audio |= (AS3525_MCLK_SEL << 12); /* set i2sin MCLK_SEL */ - cgu_audio &= ~(0x1ff << 14); /* clear i2sin divider */ - cgu_audio |= mclk_divider() << 14; /* set new i2sin divider */ - CGU_AUDIO = cgu_audio; /* write back register */ - /* i2c clk src = I2SOUTIF, sdata src = AFE, * data valid at positive edge of SCLK */ I2SIN_CONTROL = (1<<2); -- cgit v1.2.3