Adding sensor ports i2c driver

src/drivers/elphel/Makefile

@@ -6,6 +6,7 @@ obj-$(CONFIG_ELPHEL393)           += elphel393-pwr.o
 obj-$(CONFIG_ELPHEL393)           += elphel393-mem.o  
 obj-$(CONFIG_ELPHELDRVONMICROZED) += elphel393-mem.o
 obj-$(CONFIG_ELPHEL393_INIT)      += elphel393-init.o   
-
+obj-$(CONFIG_ELPHEL393)           += x393.o
+obj-$(CONFIG_ELPHEL393)           += sensor_i2c.o
 fpgajtag-y := fpgajtag353.o x393.o 
 obj-$(CONFIG_ELPHEL393_EXTERNAL)  += fpgajtag.o
\ No newline at end of file

src/drivers/elphel/sensor_i2c.h

+/*******************************************************************************
+* FILE NAME  : sensor_i2c.h
+* DESCRIPTION: Interface to FPGA-based i2c sequencer for sensor ports
+* Copyright 2016 (C) Elphel, Inc.
+* -----------------------------------------------------------------------------*
+*
+*  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 3 of the License, or
+*  (at your option) any later version.
+*
+*  This program is distributed in the hope that it will be useful,
+*  but WITHOUT ANY WARRANTY; without even the implied warranty of
+*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+*  GNU General Public License for more details.
+*
+*  You should have received a copy of the GNU General Public License
+*  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*******************************************************************************/
+
+/* Reserve i2c page (1 of 256 for a sensor port)*/
+int i2c_page_alloc(int chn);
+
+/* Free i2c page */
+void i2c_page_free(int chn, int page);
+
+/* Set i2c table entry to raw data (will just overwrite tbl_mode = 2) */
+void set_sensor_i2c_raw(int chn,
+		                int page,   // index in lookup table
+					    u32 data); // Bit delay - number of mclk periods in 1/4 of the SCL period
+
+/* Set i2c table entry for write operation */
+void set_sensor_i2c_wr(int chn,
+		              int page,        // index in lookup table
+					  int sa,          // slave address (7 bit)
+					  int rah,         // High byte of the i2c register address
+					  int num_bytes,   //Number of bytes to write (1..10)
+					  int bit_delay); // Bit delay - number of mclk periods in 1/4 of the SCL period
+
+/* Set i2c table entry for read operation */
+void set_sensor_i2c_rd(int chn,
+		              int page,          // index in lookup table
+					  int two_byte_addr, // Number of address bytes (0 - one byte, 1 - two bytes)
+					  int num_bytes,     // Number of bytes to read (1..8, 0 means 8)
+					  int bit_delay);// Bit delay - number of mclk periods in 1/4 of the SCL period
+/*
+// Write i2c command to the i2c command sequencer
+// I2C command sequencer, block of 16 DWORD slots for absolute frame numbers (modulo 16) and 15 slots for relative ones
+// 0 - ASAP, 1 next frame, 14 -14-th next.
+// Data written depends on context:
+// 1 - I2C register write: index page (MSB), 3 payload bytes. Payload bytes are used according to table and sent
+//     after the slave address and optional high address byte. Other bytes are sent in descending order (LSB- last).
+//     If less than 4 bytes are programmed in the table the high bytes (starting with the one from the table) are
+//     skipped.
+//     If more than 4 bytes are programmed in the table for the page (high byte), one or two next 32-bit words
+//     bypass the index table and all 4 bytes are considered payload ones. If less than 4 extra bytes are to be
+//     sent for such extra word, only the lower bytes are sent.
+//
+// 2 - I2C register read: index page, slave address (8-bit, with lower bit 0) and one or 2 address bytes (as programmed
+//     in the table. Slave address is always in byte 2 (bits 23:16), byte1 (high register address) is skipped if
+//     read address in the table is programmed to be a single-byte one
+ */
+
+/* Write one or multiple DWORDs to i2c relative (modulo16) address. Use offs = 0 for immediate (ASAP) command */
+/* Length of data is determined by the page data already preset */
+int write_sensor_i2c_rel (int chn,
+                          int offs, // 4 bits
+                          u32 * data);
+
+/* Same to absolute (modulo16) address */
+int write_sensor_i2c_abs (int chn,
+			 		      int offs, // 4 bits
+						  u32 * data);
+
+/* Write sensor 16 bit (or 8 bit as programmed in the table) data in immediate mode */
+void  write_sensor_reg16  (int chn,
+		                  int page, // page (8 bits)
+                          int addr, // low 8 bits
+	    				  u32 data); // 16 or 8-bit data (LSB aligned)
+
+/* Initiate sensor i2c read in immediate mode (data itself has to be read from FIFO with read_sensor_i2c_fifo)*/
+void  read_sensor_i2c  (int chn,
+		               int page, // page (8 bits)
+					   int sa7,  // 7-bit i2c slave address
+                       int addr); // 8/16 bit address
+
+/* Read next byte from the channel i2c FIFO. Return byte or -1 if no data available */
+/* Sensor channel status should be in auto update mode (3) */
+int read_sensor_i2c_fifo(int chn);

src/drivers/elphel/x393.c

 /*******************************************************************************
  * File: x393.c
- * Date: 2016-03-29  
+ * Date: 2016-04-06  
  * Author: auto-generated file, see x393_export_c.py
  * Description: Functions definitions to access x393 hardware registers
  *******************************************************************************/
@@ -174,7 +174,7 @@ void                         x393_sens_sync_late                 (x393_sens_sync
 void                         x393_sensio_ctrl                    (x393_sensio_ctl_t d, int sens_num){writel(d.d32, mmio_ptr + (0x1020 + 0x100 * sens_num));} // Configure sensor I/O port
 void                         set_x393_sensio_status_cntrl        (x393_status_ctrl_t d, int sens_num){writel(d.d32, mmio_ptr + (0x1024 + 0x100 * sens_num));} // Set status control for SENSIO module
 x393_status_ctrl_t           get_x393_sensio_status_cntrl        (int sens_num)      { x393_status_ctrl_t d; d.d32 = readl(mmio_ptr + (0x1024 + 0x100 * sens_num)); return d; }
-void                         x393_sensio_jtag                    (x393_sensio_jpag_t d, int sens_num){writel(d.d32, mmio_ptr + (0x1028 + 0x100 * sens_num));} // Programming interface for multiplexer FPGA (with X393_SENSIO_STATUS)
+void                         x393_sensio_jtag                    (x393_sensio_jtag_t d, int sens_num){writel(d.d32, mmio_ptr + (0x1028 + 0x100 * sens_num));} // Programming interface for multiplexer FPGA (with X393_SENSIO_STATUS)
 void                         set_x393_sensio_width               (x393_sensio_width_t d, int sens_num){writel(d.d32, mmio_ptr + (0x102c + 0x100 * sens_num));} // Set sensor line in pixels (0 - use line sync from the sensor)
 x393_sensio_width_t          get_x393_sensio_width               (int sens_num)      { x393_sensio_width_t d; d.d32 = readl(mmio_ptr + (0x102c + 0x100 * sens_num)); return d; }
 void                         set_x393_sensio_tim0                (x393_sensio_tim0_t d, int sens_num){writel(d.d32, mmio_ptr + (0x1030 + 0x100 * sens_num));} // Sensor port i/o timing configuration, register 0

src/drivers/elphel/x393.h

 /*******************************************************************************
  * File: x393.h
- * Date: 2016-03-29  
+ * Date: 2016-04-06  
  * Author: auto-generated file, see x393_export_c.py
  * Description: Constants definitions and functions declarations to access x393 hardware registers
  *******************************************************************************/
 
-//#include "elphel/x393_types.h"
 #include "x393_types.h"
 //#include "elphel/x393_defs.h // alternative variant"
 
@@ -174,7 +173,7 @@ void                         x393_sens_sync_late                 (x393_sens_sync
 void                         x393_sensio_ctrl                    (x393_sensio_ctl_t d, int sens_num);             // Configure sensor I/O port
 void                         set_x393_sensio_status_cntrl        (x393_status_ctrl_t d, int sens_num);            // Set status control for SENSIO module
 x393_status_ctrl_t           get_x393_sensio_status_cntrl        (int sens_num);
-void                         x393_sensio_jtag                    (x393_sensio_jpag_t d, int sens_num);            // Programming interface for multiplexer FPGA (with X393_SENSIO_STATUS)
+void                         x393_sensio_jtag                    (x393_sensio_jtag_t d, int sens_num);            // Programming interface for multiplexer FPGA (with X393_SENSIO_STATUS)
 void                         set_x393_sensio_width               (x393_sensio_width_t d, int sens_num);           // Set sensor line in pixels (0 - use line sync from the sensor)
 x393_sensio_width_t          get_x393_sensio_width               (int sens_num);
 void                         set_x393_sensio_tim0                (x393_sensio_tim0_t d, int sens_num);            // Sensor port i/o timing configuration, register 0
@@ -299,7 +298,6 @@ x393_status_sens_io_t        x393_sensio_status                  (int sens_num);
 #define X393_CMPRS_CBIT_CMODE_MONO1                      0x0000000b // Mono JPEG (not yet implemented)
 #define X393_CMPRS_CBIT_CMODE_MONO4                      0x0000000e // Mono, 4 blocks (2x2 macroblocks)
 #define X393_CMPRS_CBIT_CMODE_JPEG18                     0x00000000 // Color 4:2:0
-#define X393_CMPRS_CBIT_CMODE_JPEG18                     0x00000000 // Color 4:2:0
 #define X393_CMPRS_CBIT_FRAMES_SINGLE                    0x00000000 // Use single-frame buffer
 #define X393_CMPRS_CBIT_FRAMES_MULTI                     0x00000001 // Use multi-frame buffer
 

src/drivers/elphel/x393_defs.h

 /*******************************************************************************
  * File: x393_defs.h
- * Date: 2016-03-29  
+ * Date: 2016-04-06  
  * Author: auto-generated file, see x393_export_c.py
  * Description: Constants and hardware addresses definitions to access x393 hardware registers
  *******************************************************************************/
@@ -136,7 +136,7 @@
 #define X393_SENS_SYNC_LATE(sens_num)                    (0x4000101c + 0x100 * (sens_num)) // Configure frame sync delay, sens_num = 0..3, data type: x393_sens_sync_late_t (wo)
 #define X393_SENSIO_CTRL(sens_num)                       (0x40001020 + 0x100 * (sens_num)) // Configure sensor I/O port, sens_num = 0..3, data type: x393_sensio_ctl_t (wo)
 #define X393_SENSIO_STATUS_CNTRL(sens_num)               (0x40001024 + 0x100 * (sens_num)) // Set status control for SENSIO module, sens_num = 0..3, data type: x393_status_ctrl_t (rw)
-#define X393_SENSIO_JTAG(sens_num)                       (0x40001028 + 0x100 * (sens_num)) // Programming interface for multiplexer FPGA (with X393_SENSIO_STATUS), sens_num = 0..3, data type: x393_sensio_jpag_t (wo)
+#define X393_SENSIO_JTAG(sens_num)                       (0x40001028 + 0x100 * (sens_num)) // Programming interface for multiplexer FPGA (with X393_SENSIO_STATUS), sens_num = 0..3, data type: x393_sensio_jtag_t (wo)
 #define X393_SENSIO_WIDTH(sens_num)                      (0x4000102c + 0x100 * (sens_num)) // Set sensor line in pixels (0 - use line sync from the sensor), sens_num = 0..3, data type: x393_sensio_width_t (rw)
 #define X393_SENSIO_TIM0(sens_num)                       (0x40001030 + 0x100 * (sens_num)) // Sensor port i/o timing configuration, register 0, sens_num = 0..3, data type: x393_sensio_tim0_t (rw)
 #define X393_SENSIO_TIM1(sens_num)                       (0x40001034 + 0x100 * (sens_num)) // Sensor port i/o timing configuration, register 1, sens_num = 0..3, data type: x393_sensio_tim1_t (rw)
@@ -240,7 +240,6 @@
 #define X393_CMPRS_CBIT_CMODE_MONO1                      0x0000000b // Mono JPEG (not yet implemented)
 #define X393_CMPRS_CBIT_CMODE_MONO4                      0x0000000e // Mono, 4 blocks (2x2 macroblocks)
 #define X393_CMPRS_CBIT_CMODE_JPEG18                     0x00000000 // Color 4:2:0
-#define X393_CMPRS_CBIT_CMODE_JPEG18                     0x00000000 // Color 4:2:0
 #define X393_CMPRS_CBIT_FRAMES_SINGLE                    0x00000000 // Use single-frame buffer
 #define X393_CMPRS_CBIT_FRAMES_MULTI                     0x00000001 // Use multi-frame buffer
 

src/drivers/elphel/x393_map.h

 /*******************************************************************************
  * File: x393_map.h
- * Date: 2016-03-29  
+ * Date: 2016-04-06  
  * Author: auto-generated file, see x393_export_c.py
  * Description: Sorted hardware addresses map
  *******************************************************************************/
@@ -189,7 +189,7 @@
 #define X393_SENS_SYNC_LATE__0                           0x4000101c // Configure frame sync delay, data type: x393_sens_sync_late_t (wo)
 #define X393_SENSIO_CTRL__0                              0x40001020 // Configure sensor I/O port, data type: x393_sensio_ctl_t (wo)
 #define X393_SENSIO_STATUS_CNTRL__0                      0x40001024 // Set status control for SENSIO module, data type: x393_status_ctrl_t (rw)
-#define X393_SENSIO_JTAG__0                              0x40001028 // Programming interface for multiplexer FPGA (with X393_SENSIO_STATUS), data type: x393_sensio_jpag_t (wo)
+#define X393_SENSIO_JTAG__0                              0x40001028 // Programming interface for multiplexer FPGA (with X393_SENSIO_STATUS), data type: x393_sensio_jtag_t (wo)
 #define X393_SENSIO_WIDTH__0                             0x4000102c // Set sensor line in pixels (0 - use line sync from the sensor), data type: x393_sensio_width_t (rw)
 #define X393_SENSIO_TIM0__0                              0x40001030 // Sensor port i/o timing configuration, register 0, data type: x393_sensio_tim0_t (rw)
 #define X393_SENSIO_TIM1__0                              0x40001034 // Sensor port i/o timing configuration, register 1, data type: x393_sensio_tim1_t (rw)
@@ -252,7 +252,7 @@
 #define X393_SENS_SYNC_LATE__1                           0x4000111c // Configure frame sync delay, data type: x393_sens_sync_late_t (wo)
 #define X393_SENSIO_CTRL__1                              0x40001120 // Configure sensor I/O port, data type: x393_sensio_ctl_t (wo)
 #define X393_SENSIO_STATUS_CNTRL__1                      0x40001124 // Set status control for SENSIO module, data type: x393_status_ctrl_t (rw)
-#define X393_SENSIO_JTAG__1                              0x40001128 // Programming interface for multiplexer FPGA (with X393_SENSIO_STATUS), data type: x393_sensio_jpag_t (wo)
+#define X393_SENSIO_JTAG__1                              0x40001128 // Programming interface for multiplexer FPGA (with X393_SENSIO_STATUS), data type: x393_sensio_jtag_t (wo)
 #define X393_SENSIO_WIDTH__1                             0x4000112c // Set sensor line in pixels (0 - use line sync from the sensor), data type: x393_sensio_width_t (rw)
 #define X393_SENSIO_TIM0__1                              0x40001130 // Sensor port i/o timing configuration, register 0, data type: x393_sensio_tim0_t (rw)
 #define X393_SENSIO_TIM1__1                              0x40001134 // Sensor port i/o timing configuration, register 1, data type: x393_sensio_tim1_t (rw)
@@ -315,7 +315,7 @@
 #define X393_SENS_SYNC_LATE__2                           0x4000121c // Configure frame sync delay, data type: x393_sens_sync_late_t (wo)
 #define X393_SENSIO_CTRL__2                              0x40001220 // Configure sensor I/O port, data type: x393_sensio_ctl_t (wo)
 #define X393_SENSIO_STATUS_CNTRL__2                      0x40001224 // Set status control for SENSIO module, data type: x393_status_ctrl_t (rw)
-#define X393_SENSIO_JTAG__2                              0x40001228 // Programming interface for multiplexer FPGA (with X393_SENSIO_STATUS), data type: x393_sensio_jpag_t (wo)
+#define X393_SENSIO_JTAG__2                              0x40001228 // Programming interface for multiplexer FPGA (with X393_SENSIO_STATUS), data type: x393_sensio_jtag_t (wo)
 #define X393_SENSIO_WIDTH__2                             0x4000122c // Set sensor line in pixels (0 - use line sync from the sensor), data type: x393_sensio_width_t (rw)
 #define X393_SENSIO_TIM0__2                              0x40001230 // Sensor port i/o timing configuration, register 0, data type: x393_sensio_tim0_t (rw)
 #define X393_SENSIO_TIM1__2                              0x40001234 // Sensor port i/o timing configuration, register 1, data type: x393_sensio_tim1_t (rw)
@@ -378,7 +378,7 @@
 #define X393_SENS_SYNC_LATE__3                           0x4000131c // Configure frame sync delay, data type: x393_sens_sync_late_t (wo)
 #define X393_SENSIO_CTRL__3                              0x40001320 // Configure sensor I/O port, data type: x393_sensio_ctl_t (wo)
 #define X393_SENSIO_STATUS_CNTRL__3                      0x40001324 // Set status control for SENSIO module, data type: x393_status_ctrl_t (rw)
-#define X393_SENSIO_JTAG__3                              0x40001328 // Programming interface for multiplexer FPGA (with X393_SENSIO_STATUS), data type: x393_sensio_jpag_t (wo)
+#define X393_SENSIO_JTAG__3                              0x40001328 // Programming interface for multiplexer FPGA (with X393_SENSIO_STATUS), data type: x393_sensio_jtag_t (wo)
 #define X393_SENSIO_WIDTH__3                             0x4000132c // Set sensor line in pixels (0 - use line sync from the sensor), data type: x393_sensio_width_t (rw)
 #define X393_SENSIO_TIM0__3                              0x40001330 // Sensor port i/o timing configuration, register 0, data type: x393_sensio_tim0_t (rw)
 #define X393_SENSIO_TIM1__3                              0x40001334 // Sensor port i/o timing configuration, register 1, data type: x393_sensio_tim1_t (rw)

src/drivers/elphel/x393_types.h

 /*******************************************************************************
  * File: x393_types.h
- * Date: 2016-03-29  
+ * Date: 2016-04-06  
  * Author: auto-generated file, see x393_export_c.py
  * Description: typedef definitions for the x393 hardware registers
  *******************************************************************************/
@@ -310,7 +310,7 @@ typedef union {
     struct {
           u32   i2c_fifo_dout: 8; // [ 7: 0] (0) I2c byte read from the device through FIFO
           u32 i2c_fifo_nempty: 1; // [    8] (0) I2C read FIFO has data
-          u32  i2c_fifo_cntrl: 1; // [    9] (0) I2C FIFO byte counter (odd/even bytes)
+          u32    i2c_fifo_lsb: 1; // [    9] (0) I2C FIFO byte counter (odd/even bytes)
           u32            busy: 1; // [   10] (0) I2C sequencer busy
           u32        alive_fs: 1; // [   11] (0) Sensor generated frame sync since last status update
           u32       frame_num: 4; // [15:12] (0) I2C sequencer frame number
@@ -382,7 +382,7 @@ typedef union {
 
 typedef union {
     struct {
-          u32        tbl_addr: 8; // [ 7: 0] (0) Address/length in 64-bit words (<<3 to get byte address
+          u32        tbl_addr: 8; // [ 7: 0] (0) Address/length in 64-bit words (<<3 to get byte address)
           u32                :20;
           u32        tbl_mode: 2; // [29:28] (3) Should be 3 to select table address write mode
           u32                : 2;
@@ -411,7 +411,9 @@ typedef union {
           u32     sda_release: 1; // [    1] (0) Release SDA early if next bit ==1 (valid with drive_ctl)
           u32       drive_ctl: 1; // [    2] (0) 0 - nop, 1 - set sda_release and sda_drive_high
           u32    next_fifo_rd: 1; // [    3] (0) Advance I2C read FIFO pointer
-          u32                : 8;
+          u32        soft_scl: 2; // [ 5: 4] (0) Control SCL pin (when stopped): 0 - nop, 1 - low, 2 - high (driven), 3 - float 
+          u32        soft_sda: 2; // [ 7: 6] (0) Control SDA pin (when stopped): 0 - nop, 1 - low, 2 - high (driven), 3 - float 
+          u32                : 4;
           u32         cmd_run: 2; // [13:12] (0) Sequencer run/stop control: 0,1 - nop, 2 - stop, 3 - run 
           u32           reset: 1; // [   14] (0) Sequencer reset all FIFO (takes 16 clock pulses), also - stops i2c until run command
           u32                :13;
@@ -664,7 +666,7 @@ typedef union {
     struct {
           u32             d32:32; // [31: 0] (0) cast to u32
     }; 
-} x393_sensio_jpag_t; 
+} x393_sensio_jtag_t; 
 
 // Sensor i/o timing register 0 (different meanings for different sensor types)