diff options
author | Tony Lindgren <tony@atomide.com> | 2016-10-17 03:48:32 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2016-11-10 14:42:28 -0500 |
commit | 4e37d32fef08e83de330bd8dda2c50aa7db7361a (patch) | |
tree | f64369e79653becc3a5e8e018cb88bbcf645cd33 | |
parent | 602105ed740d89da00ac7cf3842f5ecd52a58461 (diff) |
ARM: OMAP2+: Remove legacy usb-musb.c platform init code
This is no longer needed when booted with device tree.
Signed-off-by: Tony Lindgren <tony@atomide.com>
-rw-r--r-- | arch/arm/mach-omap2/Makefile | 1 | ||||
-rw-r--r-- | arch/arm/mach-omap2/usb-musb.c | 106 |
2 files changed, 0 insertions, 107 deletions
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile index a53f3c61c74f..231b1e5cbf8c 100644 --- a/arch/arm/mach-omap2/Makefile +++ b/arch/arm/mach-omap2/Makefile | |||
@@ -242,7 +242,6 @@ obj-y += $(omap-flash-y) $(omap-flash-m) | |||
242 | omap-hsmmc-$(CONFIG_MMC_OMAP_HS) := hsmmc.o | 242 | omap-hsmmc-$(CONFIG_MMC_OMAP_HS) := hsmmc.o |
243 | obj-y += $(omap-hsmmc-m) $(omap-hsmmc-y) | 243 | obj-y += $(omap-hsmmc-m) $(omap-hsmmc-y) |
244 | 244 | ||
245 | obj-y += usb-musb.o | ||
246 | obj-y += omap_phy_internal.o | 245 | obj-y += omap_phy_internal.o |
247 | 246 | ||
248 | obj-$(CONFIG_MACH_OMAP2_TUSB6010) += usb-tusb6010.o | 247 | obj-$(CONFIG_MACH_OMAP2_TUSB6010) += usb-tusb6010.o |
diff --git a/arch/arm/mach-omap2/usb-musb.c b/arch/arm/mach-omap2/usb-musb.c deleted file mode 100644 index e4562b2b973b..000000000000 --- a/arch/arm/mach-omap2/usb-musb.c +++ /dev/null | |||
@@ -1,106 +0,0 @@ | |||
1 | /* | ||
2 | * linux/arch/arm/mach-omap2/usb-musb.c | ||
3 | * | ||
4 | * This file will contain the board specific details for the | ||
5 | * MENTOR USB OTG controller on OMAP3430 | ||
6 | * | ||
7 | * Copyright (C) 2007-2008 Texas Instruments | ||
8 | * Copyright (C) 2008 Nokia Corporation | ||
9 | * Author: Vikram Pandita | ||
10 | * | ||
11 | * Generalization by: | ||
12 | * Felipe Balbi <felipe.balbi@nokia.com> | ||
13 | * | ||
14 | * This program is free software; you can redistribute it and/or modify | ||
15 | * it under the terms of the GNU General Public License version 2 as | ||
16 | * published by the Free Software Foundation. | ||
17 | */ | ||
18 | |||
19 | #include <linux/types.h> | ||
20 | #include <linux/errno.h> | ||
21 | #include <linux/delay.h> | ||
22 | #include <linux/platform_device.h> | ||
23 | #include <linux/clk.h> | ||
24 | #include <linux/dma-mapping.h> | ||
25 | #include <linux/io.h> | ||
26 | #include <linux/usb/musb.h> | ||
27 | |||
28 | #include "omap_device.h" | ||
29 | #include "soc.h" | ||
30 | #include "mux.h" | ||
31 | #include "usb.h" | ||
32 | |||
33 | static struct musb_hdrc_config musb_config = { | ||
34 | .multipoint = 1, | ||
35 | .dyn_fifo = 1, | ||
36 | .num_eps = 16, | ||
37 | .ram_bits = 12, | ||
38 | }; | ||
39 | |||
40 | static struct musb_hdrc_platform_data musb_plat = { | ||
41 | .mode = MUSB_OTG, | ||
42 | |||
43 | /* .clock is set dynamically */ | ||
44 | .config = &musb_config, | ||
45 | |||
46 | /* REVISIT charge pump on TWL4030 can supply up to | ||
47 | * 100 mA ... but this value is board-specific, like | ||
48 | * "mode", and should be passed to usb_musb_init(). | ||
49 | */ | ||
50 | .power = 50, /* up to 100 mA */ | ||
51 | }; | ||
52 | |||
53 | static u64 musb_dmamask = DMA_BIT_MASK(32); | ||
54 | |||
55 | static struct omap_musb_board_data musb_default_board_data = { | ||
56 | .interface_type = MUSB_INTERFACE_ULPI, | ||
57 | .mode = MUSB_OTG, | ||
58 | .power = 100, | ||
59 | }; | ||
60 | |||
61 | void __init usb_musb_init(struct omap_musb_board_data *musb_board_data) | ||
62 | { | ||
63 | struct omap_hwmod *oh; | ||
64 | struct platform_device *pdev; | ||
65 | struct device *dev; | ||
66 | int bus_id = -1; | ||
67 | const char *oh_name, *name; | ||
68 | struct omap_musb_board_data *board_data; | ||
69 | |||
70 | if (musb_board_data) | ||
71 | board_data = musb_board_data; | ||
72 | else | ||
73 | board_data = &musb_default_board_data; | ||
74 | |||
75 | /* | ||
76 | * REVISIT: This line can be removed once all the platforms using | ||
77 | * musb_core.c have been converted to use use clkdev. | ||
78 | */ | ||
79 | musb_plat.clock = "ick"; | ||
80 | musb_plat.board_data = board_data; | ||
81 | musb_plat.power = board_data->power >> 1; | ||
82 | musb_plat.mode = board_data->mode; | ||
83 | musb_plat.extvbus = board_data->extvbus; | ||
84 | |||
85 | oh_name = "usb_otg_hs"; | ||
86 | name = "musb-omap2430"; | ||
87 | |||
88 | oh = omap_hwmod_lookup(oh_name); | ||
89 | if (WARN(!oh, "%s: could not find omap_hwmod for %s\n", | ||
90 | __func__, oh_name)) | ||
91 | return; | ||
92 | |||
93 | pdev = omap_device_build(name, bus_id, oh, &musb_plat, | ||
94 | sizeof(musb_plat)); | ||
95 | if (IS_ERR(pdev)) { | ||
96 | pr_err("Could not build omap_device for %s %s\n", | ||
97 | name, oh_name); | ||
98 | return; | ||
99 | } | ||
100 | |||
101 | dev = &pdev->dev; | ||
102 | get_device(dev); | ||
103 | dev->dma_mask = &musb_dmamask; | ||
104 | dev->coherent_dma_mask = musb_dmamask; | ||
105 | put_device(dev); | ||
106 | } | ||