aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2011-03-02 04:10:14 -0500
committerSascha Hauer <s.hauer@pengutronix.de>2011-03-07 13:29:39 -0500
commit94573e6623cf9159f036adc670a3d4b29e6d86fe (patch)
treeee4b7f8db9464a3e343397ea9d575d6f21d7585d /arch
parentff255feba1c575311378a3d7a3867e46549c8aa6 (diff)
ARM i.MX31 lilly: remove incomplete otg support
The platform data for the otg port is present but never used, so remove it. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Cc: Daniel Mack <daniel@caiaq.de>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-mx3/mach-mx31lilly.c53
1 files changed, 0 insertions, 53 deletions
diff --git a/arch/arm/mach-mx3/mach-mx31lilly.c b/arch/arm/mach-mx3/mach-mx31lilly.c
index be79a0d6301e..e2f9de10ad9f 100644
--- a/arch/arm/mach-mx3/mach-mx31lilly.c
+++ b/arch/arm/mach-mx3/mach-mx31lilly.c
@@ -116,52 +116,6 @@ static struct platform_device physmap_flash_device = {
116#define USB_PAD_CFG (PAD_CTL_DRV_MAX | PAD_CTL_SRE_FAST | PAD_CTL_HYS_CMOS | \ 116#define USB_PAD_CFG (PAD_CTL_DRV_MAX | PAD_CTL_SRE_FAST | PAD_CTL_HYS_CMOS | \
117 PAD_CTL_ODE_CMOS | PAD_CTL_100K_PU) 117 PAD_CTL_ODE_CMOS | PAD_CTL_100K_PU)
118 118
119static int usbotg_init(struct platform_device *pdev)
120{
121 unsigned int pins[] = {
122 MX31_PIN_USBOTG_DATA0__USBOTG_DATA0,
123 MX31_PIN_USBOTG_DATA1__USBOTG_DATA1,
124 MX31_PIN_USBOTG_DATA2__USBOTG_DATA2,
125 MX31_PIN_USBOTG_DATA3__USBOTG_DATA3,
126 MX31_PIN_USBOTG_DATA4__USBOTG_DATA4,
127 MX31_PIN_USBOTG_DATA5__USBOTG_DATA5,
128 MX31_PIN_USBOTG_DATA6__USBOTG_DATA6,
129 MX31_PIN_USBOTG_DATA7__USBOTG_DATA7,
130 MX31_PIN_USBOTG_CLK__USBOTG_CLK,
131 MX31_PIN_USBOTG_DIR__USBOTG_DIR,
132 MX31_PIN_USBOTG_NXT__USBOTG_NXT,
133 MX31_PIN_USBOTG_STP__USBOTG_STP,
134 };
135
136 mxc_iomux_setup_multiple_pins(pins, ARRAY_SIZE(pins), "USB OTG");
137
138 mxc_iomux_set_pad(MX31_PIN_USBOTG_DATA0, USB_PAD_CFG);
139 mxc_iomux_set_pad(MX31_PIN_USBOTG_DATA1, USB_PAD_CFG);
140 mxc_iomux_set_pad(MX31_PIN_USBOTG_DATA2, USB_PAD_CFG);
141 mxc_iomux_set_pad(MX31_PIN_USBOTG_DATA3, USB_PAD_CFG);
142 mxc_iomux_set_pad(MX31_PIN_USBOTG_DATA4, USB_PAD_CFG);
143 mxc_iomux_set_pad(MX31_PIN_USBOTG_DATA5, USB_PAD_CFG);
144 mxc_iomux_set_pad(MX31_PIN_USBOTG_DATA6, USB_PAD_CFG);
145 mxc_iomux_set_pad(MX31_PIN_USBOTG_DATA7, USB_PAD_CFG);
146 mxc_iomux_set_pad(MX31_PIN_USBOTG_CLK, USB_PAD_CFG);
147 mxc_iomux_set_pad(MX31_PIN_USBOTG_DIR, USB_PAD_CFG);
148 mxc_iomux_set_pad(MX31_PIN_USBOTG_NXT, USB_PAD_CFG);
149 mxc_iomux_set_pad(MX31_PIN_USBOTG_STP, USB_PAD_CFG);
150
151 mxc_iomux_set_gpr(MUX_PGP_USB_4WIRE, true);
152 mxc_iomux_set_gpr(MUX_PGP_USB_COMMON, true);
153
154 /* chip select */
155 mxc_iomux_alloc_pin(IOMUX_MODE(MX31_PIN_DTR_DCE2, IOMUX_CONFIG_GPIO),
156 "USBOTG_CS");
157 gpio_request(IOMUX_TO_GPIO(MX31_PIN_DTR_DCE2), "USBH1 CS");
158 gpio_direction_output(IOMUX_TO_GPIO(MX31_PIN_DTR_DCE2), 0);
159
160 mdelay(10);
161
162 return mx31_initialize_usb_hw(pdev->id, MXC_EHCI_POWER_PINS_ENABLED);
163}
164
165static int usbh1_init(struct platform_device *pdev) 119static int usbh1_init(struct platform_device *pdev)
166{ 120{
167 int pins[] = { 121 int pins[] = {
@@ -231,11 +185,6 @@ static int usbh2_init(struct platform_device *pdev)
231 return mx31_initialize_usb_hw(pdev->id, MXC_EHCI_POWER_PINS_ENABLED); 185 return mx31_initialize_usb_hw(pdev->id, MXC_EHCI_POWER_PINS_ENABLED);
232} 186}
233 187
234static struct mxc_usbh_platform_data usbotg_pdata = {
235 .init = usbotg_init,
236 .portsc = MXC_EHCI_MODE_ULPI | MXC_EHCI_UTMI_8BIT,
237};
238
239static const struct mxc_usbh_platform_data usbh1_pdata __initconst = { 188static const struct mxc_usbh_platform_data usbh1_pdata __initconst = {
240 .init = usbh1_init, 189 .init = usbh1_init,
241 .portsc = MXC_EHCI_MODE_UTMI | MXC_EHCI_SERIAL, 190 .portsc = MXC_EHCI_MODE_UTMI | MXC_EHCI_SERIAL,
@@ -248,8 +197,6 @@ static struct mxc_usbh_platform_data usbh2_pdata __initdata = {
248 197
249static void lilly1131_usb_init(void) 198static void lilly1131_usb_init(void)
250{ 199{
251 usbotg_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops,
252 ULPI_OTG_DRVVBUS | ULPI_OTG_DRVVBUS_EXT);
253 usbh2_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops, 200 usbh2_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops,
254 ULPI_OTG_DRVVBUS | ULPI_OTG_DRVVBUS_EXT); 201 ULPI_OTG_DRVVBUS | ULPI_OTG_DRVVBUS_EXT);
255 202