From adc349891e03c6288f1434351b2cd640356580e3 Mon Sep 17 00:00:00 2001 From: Barry Wardell Date: Sat, 27 Jan 2007 15:20:30 +0000 Subject: Clean up PP5002 I2C code (no functional changes): Move into target tree. Use #defines instead of inb/outb. Also restore comments in PP5020 I2C code. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12124 a1c6a512-1295-4272-9138-f99709370657 --- firmware/SOURCES | 2 +- firmware/drivers/i2c-pp5002.c | 178 --------------------------------------- firmware/export/i2c-pp5002.h | 11 +++ firmware/export/pp5002.h | 3 + firmware/target/arm/i2c-pp5002.c | 157 ++++++++++++++++++++++++++++++++++ firmware/target/arm/i2c-pp5020.c | 6 +- 6 files changed, 175 insertions(+), 182 deletions(-) delete mode 100644 firmware/drivers/i2c-pp5002.c create mode 100644 firmware/target/arm/i2c-pp5002.c (limited to 'firmware') diff --git a/firmware/SOURCES b/firmware/SOURCES index e393dc1678..00fbc74b67 100644 --- a/firmware/SOURCES +++ b/firmware/SOURCES @@ -257,7 +257,7 @@ target/arm/memset16-arm.S #if CONFIG_I2C == I2C_PP5020 target/arm/i2c-pp5020.c #elif CONFIG_I2C == I2C_PP5002 -drivers/i2c-pp5002.c +target/arm/i2c-pp5002.c #elif CONFIG_I2C == I2C_PNX0101 drivers/i2c-pnx0101.c #elif CONFIG_I2C == I2C_S3C2440 diff --git a/firmware/drivers/i2c-pp5002.c b/firmware/drivers/i2c-pp5002.c deleted file mode 100644 index 7cb37f6090..0000000000 --- a/firmware/drivers/i2c-pp5002.c +++ /dev/null @@ -1,178 +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 IPOD_I2C_BASE 0xc0008000 -#define IPOD_I2C_CTRL (IPOD_I2C_BASE+0x00) -#define IPOD_I2C_ADDR (IPOD_I2C_BASE+0x04) -#define IPOD_I2C_DATA0 (IPOD_I2C_BASE+0x0c) -#define IPOD_I2C_DATA1 (IPOD_I2C_BASE+0x10) -#define IPOD_I2C_DATA2 (IPOD_I2C_BASE+0x14) -#define IPOD_I2C_DATA3 (IPOD_I2C_BASE+0x18) -#define IPOD_I2C_STATUS (IPOD_I2C_BASE+0x1c) - -/* IPOD_I2C_CTRL bit definitions */ -#define IPOD_I2C_SEND 0x80 - -/* IPOD_I2C_STATUS bit definitions */ -#define IPOD_I2C_BUSY (1<<6) - -#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 (!(inb(IPOD_I2C_STATUS) & IPOD_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 */ - outb(((addr << 17) >> 16) | 0x1, IPOD_I2C_ADDR); - - outb(inb(IPOD_I2C_CTRL) | 0x20, IPOD_I2C_CTRL); - - outb(inb(IPOD_I2C_CTRL) | IPOD_I2C_SEND, IPOD_I2C_CTRL); - - if (pp_i2c_wait_not_busy() < 0) - { - return -1; - } - - if (data) - { - *data = inb(IPOD_I2C_DATA0); - } - - return 0; -} - -int pp_i2c_send_bytes(unsigned int addr, unsigned int len, unsigned char *data) -{ - int data_addr; - 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 */ - outb((addr << 17) >> 16, IPOD_I2C_ADDR); - - outb(inb(IPOD_I2C_CTRL) & ~0x20, IPOD_I2C_CTRL); - - data_addr = IPOD_I2C_DATA0; - for ( i = 0; i < len; i++ ) - { - outb(*data++, data_addr); - data_addr += 4; - } - - outb((inb(IPOD_I2C_CTRL) & ~0x26) | ((len-1) << 1), IPOD_I2C_CTRL); - - outb(inb(IPOD_I2C_CTRL) | IPOD_I2C_SEND, IPOD_I2C_CTRL); - - 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) -{ - /* From ipodlinux */ - - outl(inl(0xcf005000) | 0x2, 0xcf005000); - - outl(inl(0xcf005030) | (1<<8), 0xcf005030); - outl(inl(0xcf005030) & ~(1<<8), 0xcf005030); -} diff --git a/firmware/export/i2c-pp5002.h b/firmware/export/i2c-pp5002.h index 68c0dda8f7..58324035a5 100644 --- a/firmware/export/i2c-pp5002.h +++ b/firmware/export/i2c-pp5002.h @@ -25,6 +25,17 @@ #ifndef _I2C_PP5002_H #define _I2C_PP5002_H +#define I2C_CTRL (*(volatile unsigned char*)(I2C_BASE+0x00)) +#define I2C_ADDR (*(volatile unsigned char*)(I2C_BASE+0x04)) +#define I2C_DATA(X) (*(volatile unsigned char*)(I2C_BASE+0xc+(4*X))) +#define I2C_STATUS (*(volatile unsigned char*)(I2C_BASE+0x1c)) + +/* I2C_CTRL bit definitions */ +#define I2C_SEND 0x80 + +/* I2C_STATUS bit definitions */ +#define I2C_BUSY (1<<6) + /* TODO: Fully implement i2c driver */ void i2c_init(void); diff --git a/firmware/export/pp5002.h b/firmware/export/pp5002.h index b1bc6f4d01..41e8f4cce2 100644 --- a/firmware/export/pp5002.h +++ b/firmware/export/pp5002.h @@ -59,6 +59,7 @@ #define DEV_RS (*(volatile unsigned long *)( 0xcf005030)) #define DEV_EN (*(volatile unsigned long *)( 0xcf005000)) +#define DEV_I2C (1<<8) #define DEV_USB 0x400000 #define DEV_INIT (*(volatile unsigned long *)(0x70000020)) @@ -78,6 +79,8 @@ #define IISFIFO_WR (*(volatile unsigned long*)(0xc0002540)) #define IISFIFO_RD (*(volatile unsigned long*)(0xc0002580)) +#define I2C_BASE 0xc0008000 + #define TIMER1_CFG (*(volatile unsigned long *)(0xcf001100)) #define TIMER1_VAL (*(volatile unsigned long *)(0xcf001104)) #define TIMER2_CFG (*(volatile unsigned long *)(0xcf001108)) diff --git a/firmware/target/arm/i2c-pp5002.c b/firmware/target/arm/i2c-pp5002.c new file mode 100644 index 0000000000..ad6d50721d --- /dev/null +++ b/firmware/target/arm/i2c-pp5002.c @@ -0,0 +1,157 @@ +/*************************************************************************** + * __________ __ ___. + * 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 index 95a677ea01..ebd0318f0b 100644 --- a/firmware/target/arm/i2c-pp5020.c +++ b/firmware/target/arm/i2c-pp5020.c @@ -185,9 +185,9 @@ void i2c_init(void) GPIOC_ENABLE &= ~0x20; #endif - DEV_EN |= DEV_I2C; - DEV_RS |= DEV_I2C; - DEV_RS &=~DEV_I2C; + 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); -- cgit v1.2.3