From b89d6cc5e4eb29d54d9b64b9374c4cb3208d0d66 Mon Sep 17 00:00:00 2001 From: Christian Mauderer Date: Mon, 24 Jun 2019 22:16:59 +0200 Subject: bsp/beagle: Partial re-write of I2C driver. The old driver worked well for EEPROMS with the RTEMS EEPROM driver. But it had problems with a lot of other situations. Although it's not a direct port, the new driver is heavily modeled after the FreeBSD ti_i2c driver. Closes #3764. --- bsps/arm/beagle/include/bsp/i2c.h | 84 +-------------------------------------- 1 file changed, 2 insertions(+), 82 deletions(-) (limited to 'bsps/arm/beagle/include/bsp/i2c.h') diff --git a/bsps/arm/beagle/include/bsp/i2c.h b/bsps/arm/beagle/include/bsp/i2c.h index 3ada3c4b0d..9d253406bf 100644 --- a/bsps/arm/beagle/include/bsp/i2c.h +++ b/bsps/arm/beagle/include/bsp/i2c.h @@ -24,76 +24,15 @@ #define LIBBSP_ARM_BEAGLE_I2C_H #include -#include #include +#include #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ - -/* I2C Configuration Register (I2C_CON): */ - -#define BBB_I2C_CON_EN (1 << 15) /* I2C module enable */ -#define BBB_I2C_CON_BE (1 << 14) /* Big endian mode */ -#define BBB_I2C_CON_STB (1 << 11) /* Start byte mode (master mode only) */ -#define BBB_I2C_CON_MST (1 << 10) /* Master/slave mode */ -#define BBB_I2C_CON_TRX (1 << 9) /* Transmitter/receiver mode */ - /* (master mode only) */ -#define BBB_I2C_CON_XA (1 << 8) /* Expand address */ -#define BBB_I2C_CON_STP (1 << 1) /* Stop condition (master mode only) */ -#define BBB_I2C_CON_STT (1 << 0) /* Start condition (master mode only) */ -#define BBB_I2C_CON_CLR 0x0 /* Clear configuration register */ -/* I2C Status Register (I2C_STAT): */ - -#define BBB_I2C_STAT_SBD (1 << 15) /* Single byte data */ -#define BBB_I2C_STAT_BB (1 << 12) /* Bus busy */ -#define BBB_I2C_STAT_ROVR (1 << 11) /* Receive overrun */ -#define BBB_I2C_STAT_XUDF (1 << 10) /* Transmit underflow */ -#define BBB_I2C_STAT_AAS (1 << 9) /* Address as slave */ -#define BBB_I2C_STAT_GC (1 << 5) -#define BBB_I2C_STAT_XRDY (1 << 4) /* Transmit data ready */ -#define BBB_I2C_STAT_RRDY (1 << 3) /* Receive data ready */ -#define BBB_I2C_STAT_ARDY (1 << 2) /* Register access ready */ -#define BBB_I2C_STAT_NACK (1 << 1) /* No acknowledgment interrupt enable */ -#define BBB_I2C_STAT_AL (1 << 0) /* Arbitration lost interrupt enable */ - -/* I2C Interrupt Enable Register (I2C_IE): */ -#define BBB_I2C_IE_GC_IE (1 << 5) -#define BBB_I2C_IE_XRDY_IE (1 << 4) /* Transmit data ready interrupt enable */ -#define BBB_I2C_IE_RRDY_IE (1 << 3) /* Receive data ready interrupt enable */ -#define BBB_I2C_IE_ARDY_IE (1 << 2) /* Register access ready interrupt enable */ -#define BBB_I2C_IE_NACK_IE (1 << 1) /* No acknowledgment interrupt enable */ -#define BBB_I2C_IE_AL_IE (1 << 0) /* Arbitration lost interrupt enable */ - -/* I2C SYSC Register (I2C_SYSC): */ -#define BBB_I2C_SYSC_SRST (1 << 1) - -#define BBB_I2C_TIMEOUT 1000 - -#define BBB_I2C_SYSS_RDONE (1 << 0) /* Internel reset monitoring */ - -#define BBB_CONFIG_SYS_I2C_SPEED 100000 -#define BBB_CONFIG_SYS_I2C_SLAVE 1 -#define BBB_I2C_ALL_FLAGS 0x7FFF -#define BBB_I2C_ALL_IRQ_FLAGS 0xFFFF - #define BBB_I2C_SYSCLK 48000000 #define BBB_I2C_INTERNAL_CLK 12000000 -#define BBB_I2C_SPEED_CLK 100000 - -#define BBB_I2C_IRQ_ERROR \ - ( AM335X_I2C_IRQSTATUS_NACK \ - | AM335X_I2C_IRQSTATUS_ROVR \ - | AM335X_I2C_IRQSTATUS_AL \ - | AM335X_I2C_IRQSTATUS_ARDY \ - | AM335X_I2C_IRQSTATUS_RRDY \ - | AM335X_I2C_IRQSTATUS_XRDY \ - | AM335X_I2C_IRQSTATUS_XUDF ) - -#define BBB_I2C_IRQ_USED \ - ( AM335X_I2C_IRQSTATUS_ARDY \ - | AM335X_I2C_IRQSTATUS_XRDY ) #define BBB_I2C_0_BUS_PATH "/dev/i2c-0" #define BBB_I2C_1_BUS_PATH "/dev/i2c-1" @@ -103,9 +42,6 @@ extern "C" { #define BBB_I2C1_IRQ 71 #define BBB_I2C2_IRQ 30 -#define BBB_MODE2 2 -#define BBB_MODE3 3 - typedef enum { I2C0, I2C1, @@ -151,26 +87,10 @@ typedef struct i2c_regs { uint32_t BBB_I2C_SBLOCK; } bbb_i2c_regs; -typedef struct bbb_i2c_bus { - i2c_bus base; - volatile bbb_i2c_regs *regs; - i2c_msg *msgs; - uint32_t msg_todo; - uint32_t current_msg_todo; - uint8_t *current_msg_byte; - uint32_t current_todo; - bool read; - bool hold; - rtems_id task_id; - rtems_vector_number irq; - uint32_t input_clock; - uint32_t already_transferred; -} bbb_i2c_bus; - int am335x_i2c_bus_register( const char *bus_path, uintptr_t register_base, - uint32_t input_clock, + uint32_t input_clock, /* FIXME: Unused. Left for compatibility. */ rtems_vector_number irq ); -- cgit v1.2.3