i2c: initial bus drivers for am335x and dm37xx

Change-Id: I478704fbf30dbf6d3382bcbfb11e75b512c032a1

lib/libc/sys-minix/ioctl.c

@@ -3,20 +3,91 @@
 #include <lib.h>
 
 #include <sys/ioctl.h>
+#include <minix/i2c.h>
 
 #ifdef __weak_alias
 __weak_alias(ioctl, _ioctl)
 #endif
 
+static void rewrite_i2c_netbsd_to_minix(minix_i2c_ioctl_exec_t *out,
+    i2c_ioctl_exec_t *in);
+static void rewrite_i2c_minix_to_netbsd(i2c_ioctl_exec_t *out,
+    minix_i2c_ioctl_exec_t *in);
+
+static void rewrite_i2c_netbsd_to_minix(minix_i2c_ioctl_exec_t *out,
+	i2c_ioctl_exec_t *in)
+{
+  memset(out, '\0', sizeof(minix_i2c_ioctl_exec_t));
+
+  out->iie_op = in->iie_op;
+  out->iie_addr = in->iie_addr;
+  out->iie_cmdlen = I2C_EXEC_MAX_CMDLEN < in->iie_cmdlen ?
+  	I2C_EXEC_MAX_CMDLEN : in->iie_cmdlen;
+  out->iie_buflen = I2C_EXEC_MAX_BUFLEN < in->iie_buflen ?
+  	I2C_EXEC_MAX_BUFLEN : in->iie_buflen;
+
+  if (in->iie_cmdlen > 0 && in->iie_cmd != NULL) {
+	memcpy(out->iie_cmd, in->iie_cmd, in->iie_cmdlen);
+  }
+
+  if (in->iie_buflen > 0 && in->iie_buf != NULL) {
+	memcpy(out->iie_buf, in->iie_buf, in->iie_buflen);
+  }
+}
+
+static void rewrite_i2c_minix_to_netbsd(i2c_ioctl_exec_t *out,
+	minix_i2c_ioctl_exec_t *in)
+{
+  /* the only field that changes is iie_buf, everything else is the same */
+  if (in->iie_buflen > 0 && in->iie_buf != NULL) {
+	memcpy(out->iie_buf, in->iie_buf, in->iie_buflen);
+  }
+}
+
 int ioctl(fd, request, data)
 int fd;
 int request;
 void *data;
 {
+  int r, request_save;
   message m;
+  void *addr;
+
+  /*
+   * To support compatibility with interfaces on other systems, certain
+   * requests are re-written to flat structures (i.e. without pointers).
+   */
+  minix_i2c_ioctl_exec_t i2c;
+
+  request_save = request;
+
+  switch (request) {
+	case I2C_IOCTL_EXEC:
+		rewrite_i2c_netbsd_to_minix(&i2c, data);
+		addr = (void *) &i2c;
+		request = MINIX_I2C_IOCTL_EXEC;
+		break;
+	default:
+		/* Keep original as-is */
+		addr = (void *) data;
+		break;
+  }
 
   m.TTY_LINE = fd;
   m.TTY_REQUEST = request;
-  m.ADDRESS = (char *) data;
-  return(_syscall(VFS_PROC_NR, IOCTL, &m));
+  m.ADDRESS = (char *) addr;
+
+  r = _syscall(VFS_PROC_NR, IOCTL, &m);
+
+  /* Translate back to original form */
+  switch (request_save) {
+	case I2C_IOCTL_EXEC:
+		rewrite_i2c_minix_to_netbsd(data, &i2c);
+		break;
+	default:
+		/* Nothing to do */
+		break;
+  }
+
+  return r;
 }

lib/libclkconf/clkconf.c

@@ -24,7 +24,12 @@ static struct log log = {
 	.log_func = default_log
 };
 
+#ifdef DM37XX
 #define CM_BASE 0x48004000
+#elif AM335X
+#define CM_BASE 0x44E00000
+#endif
+
 static u32_t base = 0;
 static u32_t use_count = 0;
 

lib/libpadconf/padconf.c

@@ -65,7 +65,7 @@ padconf_init()
 int
 padconf_set(u32_t padconf, u32_t mask, u32_t value)
 {
-	assert(padconf <= CONTROL_PADCONF_ETK_D14);
+	assert(padconf <= CONTROL_CONF_USB1_DRVVBUS);
 	set32(base + padconf, mask, value);
 	return OK;
 }