diff options
author | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 18:25:41 -0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 18:25:41 -0400 |
commit | 3e965b176341b78620f7404fd8b7f9a0d061f8a2 (patch) | |
tree | a2dbf06d6ae20fbe417b70f0a471cc4f93ff0a71 /arch/arm/plat-mxc | |
parent | 034ee299122c6b145d6d3cafb9ef5c329a4ab990 (diff) | |
parent | 5839fec9d8db35b2b07359b18a77295418e239ad (diff) |
Merge branch 'next/fixes' into next/cleanup
Conflicts:
arch/arm/mach-mxs/include/mach/gpio.h
arch/arm/plat-mxc/include/mach/gpio.h
drivers/video/omap/lcd_apollon.c
drivers/video/omap/lcd_ldp.c
drivers/video/omap/lcd_overo.c
Diffstat (limited to 'arch/arm/plat-mxc')
-rw-r--r-- | arch/arm/plat-mxc/include/mach/debug-macro.S | 2 | ||||
-rw-r--r-- | arch/arm/plat-mxc/include/mach/gpio.h | 33 | ||||
-rw-r--r-- | arch/arm/plat-mxc/include/mach/iomux-v3.h | 10 | ||||
-rw-r--r-- | arch/arm/plat-mxc/include/mach/memory.h | 43 |
4 files changed, 7 insertions, 81 deletions
diff --git a/arch/arm/plat-mxc/include/mach/debug-macro.S b/arch/arm/plat-mxc/include/mach/debug-macro.S index e4dde91f0231..a3045937fc2f 100644 --- a/arch/arm/plat-mxc/include/mach/debug-macro.S +++ b/arch/arm/plat-mxc/include/mach/debug-macro.S | |||
@@ -54,7 +54,7 @@ | |||
54 | 54 | ||
55 | #define UART_VADDR IMX_IO_ADDRESS(UART_PADDR) | 55 | #define UART_VADDR IMX_IO_ADDRESS(UART_PADDR) |
56 | 56 | ||
57 | .macro addruart, rp, rv | 57 | .macro addruart, rp, rv, tmp |
58 | ldr \rp, =UART_PADDR @ physical | 58 | ldr \rp, =UART_PADDR @ physical |
59 | ldr \rv, =UART_VADDR @ virtual | 59 | ldr \rv, =UART_VADDR @ virtual |
60 | .endm | 60 | .endm |
diff --git a/arch/arm/plat-mxc/include/mach/gpio.h b/arch/arm/plat-mxc/include/mach/gpio.h index 44af0064ba1a..40a8c178f10d 100644 --- a/arch/arm/plat-mxc/include/mach/gpio.h +++ b/arch/arm/plat-mxc/include/mach/gpio.h | |||
@@ -1,32 +1 @@ | |||
1 | /* | /* empty */ | |
2 | * Copyright 2007 Freescale Semiconductor, Inc. All Rights Reserved. | ||
3 | * Copyright 2008 Juergen Beisert, kernel@pengutronix.de | ||
4 | * | ||
5 | * This program is free software; you can redistribute it and/or | ||
6 | * modify it under the terms of the GNU General Public License | ||
7 | * as published by the Free Software Foundation; either version 2 | ||
8 | * of the License, or (at your option) any later version. | ||
9 | * This program is distributed in the hope that it will be useful, | ||
10 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
11 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
12 | * GNU General Public License for more details. | ||
13 | * | ||
14 | * You should have received a copy of the GNU General Public License | ||
15 | * along with this program; if not, write to the Free Software | ||
16 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. | ||
17 | */ | ||
18 | |||
19 | #ifndef __ASM_ARCH_MXC_GPIO_H__ | ||
20 | #define __ASM_ARCH_MXC_GPIO_H__ | ||
21 | |||
22 | #include <linux/spinlock.h> | ||
23 | #include <mach/hardware.h> | ||
24 | #include <asm-generic/gpio.h> | ||
25 | |||
26 | /* use gpiolib dispatchers */ | ||
27 | #define gpio_get_value __gpio_get_value | ||
28 | #define gpio_set_value __gpio_set_value | ||
29 | #define gpio_cansleep __gpio_cansleep | ||
30 | #define gpio_to_irq __gpio_to_irq | ||
31 | |||
32 | #endif | ||
diff --git a/arch/arm/plat-mxc/include/mach/iomux-v3.h b/arch/arm/plat-mxc/include/mach/iomux-v3.h index 35e0df224caa..2fa3b5430102 100644 --- a/arch/arm/plat-mxc/include/mach/iomux-v3.h +++ b/arch/arm/plat-mxc/include/mach/iomux-v3.h | |||
@@ -90,11 +90,11 @@ typedef u64 iomux_v3_cfg_t; | |||
90 | #define PAD_CTL_HYS (1 << 8) | 90 | #define PAD_CTL_HYS (1 << 8) |
91 | 91 | ||
92 | #define PAD_CTL_PKE (1 << 7) | 92 | #define PAD_CTL_PKE (1 << 7) |
93 | #define PAD_CTL_PUE (1 << 6) | 93 | #define PAD_CTL_PUE (1 << 6 | PAD_CTL_PKE) |
94 | #define PAD_CTL_PUS_100K_DOWN (0 << 4) | 94 | #define PAD_CTL_PUS_100K_DOWN (0 << 4 | PAD_CTL_PUE) |
95 | #define PAD_CTL_PUS_47K_UP (1 << 4) | 95 | #define PAD_CTL_PUS_47K_UP (1 << 4 | PAD_CTL_PUE) |
96 | #define PAD_CTL_PUS_100K_UP (2 << 4) | 96 | #define PAD_CTL_PUS_100K_UP (2 << 4 | PAD_CTL_PUE) |
97 | #define PAD_CTL_PUS_22K_UP (3 << 4) | 97 | #define PAD_CTL_PUS_22K_UP (3 << 4 | PAD_CTL_PUE) |
98 | 98 | ||
99 | #define PAD_CTL_ODE (1 << 3) | 99 | #define PAD_CTL_ODE (1 << 3) |
100 | 100 | ||
diff --git a/arch/arm/plat-mxc/include/mach/memory.h b/arch/arm/plat-mxc/include/mach/memory.h deleted file mode 100644 index 3ec84b902243..000000000000 --- a/arch/arm/plat-mxc/include/mach/memory.h +++ /dev/null | |||
@@ -1,43 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright 2004-2007 Freescale Semiconductor, Inc. All Rights Reserved. | ||
3 | */ | ||
4 | |||
5 | /* | ||
6 | * This program is free software; you can redistribute it and/or modify | ||
7 | * it under the terms of the GNU General Public License version 2 as | ||
8 | * published by the Free Software Foundation. | ||
9 | */ | ||
10 | |||
11 | #ifndef __ASM_ARCH_MXC_MEMORY_H__ | ||
12 | #define __ASM_ARCH_MXC_MEMORY_H__ | ||
13 | |||
14 | #define MX1_PHYS_OFFSET UL(0x08000000) | ||
15 | #define MX21_PHYS_OFFSET UL(0xc0000000) | ||
16 | #define MX25_PHYS_OFFSET UL(0x80000000) | ||
17 | #define MX27_PHYS_OFFSET UL(0xa0000000) | ||
18 | #define MX3x_PHYS_OFFSET UL(0x80000000) | ||
19 | #define MX50_PHYS_OFFSET UL(0x70000000) | ||
20 | #define MX51_PHYS_OFFSET UL(0x90000000) | ||
21 | #define MX53_PHYS_OFFSET UL(0x70000000) | ||
22 | |||
23 | #if !defined(CONFIG_RUNTIME_PHYS_OFFSET) | ||
24 | # if defined CONFIG_ARCH_MX1 | ||
25 | # define PLAT_PHYS_OFFSET MX1_PHYS_OFFSET | ||
26 | # elif defined CONFIG_MACH_MX21 | ||
27 | # define PLAT_PHYS_OFFSET MX21_PHYS_OFFSET | ||
28 | # elif defined CONFIG_ARCH_MX25 | ||
29 | # define PLAT_PHYS_OFFSET MX25_PHYS_OFFSET | ||
30 | # elif defined CONFIG_MACH_MX27 | ||
31 | # define PLAT_PHYS_OFFSET MX27_PHYS_OFFSET | ||
32 | # elif defined CONFIG_ARCH_MX3 | ||
33 | # define PLAT_PHYS_OFFSET MX3x_PHYS_OFFSET | ||
34 | # elif defined CONFIG_ARCH_MX50 | ||
35 | # define PLAT_PHYS_OFFSET MX50_PHYS_OFFSET | ||
36 | # elif defined CONFIG_ARCH_MX51 | ||
37 | # define PLAT_PHYS_OFFSET MX51_PHYS_OFFSET | ||
38 | # elif defined CONFIG_ARCH_MX53 | ||
39 | # define PLAT_PHYS_OFFSET MX53_PHYS_OFFSET | ||
40 | # endif | ||
41 | #endif | ||
42 | |||
43 | #endif /* __ASM_ARCH_MXC_MEMORY_H__ */ | ||