From 070ee525acdf22d445eb5f5f41371f5922b675ca Mon Sep 17 00:00:00 2001 From: Bertrik Sikken Date: Tue, 7 Apr 2009 17:20:31 +0000 Subject: Patch by Rafaël Carré - Sansa AMS i2c : * remove peripheral reset (already made in system_init). * Move empty i2c_init() from i2c-as3525.c (and remove that file) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20645 a1c6a512-1295-4272-9138-f99709370657 --- firmware/SOURCES | 1 - firmware/target/arm/as3525/ascodec-as3525.c | 10 +++++----- firmware/target/arm/as3525/i2c-as3525.c | 28 ---------------------------- 3 files changed, 5 insertions(+), 34 deletions(-) delete mode 100644 firmware/target/arm/as3525/i2c-as3525.c (limited to 'firmware') diff --git a/firmware/SOURCES b/firmware/SOURCES index 91482bf683..adbcb08c95 100644 --- a/firmware/SOURCES +++ b/firmware/SOURCES @@ -366,7 +366,6 @@ target/arm/adc-as3514.c target/arm/as3525/audio-as3525.c target/arm/as3525/debug-as3525.c target/arm/as3525/fmradio-i2c-as3525.c -target/arm/as3525/i2c-as3525.c target/arm/as3525/i2s-as3525.c target/arm/as3525/pcm-as3525.c #endif /* BOOTLOADER */ diff --git a/firmware/target/arm/as3525/ascodec-as3525.c b/firmware/target/arm/as3525/ascodec-as3525.c index 768fb8293f..9d13994cbc 100644 --- a/firmware/target/arm/as3525/ascodec-as3525.c +++ b/firmware/target/arm/as3525/ascodec-as3525.c @@ -41,6 +41,7 @@ #include "clock-target.h" #include "kernel.h" #include "as3525.h" +#include "i2c.h" #define I2C2_DATA *((volatile unsigned int *)(I2C_AUDIO_BASE + 0x00)) #define I2C2_SLAD0 *((volatile unsigned int *)(I2C_AUDIO_BASE + 0x04)) @@ -57,14 +58,13 @@ static struct mutex as_mtx SHAREDBSS_ATTR; +void i2c_init(void) +{ +} + /* initialises the internal i2c bus and prepares for transfers to the codec */ void ascodec_init(void) { - /* reset device */ - CCU_SRC = CCU_SRC_I2C_AUDIO_EN; - CCU_SRL = CCU_SRL_MAGIC_NUMBER; - CCU_SRL = 0; - /* enable clock */ CGU_PERI |= CGU_I2C_AUDIO_MASTER_CLOCK_ENABLE; diff --git a/firmware/target/arm/as3525/i2c-as3525.c b/firmware/target/arm/as3525/i2c-as3525.c deleted file mode 100644 index 32f33435bc..0000000000 --- a/firmware/target/arm/as3525/i2c-as3525.c +++ /dev/null @@ -1,28 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright © 2008 Rafaël Carré - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ****************************************************************************/ - -#include "i2c.h" - -/* TODO */ - -void i2c_init(void) -{ -} -- cgit v1.2.3