From e9a2caee2bbd363058ed707acbe2df613c94c0e8 Mon Sep 17 00:00:00 2001 From: Daniel Ankers Date: Sat, 27 Jan 2007 17:17:52 +0000 Subject: Unify I2C driver for all PortalPlayer targets git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12126 a1c6a512-1295-4272-9138-f99709370657 --- firmware/target/arm/i2c-pp.c | 208 +++++++++++++++++++++++++++++++++++++++ firmware/target/arm/i2c-pp5002.c | 157 ----------------------------- firmware/target/arm/i2c-pp5020.c | 198 ------------------------------------- 3 files changed, 208 insertions(+), 355 deletions(-) create mode 100644 firmware/target/arm/i2c-pp.c delete mode 100644 firmware/target/arm/i2c-pp5002.c delete mode 100644 firmware/target/arm/i2c-pp5020.c (limited to 'firmware/target') diff --git a/firmware/target/arm/i2c-pp.c b/firmware/target/arm/i2c-pp.c new file mode 100644 index 0000000000..0c8aec8f4b --- /dev/null +++ b/firmware/target/arm/i2c-pp.c @@ -0,0 +1,208 @@ +/*************************************************************************** + * __________ __ ___. + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * $Id$ + * + * PP502X and PP5002 I2C driver + * + * Based on code from the ipodlinux project - http://ipodlinux.org/ + * Adapted for Rockbox in November 2005 + * + * Original file: linux/arch/armnommu/mach-ipod/hardware.c + * + * Copyright (c) 2003-2005 Bernard Leach (leachbj@bouncycastle.org) + * + * All files in this archive are subject to the GNU General Public License. + * See the file COPYING in the source tree root for full license agreement. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ****************************************************************************/ + +#include "cpu.h" +#include "kernel.h" +#include "logf.h" +#include "system.h" +#if CONFIG_I2C == I2C_PP5002 +#include "i2c-pp5002.h" +#else +#include "i2c-pp5020.h" +#endif + +/* Local functions definitions */ + +#define POLL_TIMEOUT (HZ) + +static int pp_i2c_wait_not_busy(void) +{ + unsigned long timeout; + timeout = current_tick + POLL_TIMEOUT; + while (TIME_BEFORE(current_tick, timeout)) { + if (!(I2C_STATUS & I2C_BUSY)) { + return 0; + } + yield(); + } + + return -1; +} + +static int pp_i2c_read_byte(unsigned int addr, unsigned int *data) +{ + if (pp_i2c_wait_not_busy() < 0) + { + return -1; + } + + { + unsigned int byte; + int old_irq_level = set_irq_level(HIGHEST_IRQ_LEVEL); + + /* clear top 15 bits, left shift 1, or in 0x1 for a read */ + I2C_ADDR = ((addr << 17) >> 16) | 0x1 ; + + I2C_CTRL |= 0x20; + + I2C_CTRL |= I2C_SEND; + + set_irq_level(old_irq_level); + if (pp_i2c_wait_not_busy() < 0) + { + return -1; + } + old_irq_level = set_irq_level(HIGHEST_IRQ_LEVEL); + + byte = I2C_DATA(0); + + if (data) + *data = byte; + + set_irq_level(old_irq_level); + } + + return 0; +} + +static int pp_i2c_send_bytes(unsigned int addr, unsigned int len, unsigned char *data) +{ + unsigned int i; + + if (len < 1 || len > 4) + { + return -1; + } + + if (pp_i2c_wait_not_busy() < 0) + { + return -2; + } + + { + int old_irq_level = set_irq_level(HIGHEST_IRQ_LEVEL); + + /* clear top 15 bits, left shift 1 */ + I2C_ADDR = (addr << 17) >> 16; + + I2C_CTRL &= ~0x20; + + for ( i = 0; i < len; i++ ) + { + I2C_DATA(i) = *data++; + } + + I2C_CTRL = (I2C_CTRL & ~0x26) | ((len-1) << 1); + + I2C_CTRL |= I2C_SEND; + + set_irq_level(old_irq_level); + } + + return 0x0; +} + +static int pp_i2c_send_byte(unsigned int addr, int data0) +{ + unsigned char data[1]; + + data[0] = data0; + + return pp_i2c_send_bytes(addr, 1, data); +} + +/* Public functions */ +static struct mutex i2c_mutex; + +int i2c_readbytes(unsigned int dev_addr, int addr, int len, unsigned char *data) { + unsigned int temp; + int i; + mutex_lock(&i2c_mutex); + pp_i2c_send_byte(dev_addr, addr); + for (i = 0; i < len; i++) { + pp_i2c_read_byte(dev_addr, &temp); + data[i] = temp; + } + mutex_unlock(&i2c_mutex); + return i; +} + +int i2c_readbyte(unsigned int dev_addr, int addr) +{ + int data; + + mutex_lock(&i2c_mutex); + pp_i2c_send_byte(dev_addr, addr); + pp_i2c_read_byte(dev_addr, &data); + mutex_unlock(&i2c_mutex); + + return data; +} + +int pp_i2c_send(unsigned int addr, int data0, int data1) +{ + int retval; + unsigned char data[2]; + + data[0] = data0; + data[1] = data1; + + mutex_lock(&i2c_mutex); + retval = pp_i2c_send_bytes(addr, 2, data); + mutex_unlock(&i2c_mutex); + + return retval; +} + +void i2c_init(void) +{ + /* From ipodlinux */ + +#ifdef IPOD_MINI + /* GPIO port C disable port 0x10 */ + GPIOC_ENABLE &= ~0x10; + + /* GPIO port C disable port 0x20 */ + GPIOC_ENABLE &= ~0x20; +#endif + +#if CONFIG_I2C == I2C_PP5002 + DEV_EN |= 0x2; +#else + DEV_EN |= DEV_I2C; /* Enable I2C */ +#endif + DEV_RS |= DEV_I2C; /* Start I2C Reset */ + DEV_RS &=~DEV_I2C; /* End I2C Reset */ + +#if CONFIG_I2C == I2C_PP5020 + outl(0x0, 0x600060a4); + outl(0x80 | (0 << 8), 0x600060a4); +#endif + + mutex_init(&i2c_mutex); + + i2c_readbyte(0x8, 0); +} diff --git a/firmware/target/arm/i2c-pp5002.c b/firmware/target/arm/i2c-pp5002.c deleted file mode 100644 index ad6d50721d..0000000000 --- a/firmware/target/arm/i2c-pp5002.c +++ /dev/null @@ -1,157 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * PP5002 I2C driver - * - * Based on code from the ipodlinux project - http://ipodlinux.org/ - * Adapted for Rockbox in January 2006 - * - * Original file: linux/arch/armnommu/mach-ipod/hardware.c - * - * Copyright (c) 2003-2005 Bernard Leach (leachbj@bouncycastle.org) - * - * All files in this archive are subject to the GNU General Public License. - * See the file COPYING in the source tree root for full license agreement. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ****************************************************************************/ - -#include "cpu.h" -#include "kernel.h" -#include "logf.h" -#include "system.h" -#include "i2c-pp5002.h" - -/* Local functions definitions */ - -#define POLL_TIMEOUT (HZ) - -static int pp_i2c_wait_not_busy(void) -{ - unsigned long timeout; - timeout = current_tick + POLL_TIMEOUT; - while (TIME_BEFORE(current_tick, timeout)) { - if (!(I2C_STATUS & I2C_BUSY)) { - return 0; - } - yield(); - } - - return -1; -} - - -/* Public functions */ - -int pp_i2c_read_byte(unsigned int addr, unsigned int *data) -{ - if (pp_i2c_wait_not_busy() < 0) - { - return -1; - } - - /* clear top 15 bits, left shift 1, or in 0x1 for a read */ - I2C_ADDR = ((addr << 17) >> 16) | 0x1 ; - - I2C_CTRL |= 0x20; - - I2C_CTRL |= I2C_SEND; - - if (pp_i2c_wait_not_busy() < 0) - { - return -1; - } - - if (data) - { - *data = I2C_DATA(0); - } - - return 0; -} - -int pp_i2c_send_bytes(unsigned int addr, unsigned int len, unsigned char *data) -{ - unsigned int i; - - if (len < 1 || len > 4) - { - return -1; - } - - if (pp_i2c_wait_not_busy() < 0) - { - return -2; - } - - /* clear top 15 bits, left shift 1 */ - I2C_ADDR = (addr << 17) >> 16; - - I2C_CTRL &= ~0x20; - - for ( i = 0; i < len; i++ ) - { - I2C_DATA(i) = *data++; - } - - I2C_CTRL = (I2C_CTRL & ~0x26) | ((len-1) << 1); - - I2C_CTRL |= I2C_SEND; - - return 0x0; -} - -int pp_i2c_send_byte(unsigned int addr, int data0) -{ - unsigned char data[1]; - - data[0] = data0; - - return pp_i2c_send_bytes(addr, 1, data); -} - -int i2c_readbytes(unsigned int dev_addr, int addr, int len, unsigned char *data) { - unsigned int temp; - int i; - pp_i2c_send_byte(dev_addr, addr); - for (i = 0; i < len; i++) { - pp_i2c_read_byte(dev_addr, &temp); - data[i] = temp; - } - return i; -} - -int i2c_readbyte(unsigned int dev_addr, int addr) -{ - int data; - - pp_i2c_send_byte(dev_addr, addr); - pp_i2c_read_byte(dev_addr, &data); - - return data; -} - -int pp_i2c_send(unsigned int addr, int data0, int data1) -{ - unsigned char data[2]; - - data[0] = data0; - data[1] = data1; - - return pp_i2c_send_bytes(addr, 2, data); -} - -void i2c_init(void) -{ - DEV_EN |= 0x2; /* Enable I2C-should this be DEV_I2C rather than 0x2? */ - DEV_RS |= DEV_I2C; /* Start I2C Reset */ - DEV_RS &=~DEV_I2C; /* End I2C Reset */ -} diff --git a/firmware/target/arm/i2c-pp5020.c b/firmware/target/arm/i2c-pp5020.c deleted file mode 100644 index ebd0318f0b..0000000000 --- a/firmware/target/arm/i2c-pp5020.c +++ /dev/null @@ -1,198 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * PP5020 I2C driver - * - * Based on code from the ipodlinux project - http://ipodlinux.org/ - * Adapted for Rockbox in November 2005 - * - * Original file: linux/arch/armnommu/mach-ipod/hardware.c - * - * Copyright (c) 2003-2005 Bernard Leach (leachbj@bouncycastle.org) - * - * All files in this archive are subject to the GNU General Public License. - * See the file COPYING in the source tree root for full license agreement. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ****************************************************************************/ - -#include "cpu.h" -#include "kernel.h" -#include "logf.h" -#include "system.h" -#include "i2c-pp5020.h" - -/* Local functions definitions */ - -#define POLL_TIMEOUT (HZ) - -static int pp_i2c_wait_not_busy(void) -{ - unsigned long timeout; - timeout = current_tick + POLL_TIMEOUT; - while (TIME_BEFORE(current_tick, timeout)) { - if (!(I2C_STATUS & I2C_BUSY)) { - return 0; - } - yield(); - } - - return -1; -} - -static int pp_i2c_read_byte(unsigned int addr, unsigned int *data) -{ - if (pp_i2c_wait_not_busy() < 0) - { - return -1; - } - - { - unsigned int byte; - int old_irq_level = set_irq_level(HIGHEST_IRQ_LEVEL); - - /* clear top 15 bits, left shift 1, or in 0x1 for a read */ - I2C_ADDR = ((addr << 17) >> 16) | 0x1 ; - - I2C_CTRL |= 0x20; - - I2C_CTRL |= I2C_SEND; - - set_irq_level(old_irq_level); - if (pp_i2c_wait_not_busy() < 0) - { - return -1; - } - old_irq_level = set_irq_level(HIGHEST_IRQ_LEVEL); - - byte = I2C_DATA(0); - - if (data) - *data = byte; - - set_irq_level(old_irq_level); - } - - return 0; -} - -static int pp_i2c_send_bytes(unsigned int addr, unsigned int len, unsigned char *data) -{ - unsigned int i; - - if (len < 1 || len > 4) - { - return -1; - } - - if (pp_i2c_wait_not_busy() < 0) - { - return -2; - } - - { - int old_irq_level = set_irq_level(HIGHEST_IRQ_LEVEL); - - /* clear top 15 bits, left shift 1 */ - I2C_ADDR = (addr << 17) >> 16; - - I2C_CTRL &= ~0x20; - - for ( i = 0; i < len; i++ ) - { - I2C_DATA(i) = *data++; - } - - I2C_CTRL = (I2C_CTRL & ~0x26) | ((len-1) << 1); - - I2C_CTRL |= I2C_SEND; - - set_irq_level(old_irq_level); - } - - return 0x0; -} - -static int pp_i2c_send_byte(unsigned int addr, int data0) -{ - unsigned char data[1]; - - data[0] = data0; - - return pp_i2c_send_bytes(addr, 1, data); -} - -/* Public functions */ -static struct mutex i2c_mutex; - -int i2c_readbytes(unsigned int dev_addr, int addr, int len, unsigned char *data) { - unsigned int temp; - int i; - mutex_lock(&i2c_mutex); - pp_i2c_send_byte(dev_addr, addr); - for (i = 0; i < len; i++) { - pp_i2c_read_byte(dev_addr, &temp); - data[i] = temp; - } - mutex_unlock(&i2c_mutex); - return i; -} - -int i2c_readbyte(unsigned int dev_addr, int addr) -{ - int data; - - mutex_lock(&i2c_mutex); - pp_i2c_send_byte(dev_addr, addr); - pp_i2c_read_byte(dev_addr, &data); - mutex_unlock(&i2c_mutex); - - return data; -} - -int pp_i2c_send(unsigned int addr, int data0, int data1) -{ - int retval; - unsigned char data[2]; - - data[0] = data0; - data[1] = data1; - - mutex_lock(&i2c_mutex); - retval = pp_i2c_send_bytes(addr, 2, data); - mutex_unlock(&i2c_mutex); - - return retval; -} - -void i2c_init(void) -{ - /* From ipodlinux */ - -#ifdef IPOD_MINI - /* GPIO port C disable port 0x10 */ - GPIOC_ENABLE &= ~0x10; - - /* GPIO port C disable port 0x20 */ - GPIOC_ENABLE &= ~0x20; -#endif - - DEV_EN |= DEV_I2C; /* Enable I2C */ - DEV_RS |= DEV_I2C; /* Start I2C Reset */ - DEV_RS &=~DEV_I2C; /* End I2C Reset */ - - outl(0x0, 0x600060a4); - outl(0x80 | (0 << 8), 0x600060a4); - - mutex_init(&i2c_mutex); - - i2c_readbyte(0x8, 0); -} -- cgit v1.2.3