i2c, davinci: move i2c_defs.h to the drivers/i2c directory

This patch moves the davinci i2c_defs.h file to drivers.i2c directory.
It will allow to reuse the davinci_i2c driver for TI Keystone2 SOCs.

Not used "git mv" command to move the file because small part of
it with definitions specific for Davinci SOCs has to remain in the
arch/arm/include/asm/arch-davinci.

Signed-off-by: Vitaly Andrianov <vitalya@ti.com>
Signed-off-by: Murali Karicheri <m-karicheri2@ti.com>
Acked-by: Tom Rini <trini@ti.com>

diff --git a/arch/arm/include/asm/arch-davinci/i2c_defs.h b/arch/arm/include/asm/arch-davinci/i2c_defs.h
index c388dc002460a159a33681af91c7f9f564827644..06da8947b48cae8f49592dbb7031dd3483076eb8 100644 (file)
--- a/arch/arm/include/asm/arch-davinci/i2c_defs.h
+++ b/arch/arm/include/asm/arch-davinci/i2c_defs.h
@@ -1,16 +1,13 @@
 /*
- * (C) Copyright 2004
+ * (C) Copyright 2004-2014
  * Texas Instruments, <www.ti.com>
  *
  * Some changes copyright (C) 2007 Sergey Kubushyn <ksi@koi8.net>
  *
  * SPDX-License-Identifier:    GPL-2.0+
  */
-#ifndef _DAVINCI_I2C_H_
-#define _DAVINCI_I2C_H_
-
-#define I2C_WRITE              0
-#define I2C_READ               1
+#ifndef _I2C_DEFS_H_
+#define _I2C_DEFS_H_
 
 #ifndef CONFIG_SOC_DA8XX
 #define I2C_BASE               0x01c21000
@@ -18,66 +15,4 @@
 #define I2C_BASE               0x01c22000
 #endif
 
-#define        I2C_OA                  (I2C_BASE + 0x00)
-#define I2C_IE                 (I2C_BASE + 0x04)
-#define I2C_STAT               (I2C_BASE + 0x08)
-#define I2C_SCLL               (I2C_BASE + 0x0c)
-#define I2C_SCLH               (I2C_BASE + 0x10)
-#define I2C_CNT                        (I2C_BASE + 0x14)
-#define I2C_DRR                        (I2C_BASE + 0x18)
-#define I2C_SA                 (I2C_BASE + 0x1c)
-#define I2C_DXR                        (I2C_BASE + 0x20)
-#define I2C_CON                        (I2C_BASE + 0x24)
-#define I2C_IV                 (I2C_BASE + 0x28)
-#define I2C_PSC                        (I2C_BASE + 0x30)
-
-/* I2C masks */
-
-/* I2C Interrupt Enable Register (I2C_IE): */
-#define I2C_IE_SCD_IE  (1 << 5)        /* Stop condition detect interrupt enable */
-#define I2C_IE_XRDY_IE (1 << 4)        /* Transmit data ready interrupt enable */
-#define I2C_IE_RRDY_IE (1 << 3)        /* Receive data ready interrupt enable */
-#define I2C_IE_ARDY_IE (1 << 2)        /* Register access ready interrupt enable */
-#define I2C_IE_NACK_IE (1 << 1)        /* No acknowledgment interrupt enable */
-#define I2C_IE_AL_IE   (1 << 0)        /* Arbitration lost interrupt enable */
-
-/* I2C Status Register (I2C_STAT): */
-
-#define I2C_STAT_BB    (1 << 12)       /* Bus busy */
-#define I2C_STAT_ROVR  (1 << 11)       /* Receive overrun */
-#define I2C_STAT_XUDF  (1 << 10)       /* Transmit underflow */
-#define I2C_STAT_AAS   (1 << 9)        /* Address as slave */
-#define I2C_STAT_SCD   (1 << 5)        /* Stop condition detect */
-#define I2C_STAT_XRDY  (1 << 4)        /* Transmit data ready */
-#define I2C_STAT_RRDY  (1 << 3)        /* Receive data ready */
-#define I2C_STAT_ARDY  (1 << 2)        /* Register access ready */
-#define I2C_STAT_NACK  (1 << 1)        /* No acknowledgment interrupt enable */
-#define I2C_STAT_AL    (1 << 0)        /* Arbitration lost interrupt enable */
-
-
-/* I2C Interrupt Code Register (I2C_INTCODE): */
-
-#define I2C_INTCODE_MASK       7
-#define I2C_INTCODE_NONE       0
-#define I2C_INTCODE_AL         1       /* Arbitration lost */
-#define I2C_INTCODE_NAK                2       /* No acknowledgement/general call */
-#define I2C_INTCODE_ARDY       3       /* Register access ready */
-#define I2C_INTCODE_RRDY       4       /* Rcv data ready */
-#define I2C_INTCODE_XRDY       5       /* Xmit data ready */
-#define I2C_INTCODE_SCD                6       /* Stop condition detect */
-
-
-/* I2C Configuration Register (I2C_CON): */
-
-#define I2C_CON_EN     (1 << 5)        /* I2C module enable */
-#define I2C_CON_STB    (1 << 4)        /* Start byte mode (master mode only) */
-#define I2C_CON_MST    (1 << 10)       /* Master/slave mode */
-#define I2C_CON_TRX    (1 << 9)        /* Transmitter/receiver mode (master mode only) */
-#define I2C_CON_XA     (1 << 8)        /* Expand address */
-#define I2C_CON_STP    (1 << 11)       /* Stop condition (master mode only) */
-#define I2C_CON_STT    (1 << 13)       /* Start condition (master mode only) */
-#define I2C_CON_FREE   (1 << 14)       /* Free run on emulation */
-
-#define I2C_TIMEOUT    0xffff0000      /* Timeout mask for poll_i2c_irq() */
-
 #endif

diff --git a/drivers/i2c/davinci_i2c.c b/drivers/i2c/davinci_i2c.c
index e56fe75b15ce653730828fe7618b190fc092c53a..6e5260c4825ea79664d0b26c73bcdaff8321919d 100644 (file)
--- a/drivers/i2c/davinci_i2c.c
+++ b/drivers/i2c/davinci_i2c.c
@@ -12,6 +12,7 @@
 #include <i2c.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/i2c_defs.h>
+#include "davinci_i2c.h"
 
 #define CHECK_NACK() \
        do {\

diff --git a/drivers/i2c/davinci_i2c.h b/drivers/i2c/davinci_i2c.h
new file mode 100644 (file)
index 0000000..79ff7a3
--- /dev/null
+++ b/drivers/i2c/davinci_i2c.h
@@ -0,0 +1,75 @@
+/*
+ * (C) Copyright 2004-2014
+ * Texas Instruments, <www.ti.com>
+ *
+ * Some changes copyright (C) 2007 Sergey Kubushyn <ksi@koi8.net>
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+#ifndef _DAVINCI_I2C_H_
+#define _DAVINCI_I2C_H_
+
+#define I2C_WRITE              0
+#define I2C_READ               1
+
+#define        I2C_OA                  (I2C_BASE + 0x00)
+#define I2C_IE                 (I2C_BASE + 0x04)
+#define I2C_STAT               (I2C_BASE + 0x08)
+#define I2C_SCLL               (I2C_BASE + 0x0c)
+#define I2C_SCLH               (I2C_BASE + 0x10)
+#define I2C_CNT                        (I2C_BASE + 0x14)
+#define I2C_DRR                        (I2C_BASE + 0x18)
+#define I2C_SA                 (I2C_BASE + 0x1c)
+#define I2C_DXR                        (I2C_BASE + 0x20)
+#define I2C_CON                        (I2C_BASE + 0x24)
+#define I2C_IV                 (I2C_BASE + 0x28)
+#define I2C_PSC                        (I2C_BASE + 0x30)
+
+/* I2C masks */
+
+/* I2C Interrupt Enable Register (I2C_IE): */
+#define I2C_IE_SCD_IE  (1 << 5)  /* Stop condition detect interrupt enable */
+#define I2C_IE_XRDY_IE (1 << 4)  /* Transmit data ready interrupt enable */
+#define I2C_IE_RRDY_IE (1 << 3)  /* Receive data ready interrupt enable */
+#define I2C_IE_ARDY_IE (1 << 2)  /* Register access ready interrupt enable */
+#define I2C_IE_NACK_IE (1 << 1)  /* No acknowledgment interrupt enable */
+#define I2C_IE_AL_IE   (1 << 0)  /* Arbitration lost interrupt enable */
+
+/* I2C Status Register (I2C_STAT): */
+
+#define I2C_STAT_BB    (1 << 12) /* Bus busy */
+#define I2C_STAT_ROVR  (1 << 11) /* Receive overrun */
+#define I2C_STAT_XUDF  (1 << 10) /* Transmit underflow */
+#define I2C_STAT_AAS   (1 << 9)  /* Address as slave */
+#define I2C_STAT_SCD   (1 << 5)  /* Stop condition detect */
+#define I2C_STAT_XRDY  (1 << 4)  /* Transmit data ready */
+#define I2C_STAT_RRDY  (1 << 3)  /* Receive data ready */
+#define I2C_STAT_ARDY  (1 << 2)  /* Register access ready */
+#define I2C_STAT_NACK  (1 << 1)  /* No acknowledgment interrupt enable */
+#define I2C_STAT_AL    (1 << 0)  /* Arbitration lost interrupt enable */
+
+/* I2C Interrupt Code Register (I2C_INTCODE): */
+
+#define I2C_INTCODE_MASK       7
+#define I2C_INTCODE_NONE       0
+#define I2C_INTCODE_AL         1 /* Arbitration lost */
+#define I2C_INTCODE_NAK                2 /* No acknowledgement/general call */
+#define I2C_INTCODE_ARDY       3 /* Register access ready */
+#define I2C_INTCODE_RRDY       4 /* Rcv data ready */
+#define I2C_INTCODE_XRDY       5 /* Xmit data ready */
+#define I2C_INTCODE_SCD                6 /* Stop condition detect */
+
+/* I2C Configuration Register (I2C_CON): */
+
+#define I2C_CON_EN     (1 << 5)   /* I2C module enable */
+#define I2C_CON_STB    (1 << 4)   /* Start byte mode (master mode only) */
+#define I2C_CON_MST    (1 << 10)  /* Master/slave mode */
+#define I2C_CON_TRX    (1 << 9)   /* Tx/Rx mode (master mode only) */
+#define I2C_CON_XA     (1 << 8)   /* Expand address */
+#define I2C_CON_STP    (1 << 11)  /* Stop condition (master mode only) */
+#define I2C_CON_STT    (1 << 13)  /* Start condition (master mode only) */
+#define I2C_CON_FREE   (1 << 14)  /* Free run on emulation */
+
+#define I2C_TIMEOUT    0xffff0000 /* Timeout mask for poll_i2c_irq() */
+
+#endif