diff options
author | Tony Lindgren <tony@atomide.com> | 2012-09-23 22:31:35 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2012-09-23 22:31:35 -0400 |
commit | 9cd68fa707cf6372f33eb51a5719dd7626efe5f6 (patch) | |
tree | 66cde27bd288e011a6e4cff87d342666399a1266 /arch/arm/mach-omap2/board-am3517crane.c | |
parent | 5698bd757d55b1bb87edd1a9744ab09c142abfc2 (diff) | |
parent | 76a5d9bfc42d60e9a672e0cae776157a60970f4e (diff) |
Merge tag 'omap-devel-b-c-2-for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into devel-late
OMAP patches intended for the 3.7 merge window:
- Runtime PM conversions for the GPMC and RNG IP blocks
- Preparation patches for the OMAP common clock framework conversion
- clkdev alias additions required by other drivers
- Performance Monitoring Unit (PMU) support for OMAP2, 3, and non-4430 OMAP4
- OMAP hwmod code and data improvements
- Preparation patches for the IOMMU runtime PM conversion
- Preparation patches for OMAP4 full-chip retention support
Based on a merge of v3.6-rc6, the omap-cleanup-b-for-3.7 tag
(7852ec0536ca39cefffc6301dc77f8ae55592926),the cleanup-fixes-for-v3.7
tag (de6ca33a96a6bf61fcb91d3d399703e19ead9d1e), and the
omap-devel-am33xx-for-v3.7 tag
(11964f53eb4d9ce59a058be9999d9cfcb1ced878), due to dependencies.
These patches have been tested for meaningful warnings from
checkpatch, sparse, smatch, and cppcheck. Basic build, boot[1], and
PM test logs are available here:
http://www.pwsan.com/omap/testlogs/hwmod_prcm_clock_a_3.7/20120923173830/
...
1. Note that the N800 boot fails due to a known issue present in the
base commit:
http://www.spinics.net/lists/arm-kernel/msg196034.html
Diffstat (limited to 'arch/arm/mach-omap2/board-am3517crane.c')
-rw-r--r-- | arch/arm/mach-omap2/board-am3517crane.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/arch/arm/mach-omap2/board-am3517crane.c b/arch/arm/mach-omap2/board-am3517crane.c index 92432c28673d..318feadb1d6e 100644 --- a/arch/arm/mach-omap2/board-am3517crane.c +++ b/arch/arm/mach-omap2/board-am3517crane.c | |||
@@ -21,12 +21,10 @@ | |||
21 | #include <linux/init.h> | 21 | #include <linux/init.h> |
22 | #include <linux/gpio.h> | 22 | #include <linux/gpio.h> |
23 | 23 | ||
24 | #include <mach/hardware.h> | ||
25 | #include <asm/mach-types.h> | 24 | #include <asm/mach-types.h> |
26 | #include <asm/mach/arch.h> | 25 | #include <asm/mach/arch.h> |
27 | #include <asm/mach/map.h> | 26 | #include <asm/mach/map.h> |
28 | 27 | ||
29 | #include <plat/board.h> | ||
30 | #include "common.h" | 28 | #include "common.h" |
31 | #include <plat/usb.h> | 29 | #include <plat/usb.h> |
32 | 30 | ||
@@ -37,11 +35,6 @@ | |||
37 | #define GPIO_USB_POWER 35 | 35 | #define GPIO_USB_POWER 35 |
38 | #define GPIO_USB_NRESET 38 | 36 | #define GPIO_USB_NRESET 38 |
39 | 37 | ||
40 | |||
41 | /* Board initialization */ | ||
42 | static struct omap_board_config_kernel am3517_crane_config[] __initdata = { | ||
43 | }; | ||
44 | |||
45 | #ifdef CONFIG_OMAP_MUX | 38 | #ifdef CONFIG_OMAP_MUX |
46 | static struct omap_board_mux board_mux[] __initdata = { | 39 | static struct omap_board_mux board_mux[] __initdata = { |
47 | { .reg_offset = OMAP_MUX_TERMINATOR }, | 40 | { .reg_offset = OMAP_MUX_TERMINATOR }, |
@@ -67,9 +60,6 @@ static void __init am3517_crane_init(void) | |||
67 | omap_serial_init(); | 60 | omap_serial_init(); |
68 | omap_sdrc_init(NULL, NULL); | 61 | omap_sdrc_init(NULL, NULL); |
69 | 62 | ||
70 | omap_board_config = am3517_crane_config; | ||
71 | omap_board_config_size = ARRAY_SIZE(am3517_crane_config); | ||
72 | |||
73 | /* Configure GPIO for EHCI port */ | 63 | /* Configure GPIO for EHCI port */ |
74 | if (omap_mux_init_gpio(GPIO_USB_NRESET, OMAP_PIN_OUTPUT)) { | 64 | if (omap_mux_init_gpio(GPIO_USB_NRESET, OMAP_PIN_OUTPUT)) { |
75 | pr_err("Can not configure mux for GPIO_USB_NRESET %d\n", | 65 | pr_err("Can not configure mux for GPIO_USB_NRESET %d\n", |