karo: fdt: fix panel-dpi support

[karo-tx-uboot.git] / arch / arm / include / asm / arch-mx27 / imx-regs.h

diff --git a/arch/arm/include/asm/arch-mx27/imx-regs.h b/arch/arm/include/asm/arch-mx27/imx-regs.h
index a27145ba28820436c481f1a04c03657d2c09f467..baf1d29cc3ecefc2ce0831f53da8c39bf1fed813 100644 (file)
--- a/arch/arm/include/asm/arch-mx27/imx-regs.h
+++ b/arch/arm/include/asm/arch-mx27/imx-regs.h
@@ -138,16 +138,6 @@ struct gpt_regs {
        u32 gpt_tstat;
 };
 
-/*
- *  GPIO Module and I/O Multiplexer
- */
-#define PORTA 0
-#define PORTB 1
-#define PORTC 2
-#define PORTD 3
-#define PORTE 4
-#define PORTF 5
-
 /* IIM Control Registers */
 struct iim_regs {
        u32 iim_stat;
@@ -169,7 +159,7 @@ struct iim_regs {
        struct fuse_bank {
                u32 fuse_regs[0x20];
                u32 fuse_rsvd[0xe0];
-       } bank[1];
+       } bank[2];
 };
 
 struct fuse_bank0_regs {
@@ -194,13 +184,13 @@ struct fuse_bank0_regs {
 #define UART2_BASE             (0x0b000 + IMX_IO_BASE)
 #define UART3_BASE             (0x0c000 + IMX_IO_BASE)
 #define UART4_BASE             (0x0d000 + IMX_IO_BASE)
-#define IMX_I2C1_BASE          (0x12000 + IMX_IO_BASE)
+#define I2C1_BASE_ADDR         (0x12000 + IMX_IO_BASE)
 #define IMX_GPIO_BASE          (0x15000 + IMX_IO_BASE)
 #define IMX_TIM4_BASE          (0x19000 + IMX_IO_BASE)
 #define IMX_TIM5_BASE          (0x1a000 + IMX_IO_BASE)
 #define IMX_UART5_BASE         (0x1b000 + IMX_IO_BASE)
 #define IMX_UART6_BASE         (0x1c000 + IMX_IO_BASE)
-#define IMX_I2C2_BASE          (0x1D000 + IMX_IO_BASE)
+#define I2C2_BASE_ADDR         (0x1D000 + IMX_IO_BASE)
 #define IMX_TIM6_BASE          (0x1f000 + IMX_IO_BASE)
 #define IMX_AIPI2_BASE         (0x20000 + IMX_IO_BASE)
 #define IMX_PLL_BASE           (0x27000 + IMX_IO_BASE)
@@ -209,9 +199,13 @@ struct fuse_bank0_regs {
 #define IIM_BASE_ADDR          IMX_IIM_BASE
 #define IMX_FEC_BASE           (0x2b000 + IMX_IO_BASE)
 
+#define IMX_NFC_BASE           (0xD8000000)
 #define IMX_ESD_BASE           (0xD8001000)
 #define IMX_WEIM_BASE          (0xD8002000)
 
+#define NFC_BASE_ADDR          IMX_NFC_BASE
+
+
 /* FMCR System Control bit definition*/
 #define UART4_RXD_CTL  (1 << 25)
 #define UART4_RTS_CTL  (1 << 24)
@@ -445,18 +439,6 @@ struct fuse_bank0_regs {
 #define GPIO5_BASE_ADDR 0x10015400
 #define GPIO6_BASE_ADDR 0x10015500
 
-#define GPIO_PIN_MASK  0x1f
-
-#define GPIO_PORT_SHIFT        5
-#define GPIO_PORT_MASK (0x7 << GPIO_PORT_SHIFT)
-
-#define GPIO_PORTA     (PORTA << GPIO_PORT_SHIFT)
-#define GPIO_PORTB     (PORTB << GPIO_PORT_SHIFT)
-#define GPIO_PORTC     (PORTC << GPIO_PORT_SHIFT)
-#define GPIO_PORTD     (PORTD << GPIO_PORT_SHIFT)
-#define GPIO_PORTE     (PORTE << GPIO_PORT_SHIFT)
-#define GPIO_PORTF     (PORTF << GPIO_PORT_SHIFT)
-
 #define GPIO_OUT       (1 << 8)
 #define GPIO_IN                (0 << 8)
 #define GPIO_PUEN      (1 << 9)