Skip to content

Commit ac40142

Browse files
author
Uwe Kleine-König
committed
ARM: imx/debug-macro: rework using the new io mapping macro
This gets rid of the last user of IMX_NEEDS_DEPRECATED_SYMBOLS. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
1 parent a996314 commit ac40142

File tree

5 files changed

+7
-35
lines changed

5 files changed

+7
-35
lines changed

‎arch/arm/plat-mxc/include/mach/debug-macro.S

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,58 +10,49 @@
1010
* published by the Free Software Foundation.
1111
*
1212
*/
13-
#define IMX_NEEDS_DEPRECATED_SYMBOLS
13+
#include <mach/hardware.h>
1414

1515
#ifdef CONFIG_ARCH_MX1
16-
#include <mach/mx1.h>
17-
#define UART_PADDR UART1_BASE_ADDR
18-
#define UART_VADDR IO_ADDRESS(UART1_BASE_ADDR)
16+
#define UART_PADDR MX1_UART1_BASE_ADDR
1917
#endif
2018

2119
#ifdef CONFIG_ARCH_MX25
2220
#ifdef UART_PADDR
2321
#error "CONFIG_DEBUG_LL is incompatible with multiple archs"
2422
#endif
25-
#include <mach/mx25.h>
2623
#define UART_PADDR MX25_UART1_BASE_ADDR
27-
#define UART_VADDR MX25_AIPS1_IO_ADDRESS(MX25_UART1_BASE_ADDR)
2824
#endif
2925

3026
#ifdef CONFIG_ARCH_MX2
3127
#ifdef UART_PADDR
3228
#error "CONFIG_DEBUG_LL is incompatible with multiple archs"
3329
#endif
34-
#include <mach/mx2x.h>
35-
#define UART_PADDR UART1_BASE_ADDR
36-
#define UART_VADDR AIPI_IO_ADDRESS(UART1_BASE_ADDR)
30+
#define UART_PADDR MX2x_UART1_BASE_ADDR
3731
#endif
3832

3933
#ifdef CONFIG_ARCH_MX3
4034
#ifdef UART_PADDR
4135
#error "CONFIG_DEBUG_LL is incompatible with multiple archs"
4236
#endif
43-
#include <mach/mx3x.h>
44-
#define UART_PADDR UART1_BASE_ADDR
45-
#define UART_VADDR AIPS1_IO_ADDRESS(UART1_BASE_ADDR)
37+
#define UART_PADDR MX3x_UART1_BASE_ADDR
4638
#endif
4739

4840
#ifdef CONFIG_ARCH_MX5
4941
#ifdef UART_PADDR
5042
#error "CONFIG_DEBUG_LL is incompatible with multiple archs"
5143
#endif
52-
#include <mach/mx51.h>
5344
#define UART_PADDR MX51_UART1_BASE_ADDR
54-
#define UART_VADDR MX51_AIPS1_IO_ADDRESS(MX51_UART1_BASE_ADDR)
5545
#endif
5646

5747
#ifdef CONFIG_ARCH_MXC91231
5848
#ifdef UART_PADDR
5949
#error "CONFIG_DEBUG_LL is incompatible with multiple archs"
6050
#endif
61-
#include <mach/mxc91231.h>
6251
#define UART_PADDR MXC91231_UART2_BASE_ADDR
63-
#define UART_VADDR MXC91231_IO_ADDRESS(MXC91231_UART2_BASE_ADDR)
6452
#endif
53+
54+
#define UART_VADDR IMX_IO_ADDRESS(UART_PADDR)
55+
6556
.macro addruart, rp, rv
6657
ldr \rp, =UART_PADDR @ physical
6758
ldr \rv, =UART_VADDR @ virtual

‎arch/arm/plat-mxc/include/mach/mx25.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
#define __MACH_MX25_H__
33

44
#define MX25_AIPS1_BASE_ADDR 0x43f00000
5-
#define MX25_AIPS1_BASE_ADDR_VIRT 0xf5300000
65
#define MX25_AIPS1_SIZE SZ_1M
76
#define MX25_AIPS2_BASE_ADDR 0x53f00000
87
#define MX25_AIPS2_SIZE SZ_1M
@@ -25,9 +24,6 @@
2524
#define MX25_GPIO2_BASE_ADDR (MX25_AIPS2_BASE_ADDR + 0xd0000)
2625
#define MX25_WDOG_BASE_ADDR (MX25_AIPS2_BASE_ADDR + 0xdc000)
2726

28-
#define MX25_AIPS1_IO_ADDRESS(x) \
29-
(((x) - MX25_AIPS1_BASE_ADDR) + MX25_AIPS1_BASE_ADDR_VIRT)
30-
3127
#define MX25_UART1_BASE_ADDR 0x43f90000
3228
#define MX25_UART2_BASE_ADDR 0x43f94000
3329
#define MX25_AUDMUX_BASE_ADDR 0x43fb0000

‎arch/arm/plat-mxc/include/mach/mx2x.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727

2828
/* Register offsets */
2929
#define MX2x_AIPI_BASE_ADDR 0x10000000
30-
#define MX2x_AIPI_BASE_ADDR_VIRT 0xf4400000
3130
#define MX2x_AIPI_SIZE SZ_1M
3231
#define MX2x_DMA_BASE_ADDR (MX2x_AIPI_BASE_ADDR + 0x01000)
3332
#define MX2x_WDOG_BASE_ADDR (MX2x_AIPI_BASE_ADDR + 0x02000)
@@ -68,9 +67,6 @@
6867
#define MX2x_SAHB1_SIZE SZ_1M
6968
#define MX2x_CSI_BASE_ADDR (MX2x_SAHB1_BASE_ADDR + 0x0000)
7069

71-
#define AIPI_IO_ADDRESS(x) \
72-
(((x) - AIPI_BASE_ADDR) + AIPI_BASE_ADDR_VIRT)
73-
7470
/* fixed interrupt numbers */
7571
#define MX2x_INT_CSPI3 6
7672
#define MX2x_INT_GPIO 8
@@ -148,7 +144,6 @@
148144
#ifdef IMX_NEEDS_DEPRECATED_SYMBOLS
149145
/* these should go away */
150146
#define AIPI_BASE_ADDR MX2x_AIPI_BASE_ADDR
151-
#define AIPI_BASE_ADDR_VIRT MX2x_AIPI_BASE_ADDR_VIRT
152147
#define AIPI_SIZE MX2x_AIPI_SIZE
153148
#define DMA_BASE_ADDR MX2x_DMA_BASE_ADDR
154149
#define WDOG_BASE_ADDR MX2x_WDOG_BASE_ADDR

‎arch/arm/plat-mxc/include/mach/mx3x.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444
* AIPS 1
4545
*/
4646
#define MX3x_AIPS1_BASE_ADDR 0x43f00000
47-
#define MX3x_AIPS1_BASE_ADDR_VIRT 0xf5300000
4847
#define MX3x_AIPS1_SIZE SZ_1M
4948
#define MX3x_MAX_BASE_ADDR (MX3x_AIPS1_BASE_ADDR + 0x04000)
5049
#define MX3x_EVTMON_BASE_ADDR (MX3x_AIPS1_BASE_ADDR + 0x08000)
@@ -141,9 +140,6 @@
141140

142141
#define MX3x_PCMCIA_MEM_BASE_ADDR 0xbc000000
143142

144-
#define AIPS1_IO_ADDRESS(x) \
145-
(((x) - AIPS1_BASE_ADDR) + AIPS1_BASE_ADDR_VIRT)
146-
147143
/*
148144
* Interrupt numbers
149145
*/
@@ -230,7 +226,6 @@ static inline int mx35_revision(void)
230226
#define L2CC_BASE_ADDR MX3x_L2CC_BASE_ADDR
231227
#define L2CC_SIZE MX3x_L2CC_SIZE
232228
#define AIPS1_BASE_ADDR MX3x_AIPS1_BASE_ADDR
233-
#define AIPS1_BASE_ADDR_VIRT MX3x_AIPS1_BASE_ADDR_VIRT
234229
#define AIPS1_SIZE MX3x_AIPS1_SIZE
235230
#define MAX_BASE_ADDR MX3x_MAX_BASE_ADDR
236231
#define EVTMON_BASE_ADDR MX3x_EVTMON_BASE_ADDR

‎arch/arm/plat-mxc/include/mach/mx51.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@
5353
* AIPS 1
5454
*/
5555
#define MX51_AIPS1_BASE_ADDR 0x73f00000
56-
#define MX51_AIPS1_BASE_ADDR_VIRT 0xf5700000
5756
#define MX51_AIPS1_SIZE SZ_1M
5857

5958
#define MX51_OTG_BASE_ADDR (MX51_AIPS1_BASE_ADDR + 0x80000)
@@ -137,10 +136,6 @@
137136
#define MX51_IO_P2V(x) IMX_IO_P2V(x)
138137
#define MX51_IO_ADDRESS(x) IOMEM(MX51_IO_P2V(x))
139138

140-
/* This is currently used in <mach/debug-macro.S>, but should go away */
141-
#define MX51_AIPS1_IO_ADDRESS(x) \
142-
(((x) - MX51_AIPS1_BASE_ADDR) + MX51_AIPS1_BASE_ADDR_VIRT)
143-
144139
/*
145140
* defines for SPBA modules
146141
*/

0 commit comments

Comments
 (0)