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/include | |
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/include')
-rw-r--r-- | arch/arm/include/asm/gpio.h | 19 | ||||
-rw-r--r-- | arch/arm/include/asm/hardware/iop3xx-gpio.h | 2 | ||||
-rw-r--r-- | arch/arm/include/asm/hardware/it8152.h | 2 | ||||
-rw-r--r-- | arch/arm/include/asm/memory.h | 16 | ||||
-rw-r--r-- | arch/arm/include/asm/module.h | 4 |
5 files changed, 30 insertions, 13 deletions
diff --git a/arch/arm/include/asm/gpio.h b/arch/arm/include/asm/gpio.h index 166a7a3e2840..11ad0bfbb0ad 100644 --- a/arch/arm/include/asm/gpio.h +++ b/arch/arm/include/asm/gpio.h | |||
@@ -4,4 +4,23 @@ | |||
4 | /* not all ARM platforms necessarily support this API ... */ | 4 | /* not all ARM platforms necessarily support this API ... */ |
5 | #include <mach/gpio.h> | 5 | #include <mach/gpio.h> |
6 | 6 | ||
7 | #ifndef __ARM_GPIOLIB_COMPLEX | ||
8 | /* Note: this may rely upon the value of ARCH_NR_GPIOS set in mach/gpio.h */ | ||
9 | #include <asm-generic/gpio.h> | ||
10 | |||
11 | /* The trivial gpiolib dispatchers */ | ||
12 | #define gpio_get_value __gpio_get_value | ||
13 | #define gpio_set_value __gpio_set_value | ||
14 | #define gpio_cansleep __gpio_cansleep | ||
15 | #endif | ||
16 | |||
17 | /* | ||
18 | * Provide a default gpio_to_irq() which should satisfy every case. | ||
19 | * However, some platforms want to do this differently, so allow them | ||
20 | * to override it. | ||
21 | */ | ||
22 | #ifndef gpio_to_irq | ||
23 | #define gpio_to_irq __gpio_to_irq | ||
24 | #endif | ||
25 | |||
7 | #endif /* _ARCH_ARM_GPIO_H */ | 26 | #endif /* _ARCH_ARM_GPIO_H */ |
diff --git a/arch/arm/include/asm/hardware/iop3xx-gpio.h b/arch/arm/include/asm/hardware/iop3xx-gpio.h index b69d972b1f7d..9eda7dc92ad8 100644 --- a/arch/arm/include/asm/hardware/iop3xx-gpio.h +++ b/arch/arm/include/asm/hardware/iop3xx-gpio.h | |||
@@ -28,6 +28,8 @@ | |||
28 | #include <mach/hardware.h> | 28 | #include <mach/hardware.h> |
29 | #include <asm-generic/gpio.h> | 29 | #include <asm-generic/gpio.h> |
30 | 30 | ||
31 | #define __ARM_GPIOLIB_COMPLEX | ||
32 | |||
31 | #define IOP3XX_N_GPIOS 8 | 33 | #define IOP3XX_N_GPIOS 8 |
32 | 34 | ||
33 | static inline int gpio_get_value(unsigned gpio) | 35 | static inline int gpio_get_value(unsigned gpio) |
diff --git a/arch/arm/include/asm/hardware/it8152.h b/arch/arm/include/asm/hardware/it8152.h index b3fea38d55c6..43cab498bc27 100644 --- a/arch/arm/include/asm/hardware/it8152.h +++ b/arch/arm/include/asm/hardware/it8152.h | |||
@@ -9,7 +9,7 @@ | |||
9 | 9 | ||
10 | #ifndef __ASM_HARDWARE_IT8152_H | 10 | #ifndef __ASM_HARDWARE_IT8152_H |
11 | #define __ASM_HARDWARE_IT8152_H | 11 | #define __ASM_HARDWARE_IT8152_H |
12 | extern unsigned long it8152_base_address; | 12 | extern void __iomem *it8152_base_address; |
13 | 13 | ||
14 | #define IT8152_IO_BASE (it8152_base_address + 0x03e00000) | 14 | #define IT8152_IO_BASE (it8152_base_address + 0x03e00000) |
15 | #define IT8152_CFGREG_BASE (it8152_base_address + 0x03f00000) | 15 | #define IT8152_CFGREG_BASE (it8152_base_address + 0x03f00000) |
diff --git a/arch/arm/include/asm/memory.h b/arch/arm/include/asm/memory.h index 652fccca4952..a8997d71084e 100644 --- a/arch/arm/include/asm/memory.h +++ b/arch/arm/include/asm/memory.h | |||
@@ -16,9 +16,12 @@ | |||
16 | #include <linux/compiler.h> | 16 | #include <linux/compiler.h> |
17 | #include <linux/const.h> | 17 | #include <linux/const.h> |
18 | #include <linux/types.h> | 18 | #include <linux/types.h> |
19 | #include <mach/memory.h> | ||
20 | #include <asm/sizes.h> | 19 | #include <asm/sizes.h> |
21 | 20 | ||
21 | #ifdef CONFIG_NEED_MACH_MEMORY_H | ||
22 | #include <mach/memory.h> | ||
23 | #endif | ||
24 | |||
22 | /* | 25 | /* |
23 | * Allow for constants defined here to be used from assembly code | 26 | * Allow for constants defined here to be used from assembly code |
24 | * by prepending the UL suffix only with actual C code compilation. | 27 | * by prepending the UL suffix only with actual C code compilation. |
@@ -151,7 +154,6 @@ | |||
151 | * so that all we need to do is modify the 8-bit constant field. | 154 | * so that all we need to do is modify the 8-bit constant field. |
152 | */ | 155 | */ |
153 | #define __PV_BITS_31_24 0x81000000 | 156 | #define __PV_BITS_31_24 0x81000000 |
154 | #define __PV_BITS_23_16 0x00810000 | ||
155 | 157 | ||
156 | extern unsigned long __pv_phys_offset; | 158 | extern unsigned long __pv_phys_offset; |
157 | #define PHYS_OFFSET __pv_phys_offset | 159 | #define PHYS_OFFSET __pv_phys_offset |
@@ -169,9 +171,6 @@ static inline unsigned long __virt_to_phys(unsigned long x) | |||
169 | { | 171 | { |
170 | unsigned long t; | 172 | unsigned long t; |
171 | __pv_stub(x, t, "add", __PV_BITS_31_24); | 173 | __pv_stub(x, t, "add", __PV_BITS_31_24); |
172 | #ifdef CONFIG_ARM_PATCH_PHYS_VIRT_16BIT | ||
173 | __pv_stub(t, t, "add", __PV_BITS_23_16); | ||
174 | #endif | ||
175 | return t; | 174 | return t; |
176 | } | 175 | } |
177 | 176 | ||
@@ -179,9 +178,6 @@ static inline unsigned long __phys_to_virt(unsigned long x) | |||
179 | { | 178 | { |
180 | unsigned long t; | 179 | unsigned long t; |
181 | __pv_stub(x, t, "sub", __PV_BITS_31_24); | 180 | __pv_stub(x, t, "sub", __PV_BITS_31_24); |
182 | #ifdef CONFIG_ARM_PATCH_PHYS_VIRT_16BIT | ||
183 | __pv_stub(t, t, "sub", __PV_BITS_23_16); | ||
184 | #endif | ||
185 | return t; | 181 | return t; |
186 | } | 182 | } |
187 | #else | 183 | #else |
@@ -191,7 +187,11 @@ static inline unsigned long __phys_to_virt(unsigned long x) | |||
191 | #endif | 187 | #endif |
192 | 188 | ||
193 | #ifndef PHYS_OFFSET | 189 | #ifndef PHYS_OFFSET |
190 | #ifdef PLAT_PHYS_OFFSET | ||
194 | #define PHYS_OFFSET PLAT_PHYS_OFFSET | 191 | #define PHYS_OFFSET PLAT_PHYS_OFFSET |
192 | #else | ||
193 | #define PHYS_OFFSET UL(CONFIG_PHYS_OFFSET) | ||
194 | #endif | ||
195 | #endif | 195 | #endif |
196 | 196 | ||
197 | /* | 197 | /* |
diff --git a/arch/arm/include/asm/module.h b/arch/arm/include/asm/module.h index 543b44916d2c..6c6809f982f1 100644 --- a/arch/arm/include/asm/module.h +++ b/arch/arm/include/asm/module.h | |||
@@ -31,11 +31,7 @@ struct mod_arch_specific { | |||
31 | 31 | ||
32 | /* Add __virt_to_phys patching state as well */ | 32 | /* Add __virt_to_phys patching state as well */ |
33 | #ifdef CONFIG_ARM_PATCH_PHYS_VIRT | 33 | #ifdef CONFIG_ARM_PATCH_PHYS_VIRT |
34 | #ifdef CONFIG_ARM_PATCH_PHYS_VIRT_16BIT | ||
35 | #define MODULE_ARCH_VERMAGIC_P2V "p2v16 " | ||
36 | #else | ||
37 | #define MODULE_ARCH_VERMAGIC_P2V "p2v8 " | 34 | #define MODULE_ARCH_VERMAGIC_P2V "p2v8 " |
38 | #endif | ||
39 | #else | 35 | #else |
40 | #define MODULE_ARCH_VERMAGIC_P2V "" | 36 | #define MODULE_ARCH_VERMAGIC_P2V "" |
41 | #endif | 37 | #endif |