summaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-mxc/include/mach/mx31.h
diff options
context:
space:
mode:
authorUwe Kleine-König2010-06-16 18:03:05 +0200
committerUwe Kleine-König2010-06-30 09:00:43 +0200
commit4a9b8b0b061ef750b5ef31d1e9d2fa0206731f2f (patch)
treed6128f7116c4cefdb801897c6febe5e1297a1228 /arch/arm/plat-mxc/include/mach/mx31.h
parentARM: imx: dynamically register imx-i2c devices (imx27) (diff)
downloadkernel-qcow2-linux-4a9b8b0b061ef750b5ef31d1e9d2fa0206731f2f.tar.gz
kernel-qcow2-linux-4a9b8b0b061ef750b5ef31d1e9d2fa0206731f2f.tar.xz
kernel-qcow2-linux-4a9b8b0b061ef750b5ef31d1e9d2fa0206731f2f.zip
ARM: imx: dynamically register imx-i2c devices (imx31)
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Diffstat (limited to 'arch/arm/plat-mxc/include/mach/mx31.h')
-rw-r--r--arch/arm/plat-mxc/include/mach/mx31.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/plat-mxc/include/mach/mx31.h b/arch/arm/plat-mxc/include/mach/mx31.h
index fb90e119c2b5..afee3ab9d62e 100644
--- a/arch/arm/plat-mxc/include/mach/mx31.h
+++ b/arch/arm/plat-mxc/include/mach/mx31.h
@@ -23,7 +23,7 @@
#define MX31_ETB_SLOT4_BASE_ADDR (MX31_AIPS1_BASE_ADDR + 0x10000)
#define MX31_ETB_SLOT5_BASE_ADDR (MX31_AIPS1_BASE_ADDR + 0x14000)
#define MX31_ECT_CTIO_BASE_ADDR (MX31_AIPS1_BASE_ADDR + 0x18000)
-#define MX31_I2C_BASE_ADDR (MX31_AIPS1_BASE_ADDR + 0x80000)
+#define MX31_I2C1_BASE_ADDR (MX31_AIPS1_BASE_ADDR + 0x80000)
#define MX31_I2C3_BASE_ADDR (MX31_AIPS1_BASE_ADDR + 0x84000)
#define MX31_OTG_BASE_ADDR (MX31_AIPS1_BASE_ADDR + 0x88000)
#define MX31_ATA_BASE_ADDR (MX31_AIPS1_BASE_ADDR + 0x8c000)
@@ -145,7 +145,7 @@ static inline void mx31_setup_weimcs(size_t cs,
#define MX31_INT_FIRI 7
#define MX31_INT_MMC_SDHC2 8
#define MX31_INT_MMC_SDHC1 9
-#define MX31_INT_I2C 10
+#define MX31_INT_I2C1 10
#define MX31_INT_SSI2 11
#define MX31_INT_SSI1 12
#define MX31_INT_CSPI2 13