diff options
author | Arnd Bergmann <arnd@arndb.de> | 2011-12-27 18:41:37 -0500 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2011-12-27 18:41:37 -0500 |
commit | e814fb635cd269532a6a95a921c05841ababa7ae (patch) | |
tree | b6764b819736ea0d3390fc11c564d321d63344d6 | |
parent | 4551ae0a24bba06972247a80f721fc21f6b2b758 (diff) | |
parent | fcf932350e979db9a29831a8a03bc300c4502bd5 (diff) |
Merge branch 'samsung/ohci' into next/drivers
* samsung/ohci:
ARM: EXYNOS: Add USB OHCI support to ORIGEN board
USB: Add Samsung Exynos OHCI diver
ARM: EXYNOS: Add USB OHCI support to SMDKV310 board
ARM: EXYNOS: Add USB OHCI device
-rw-r--r-- | arch/arm/mach-exynos/Kconfig | 7 | ||||
-rw-r--r-- | arch/arm/mach-exynos/Makefile | 1 | ||||
-rw-r--r-- | arch/arm/mach-exynos/dev-ohci.c | 52 | ||||
-rw-r--r-- | arch/arm/mach-exynos/include/mach/map.h | 1 | ||||
-rw-r--r-- | arch/arm/mach-exynos/include/mach/ohci.h | 21 | ||||
-rw-r--r-- | arch/arm/mach-exynos/mach-origen.c | 13 | ||||
-rw-r--r-- | arch/arm/mach-exynos/mach-smdkv310.c | 13 | ||||
-rw-r--r-- | arch/arm/mach-exynos/setup-usb-phy.c | 15 | ||||
-rw-r--r-- | arch/arm/plat-samsung/include/plat/devs.h | 1 | ||||
-rw-r--r-- | drivers/usb/Kconfig | 1 | ||||
-rw-r--r-- | drivers/usb/host/Kconfig | 6 | ||||
-rw-r--r-- | drivers/usb/host/ohci-exynos.c | 274 | ||||
-rw-r--r-- | drivers/usb/host/ohci-hcd.c | 5 |
13 files changed, 410 insertions, 0 deletions
diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig index 724ec0f3560d..5ca0bddf65fa 100644 --- a/arch/arm/mach-exynos/Kconfig +++ b/arch/arm/mach-exynos/Kconfig | |||
@@ -82,6 +82,11 @@ config EXYNOS4_DEV_DWMCI | |||
82 | help | 82 | help |
83 | Compile in platform device definitions for DWMCI | 83 | Compile in platform device definitions for DWMCI |
84 | 84 | ||
85 | config EXYNOS4_DEV_USB_OHCI | ||
86 | bool | ||
87 | help | ||
88 | Compile in platform device definition for USB OHCI | ||
89 | |||
85 | config EXYNOS4_SETUP_I2C1 | 90 | config EXYNOS4_SETUP_I2C1 |
86 | bool | 91 | bool |
87 | help | 92 | help |
@@ -179,6 +184,7 @@ config MACH_SMDKV310 | |||
179 | select SAMSUNG_DEV_KEYPAD | 184 | select SAMSUNG_DEV_KEYPAD |
180 | select EXYNOS4_DEV_PD | 185 | select EXYNOS4_DEV_PD |
181 | select SAMSUNG_DEV_PWM | 186 | select SAMSUNG_DEV_PWM |
187 | select EXYNOS4_DEV_USB_OHCI | ||
182 | select EXYNOS4_DEV_SYSMMU | 188 | select EXYNOS4_DEV_SYSMMU |
183 | select EXYNOS4_SETUP_FIMD0 | 189 | select EXYNOS4_SETUP_FIMD0 |
184 | select EXYNOS4_SETUP_I2C1 | 190 | select EXYNOS4_SETUP_I2C1 |
@@ -288,6 +294,7 @@ config MACH_ORIGEN | |||
288 | select SAMSUNG_DEV_BACKLIGHT | 294 | select SAMSUNG_DEV_BACKLIGHT |
289 | select SAMSUNG_DEV_PWM | 295 | select SAMSUNG_DEV_PWM |
290 | select EXYNOS4_DEV_PD | 296 | select EXYNOS4_DEV_PD |
297 | select EXYNOS4_DEV_USB_OHCI | ||
291 | select EXYNOS4_SETUP_FIMD0 | 298 | select EXYNOS4_SETUP_FIMD0 |
292 | select EXYNOS4_SETUP_SDHCI | 299 | select EXYNOS4_SETUP_SDHCI |
293 | select EXYNOS4_SETUP_USB_PHY | 300 | select EXYNOS4_SETUP_USB_PHY |
diff --git a/arch/arm/mach-exynos/Makefile b/arch/arm/mach-exynos/Makefile index 59069a35e40b..f5f3b7994923 100644 --- a/arch/arm/mach-exynos/Makefile +++ b/arch/arm/mach-exynos/Makefile | |||
@@ -44,6 +44,7 @@ obj-$(CONFIG_EXYNOS4_DEV_AHCI) += dev-ahci.o | |||
44 | obj-$(CONFIG_EXYNOS4_DEV_PD) += dev-pd.o | 44 | obj-$(CONFIG_EXYNOS4_DEV_PD) += dev-pd.o |
45 | obj-$(CONFIG_EXYNOS4_DEV_SYSMMU) += dev-sysmmu.o | 45 | obj-$(CONFIG_EXYNOS4_DEV_SYSMMU) += dev-sysmmu.o |
46 | obj-$(CONFIG_EXYNOS4_DEV_DWMCI) += dev-dwmci.o | 46 | obj-$(CONFIG_EXYNOS4_DEV_DWMCI) += dev-dwmci.o |
47 | obj-$(CONFIG_EXYNOS4_DEV_USB_OHCI) += dev-ohci.o | ||
47 | 48 | ||
48 | obj-$(CONFIG_EXYNOS4_SETUP_FIMC) += setup-fimc.o | 49 | obj-$(CONFIG_EXYNOS4_SETUP_FIMC) += setup-fimc.o |
49 | obj-$(CONFIG_EXYNOS4_SETUP_FIMD0) += setup-fimd0.o | 50 | obj-$(CONFIG_EXYNOS4_SETUP_FIMD0) += setup-fimd0.o |
diff --git a/arch/arm/mach-exynos/dev-ohci.c b/arch/arm/mach-exynos/dev-ohci.c new file mode 100644 index 000000000000..b8e75300c77d --- /dev/null +++ b/arch/arm/mach-exynos/dev-ohci.c | |||
@@ -0,0 +1,52 @@ | |||
1 | /* linux/arch/arm/mach-exynos/dev-ohci.c | ||
2 | * | ||
3 | * Copyright (c) 2011 Samsung Electronics Co., Ltd. | ||
4 | * http://www.samsung.com | ||
5 | * | ||
6 | * EXYNOS - OHCI support | ||
7 | * | ||
8 | * This program is free software; you can redistribute it and/or modify | ||
9 | * it under the terms of the GNU General Public License version 2 as | ||
10 | * published by the Free Software Foundation. | ||
11 | */ | ||
12 | |||
13 | #include <linux/dma-mapping.h> | ||
14 | #include <linux/platform_device.h> | ||
15 | |||
16 | #include <mach/irqs.h> | ||
17 | #include <mach/map.h> | ||
18 | #include <mach/ohci.h> | ||
19 | |||
20 | #include <plat/devs.h> | ||
21 | #include <plat/usb-phy.h> | ||
22 | |||
23 | static struct resource exynos4_ohci_resource[] = { | ||
24 | [0] = DEFINE_RES_MEM(EXYNOS4_PA_OHCI, SZ_256), | ||
25 | [1] = DEFINE_RES_IRQ(IRQ_USB_HOST), | ||
26 | }; | ||
27 | |||
28 | static u64 exynos4_ohci_dma_mask = DMA_BIT_MASK(32); | ||
29 | |||
30 | struct platform_device exynos4_device_ohci = { | ||
31 | .name = "exynos-ohci", | ||
32 | .id = -1, | ||
33 | .num_resources = ARRAY_SIZE(exynos4_ohci_resource), | ||
34 | .resource = exynos4_ohci_resource, | ||
35 | .dev = { | ||
36 | .dma_mask = &exynos4_ohci_dma_mask, | ||
37 | .coherent_dma_mask = DMA_BIT_MASK(32), | ||
38 | } | ||
39 | }; | ||
40 | |||
41 | void __init exynos4_ohci_set_platdata(struct exynos4_ohci_platdata *pd) | ||
42 | { | ||
43 | struct exynos4_ohci_platdata *npd; | ||
44 | |||
45 | npd = s3c_set_platdata(pd, sizeof(struct exynos4_ohci_platdata), | ||
46 | &exynos4_device_ohci); | ||
47 | |||
48 | if (!npd->phy_init) | ||
49 | npd->phy_init = s5p_usb_phy_init; | ||
50 | if (!npd->phy_exit) | ||
51 | npd->phy_exit = s5p_usb_phy_exit; | ||
52 | } | ||
diff --git a/arch/arm/mach-exynos/include/mach/map.h b/arch/arm/mach-exynos/include/mach/map.h index 058541d45af0..01e1cf3f9341 100644 --- a/arch/arm/mach-exynos/include/mach/map.h +++ b/arch/arm/mach-exynos/include/mach/map.h | |||
@@ -107,6 +107,7 @@ | |||
107 | #define EXYNOS4_PA_SROMC 0x12570000 | 107 | #define EXYNOS4_PA_SROMC 0x12570000 |
108 | 108 | ||
109 | #define EXYNOS4_PA_EHCI 0x12580000 | 109 | #define EXYNOS4_PA_EHCI 0x12580000 |
110 | #define EXYNOS4_PA_OHCI 0x12590000 | ||
110 | #define EXYNOS4_PA_HSPHY 0x125B0000 | 111 | #define EXYNOS4_PA_HSPHY 0x125B0000 |
111 | #define EXYNOS4_PA_MFC 0x13400000 | 112 | #define EXYNOS4_PA_MFC 0x13400000 |
112 | 113 | ||
diff --git a/arch/arm/mach-exynos/include/mach/ohci.h b/arch/arm/mach-exynos/include/mach/ohci.h new file mode 100644 index 000000000000..c256c595be5e --- /dev/null +++ b/arch/arm/mach-exynos/include/mach/ohci.h | |||
@@ -0,0 +1,21 @@ | |||
1 | /* | ||
2 | * Copyright (C) 2011 Samsung Electronics Co.Ltd | ||
3 | * http://www.samsung.com/ | ||
4 | * | ||
5 | * This program is free software; you can redistribute it and/or modify it | ||
6 | * under the terms of the GNU General Public License as published by the | ||
7 | * Free Software Foundation; either version 2 of the License, or (at your | ||
8 | * option) any later version. | ||
9 | */ | ||
10 | |||
11 | #ifndef __MACH_EXYNOS_OHCI_H | ||
12 | #define __MACH_EXYNOS_OHCI_H | ||
13 | |||
14 | struct exynos4_ohci_platdata { | ||
15 | int (*phy_init)(struct platform_device *pdev, int type); | ||
16 | int (*phy_exit)(struct platform_device *pdev, int type); | ||
17 | }; | ||
18 | |||
19 | extern void exynos4_ohci_set_platdata(struct exynos4_ohci_platdata *pd); | ||
20 | |||
21 | #endif /* __MACH_EXYNOS_OHCI_H */ | ||
diff --git a/arch/arm/mach-exynos/mach-origen.c b/arch/arm/mach-exynos/mach-origen.c index f80b563f2be7..b805e595cc35 100644 --- a/arch/arm/mach-exynos/mach-origen.c +++ b/arch/arm/mach-exynos/mach-origen.c | |||
@@ -41,6 +41,7 @@ | |||
41 | #include <plat/fb.h> | 41 | #include <plat/fb.h> |
42 | #include <plat/mfc.h> | 42 | #include <plat/mfc.h> |
43 | 43 | ||
44 | #include <mach/ohci.h> | ||
44 | #include <mach/map.h> | 45 | #include <mach/map.h> |
45 | 46 | ||
46 | /* Following are default values for UCON, ULCON and UFCON UART registers */ | 47 | /* Following are default values for UCON, ULCON and UFCON UART registers */ |
@@ -483,6 +484,16 @@ static void __init origen_ehci_init(void) | |||
483 | s5p_ehci_set_platdata(pdata); | 484 | s5p_ehci_set_platdata(pdata); |
484 | } | 485 | } |
485 | 486 | ||
487 | /* USB OHCI */ | ||
488 | static struct exynos4_ohci_platdata origen_ohci_pdata; | ||
489 | |||
490 | static void __init origen_ohci_init(void) | ||
491 | { | ||
492 | struct exynos4_ohci_platdata *pdata = &origen_ohci_pdata; | ||
493 | |||
494 | exynos4_ohci_set_platdata(pdata); | ||
495 | } | ||
496 | |||
486 | static struct gpio_keys_button origen_gpio_keys_table[] = { | 497 | static struct gpio_keys_button origen_gpio_keys_table[] = { |
487 | { | 498 | { |
488 | .code = KEY_MENU, | 499 | .code = KEY_MENU, |
@@ -606,6 +617,7 @@ static struct platform_device *origen_devices[] __initdata = { | |||
606 | &s5p_device_mfc_l, | 617 | &s5p_device_mfc_l, |
607 | &s5p_device_mfc_r, | 618 | &s5p_device_mfc_r, |
608 | &s5p_device_mixer, | 619 | &s5p_device_mixer, |
620 | &exynos4_device_ohci, | ||
609 | &exynos4_device_pd[PD_LCD0], | 621 | &exynos4_device_pd[PD_LCD0], |
610 | &exynos4_device_pd[PD_TV], | 622 | &exynos4_device_pd[PD_TV], |
611 | &exynos4_device_pd[PD_G3D], | 623 | &exynos4_device_pd[PD_G3D], |
@@ -670,6 +682,7 @@ static void __init origen_machine_init(void) | |||
670 | s3c_sdhci0_set_platdata(&origen_hsmmc0_pdata); | 682 | s3c_sdhci0_set_platdata(&origen_hsmmc0_pdata); |
671 | 683 | ||
672 | origen_ehci_init(); | 684 | origen_ehci_init(); |
685 | origen_ohci_init(); | ||
673 | clk_xusbxti.rate = 24000000; | 686 | clk_xusbxti.rate = 24000000; |
674 | 687 | ||
675 | s5p_tv_setup(); | 688 | s5p_tv_setup(); |
diff --git a/arch/arm/mach-exynos/mach-smdkv310.c b/arch/arm/mach-exynos/mach-smdkv310.c index cec2afabe7b4..25a5a405c4bf 100644 --- a/arch/arm/mach-exynos/mach-smdkv310.c +++ b/arch/arm/mach-exynos/mach-smdkv310.c | |||
@@ -42,6 +42,7 @@ | |||
42 | #include <plat/clock.h> | 42 | #include <plat/clock.h> |
43 | 43 | ||
44 | #include <mach/map.h> | 44 | #include <mach/map.h> |
45 | #include <mach/ohci.h> | ||
45 | 46 | ||
46 | /* Following are default values for UCON, ULCON and UFCON UART registers */ | 47 | /* Following are default values for UCON, ULCON and UFCON UART registers */ |
47 | #define SMDKV310_UCON_DEFAULT (S3C2410_UCON_TXILEVEL | \ | 48 | #define SMDKV310_UCON_DEFAULT (S3C2410_UCON_TXILEVEL | \ |
@@ -245,6 +246,16 @@ static void __init smdkv310_ehci_init(void) | |||
245 | s5p_ehci_set_platdata(pdata); | 246 | s5p_ehci_set_platdata(pdata); |
246 | } | 247 | } |
247 | 248 | ||
249 | /* USB OHCI */ | ||
250 | static struct exynos4_ohci_platdata smdkv310_ohci_pdata; | ||
251 | |||
252 | static void __init smdkv310_ohci_init(void) | ||
253 | { | ||
254 | struct exynos4_ohci_platdata *pdata = &smdkv310_ohci_pdata; | ||
255 | |||
256 | exynos4_ohci_set_platdata(pdata); | ||
257 | } | ||
258 | |||
248 | static struct platform_device *smdkv310_devices[] __initdata = { | 259 | static struct platform_device *smdkv310_devices[] __initdata = { |
249 | &s3c_device_hsmmc0, | 260 | &s3c_device_hsmmc0, |
250 | &s3c_device_hsmmc1, | 261 | &s3c_device_hsmmc1, |
@@ -261,6 +272,7 @@ static struct platform_device *smdkv310_devices[] __initdata = { | |||
261 | &s5p_device_fimc3, | 272 | &s5p_device_fimc3, |
262 | &exynos4_device_ac97, | 273 | &exynos4_device_ac97, |
263 | &exynos4_device_i2s0, | 274 | &exynos4_device_i2s0, |
275 | &exynos4_device_ohci, | ||
264 | &samsung_device_keypad, | 276 | &samsung_device_keypad, |
265 | &s5p_device_mfc, | 277 | &s5p_device_mfc, |
266 | &s5p_device_mfc_l, | 278 | &s5p_device_mfc_l, |
@@ -363,6 +375,7 @@ static void __init smdkv310_machine_init(void) | |||
363 | s5p_fimd0_set_platdata(&smdkv310_lcd0_pdata); | 375 | s5p_fimd0_set_platdata(&smdkv310_lcd0_pdata); |
364 | 376 | ||
365 | smdkv310_ehci_init(); | 377 | smdkv310_ehci_init(); |
378 | smdkv310_ohci_init(); | ||
366 | clk_xusbxti.rate = 24000000; | 379 | clk_xusbxti.rate = 24000000; |
367 | 380 | ||
368 | platform_add_devices(smdkv310_devices, ARRAY_SIZE(smdkv310_devices)); | 381 | platform_add_devices(smdkv310_devices, ARRAY_SIZE(smdkv310_devices)); |
diff --git a/arch/arm/mach-exynos/setup-usb-phy.c b/arch/arm/mach-exynos/setup-usb-phy.c index 39aca045f660..41743d21e8c6 100644 --- a/arch/arm/mach-exynos/setup-usb-phy.c +++ b/arch/arm/mach-exynos/setup-usb-phy.c | |||
@@ -19,6 +19,13 @@ | |||
19 | #include <plat/cpu.h> | 19 | #include <plat/cpu.h> |
20 | #include <plat/usb-phy.h> | 20 | #include <plat/usb-phy.h> |
21 | 21 | ||
22 | static atomic_t host_usage; | ||
23 | |||
24 | static int exynos4_usb_host_phy_is_on(void) | ||
25 | { | ||
26 | return (readl(EXYNOS4_PHYPWR) & PHY1_STD_ANALOG_POWERDOWN) ? 0 : 1; | ||
27 | } | ||
28 | |||
22 | static int exynos4_usb_phy1_init(struct platform_device *pdev) | 29 | static int exynos4_usb_phy1_init(struct platform_device *pdev) |
23 | { | 30 | { |
24 | struct clk *otg_clk; | 31 | struct clk *otg_clk; |
@@ -27,6 +34,8 @@ static int exynos4_usb_phy1_init(struct platform_device *pdev) | |||
27 | u32 rstcon; | 34 | u32 rstcon; |
28 | int err; | 35 | int err; |
29 | 36 | ||
37 | atomic_inc(&host_usage); | ||
38 | |||
30 | otg_clk = clk_get(&pdev->dev, "otg"); | 39 | otg_clk = clk_get(&pdev->dev, "otg"); |
31 | if (IS_ERR(otg_clk)) { | 40 | if (IS_ERR(otg_clk)) { |
32 | dev_err(&pdev->dev, "Failed to get otg clock\n"); | 41 | dev_err(&pdev->dev, "Failed to get otg clock\n"); |
@@ -39,6 +48,9 @@ static int exynos4_usb_phy1_init(struct platform_device *pdev) | |||
39 | return err; | 48 | return err; |
40 | } | 49 | } |
41 | 50 | ||
51 | if (exynos4_usb_host_phy_is_on()) | ||
52 | return 0; | ||
53 | |||
42 | writel(readl(S5P_USBHOST_PHY_CONTROL) | S5P_USBHOST_PHY_ENABLE, | 54 | writel(readl(S5P_USBHOST_PHY_CONTROL) | S5P_USBHOST_PHY_ENABLE, |
43 | S5P_USBHOST_PHY_CONTROL); | 55 | S5P_USBHOST_PHY_CONTROL); |
44 | 56 | ||
@@ -95,6 +107,9 @@ static int exynos4_usb_phy1_exit(struct platform_device *pdev) | |||
95 | struct clk *otg_clk; | 107 | struct clk *otg_clk; |
96 | int err; | 108 | int err; |
97 | 109 | ||
110 | if (atomic_dec_return(&host_usage) > 0) | ||
111 | return 0; | ||
112 | |||
98 | otg_clk = clk_get(&pdev->dev, "otg"); | 113 | otg_clk = clk_get(&pdev->dev, "otg"); |
99 | if (IS_ERR(otg_clk)) { | 114 | if (IS_ERR(otg_clk)) { |
100 | dev_err(&pdev->dev, "Failed to get otg clock\n"); | 115 | dev_err(&pdev->dev, "Failed to get otg clock\n"); |
diff --git a/arch/arm/plat-samsung/include/plat/devs.h b/arch/arm/plat-samsung/include/plat/devs.h index ab633c9c2aec..a2ff27e3ec30 100644 --- a/arch/arm/plat-samsung/include/plat/devs.h +++ b/arch/arm/plat-samsung/include/plat/devs.h | |||
@@ -129,6 +129,7 @@ extern struct platform_device exynos4_device_dwmci; | |||
129 | extern struct platform_device exynos4_device_i2s0; | 129 | extern struct platform_device exynos4_device_i2s0; |
130 | extern struct platform_device exynos4_device_i2s1; | 130 | extern struct platform_device exynos4_device_i2s1; |
131 | extern struct platform_device exynos4_device_i2s2; | 131 | extern struct platform_device exynos4_device_i2s2; |
132 | extern struct platform_device exynos4_device_ohci; | ||
132 | extern struct platform_device exynos4_device_pcm0; | 133 | extern struct platform_device exynos4_device_pcm0; |
133 | extern struct platform_device exynos4_device_pcm1; | 134 | extern struct platform_device exynos4_device_pcm1; |
134 | extern struct platform_device exynos4_device_pcm2; | 135 | extern struct platform_device exynos4_device_pcm2; |
diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig index 791f11bed606..75823a1abeb6 100644 --- a/drivers/usb/Kconfig +++ b/drivers/usb/Kconfig | |||
@@ -48,6 +48,7 @@ config USB_ARCH_HAS_OHCI | |||
48 | default y if ARCH_DAVINCI_DA8XX | 48 | default y if ARCH_DAVINCI_DA8XX |
49 | default y if ARCH_CNS3XXX | 49 | default y if ARCH_CNS3XXX |
50 | default y if PLAT_SPEAR | 50 | default y if PLAT_SPEAR |
51 | default y if ARCH_EXYNOS | ||
51 | # PPC: | 52 | # PPC: |
52 | default y if STB03xxx | 53 | default y if STB03xxx |
53 | default y if PPC_MPC52xx | 54 | default y if PPC_MPC52xx |
diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig index 060e0e2b1ae6..eea85dc16826 100644 --- a/drivers/usb/host/Kconfig +++ b/drivers/usb/host/Kconfig | |||
@@ -371,6 +371,12 @@ config USB_OHCI_SH | |||
371 | Enables support for the on-chip OHCI controller on the SuperH. | 371 | Enables support for the on-chip OHCI controller on the SuperH. |
372 | If you use the PCI OHCI controller, this option is not necessary. | 372 | If you use the PCI OHCI controller, this option is not necessary. |
373 | 373 | ||
374 | config USB_OHCI_EXYNOS | ||
375 | boolean "OHCI support for Samsung EXYNOS SoC Series" | ||
376 | depends on USB_OHCI_HCD && ARCH_EXYNOS | ||
377 | help | ||
378 | Enable support for the Samsung Exynos SOC's on-chip OHCI controller. | ||
379 | |||
374 | config USB_CNS3XXX_OHCI | 380 | config USB_CNS3XXX_OHCI |
375 | bool "Cavium CNS3XXX OHCI Module" | 381 | bool "Cavium CNS3XXX OHCI Module" |
376 | depends on USB_OHCI_HCD && ARCH_CNS3XXX | 382 | depends on USB_OHCI_HCD && ARCH_CNS3XXX |
diff --git a/drivers/usb/host/ohci-exynos.c b/drivers/usb/host/ohci-exynos.c new file mode 100644 index 000000000000..55aa35aa3d7b --- /dev/null +++ b/drivers/usb/host/ohci-exynos.c | |||
@@ -0,0 +1,274 @@ | |||
1 | /* | ||
2 | * SAMSUNG EXYNOS USB HOST OHCI Controller | ||
3 | * | ||
4 | * Copyright (C) 2011 Samsung Electronics Co.Ltd | ||
5 | * Author: Jingoo Han <jg1.han@samsung.com> | ||
6 | * | ||
7 | * This program is free software; you can redistribute it and/or modify it | ||
8 | * under the terms of the GNU General Public License as published by the | ||
9 | * Free Software Foundation; either version 2 of the License, or (at your | ||
10 | * option) any later version. | ||
11 | * | ||
12 | */ | ||
13 | |||
14 | #include <linux/clk.h> | ||
15 | #include <linux/platform_device.h> | ||
16 | #include <mach/ohci.h> | ||
17 | #include <plat/usb-phy.h> | ||
18 | |||
19 | struct exynos_ohci_hcd { | ||
20 | struct device *dev; | ||
21 | struct usb_hcd *hcd; | ||
22 | struct clk *clk; | ||
23 | }; | ||
24 | |||
25 | static int ohci_exynos_start(struct usb_hcd *hcd) | ||
26 | { | ||
27 | struct ohci_hcd *ohci = hcd_to_ohci(hcd); | ||
28 | int ret; | ||
29 | |||
30 | ohci_dbg(ohci, "ohci_exynos_start, ohci:%p", ohci); | ||
31 | |||
32 | ret = ohci_init(ohci); | ||
33 | if (ret < 0) | ||
34 | return ret; | ||
35 | |||
36 | ret = ohci_run(ohci); | ||
37 | if (ret < 0) { | ||
38 | err("can't start %s", hcd->self.bus_name); | ||
39 | ohci_stop(hcd); | ||
40 | return ret; | ||
41 | } | ||
42 | |||
43 | return 0; | ||
44 | } | ||
45 | |||
46 | static const struct hc_driver exynos_ohci_hc_driver = { | ||
47 | .description = hcd_name, | ||
48 | .product_desc = "EXYNOS OHCI Host Controller", | ||
49 | .hcd_priv_size = sizeof(struct ohci_hcd), | ||
50 | |||
51 | .irq = ohci_irq, | ||
52 | .flags = HCD_MEMORY|HCD_USB11, | ||
53 | |||
54 | .start = ohci_exynos_start, | ||
55 | .stop = ohci_stop, | ||
56 | .shutdown = ohci_shutdown, | ||
57 | |||
58 | .get_frame_number = ohci_get_frame, | ||
59 | |||
60 | .urb_enqueue = ohci_urb_enqueue, | ||
61 | .urb_dequeue = ohci_urb_dequeue, | ||
62 | .endpoint_disable = ohci_endpoint_disable, | ||
63 | |||
64 | .hub_status_data = ohci_hub_status_data, | ||
65 | .hub_control = ohci_hub_control, | ||
66 | #ifdef CONFIG_PM | ||
67 | .bus_suspend = ohci_bus_suspend, | ||
68 | .bus_resume = ohci_bus_resume, | ||
69 | #endif | ||
70 | .start_port_reset = ohci_start_port_reset, | ||
71 | }; | ||
72 | |||
73 | static int __devinit exynos_ohci_probe(struct platform_device *pdev) | ||
74 | { | ||
75 | struct exynos4_ohci_platdata *pdata; | ||
76 | struct exynos_ohci_hcd *exynos_ohci; | ||
77 | struct usb_hcd *hcd; | ||
78 | struct ohci_hcd *ohci; | ||
79 | struct resource *res; | ||
80 | int irq; | ||
81 | int err; | ||
82 | |||
83 | pdata = pdev->dev.platform_data; | ||
84 | if (!pdata) { | ||
85 | dev_err(&pdev->dev, "No platform data defined\n"); | ||
86 | return -EINVAL; | ||
87 | } | ||
88 | |||
89 | exynos_ohci = kzalloc(sizeof(struct exynos_ohci_hcd), GFP_KERNEL); | ||
90 | if (!exynos_ohci) | ||
91 | return -ENOMEM; | ||
92 | |||
93 | exynos_ohci->dev = &pdev->dev; | ||
94 | |||
95 | hcd = usb_create_hcd(&exynos_ohci_hc_driver, &pdev->dev, | ||
96 | dev_name(&pdev->dev)); | ||
97 | if (!hcd) { | ||
98 | dev_err(&pdev->dev, "Unable to create HCD\n"); | ||
99 | err = -ENOMEM; | ||
100 | goto fail_hcd; | ||
101 | } | ||
102 | |||
103 | exynos_ohci->hcd = hcd; | ||
104 | exynos_ohci->clk = clk_get(&pdev->dev, "usbhost"); | ||
105 | |||
106 | if (IS_ERR(exynos_ohci->clk)) { | ||
107 | dev_err(&pdev->dev, "Failed to get usbhost clock\n"); | ||
108 | err = PTR_ERR(exynos_ohci->clk); | ||
109 | goto fail_clk; | ||
110 | } | ||
111 | |||
112 | err = clk_enable(exynos_ohci->clk); | ||
113 | if (err) | ||
114 | goto fail_clken; | ||
115 | |||
116 | res = platform_get_resource(pdev, IORESOURCE_MEM, 0); | ||
117 | if (!res) { | ||
118 | dev_err(&pdev->dev, "Failed to get I/O memory\n"); | ||
119 | err = -ENXIO; | ||
120 | goto fail_io; | ||
121 | } | ||
122 | |||
123 | hcd->rsrc_start = res->start; | ||
124 | hcd->rsrc_len = resource_size(res); | ||
125 | hcd->regs = ioremap(res->start, resource_size(res)); | ||
126 | if (!hcd->regs) { | ||
127 | dev_err(&pdev->dev, "Failed to remap I/O memory\n"); | ||
128 | err = -ENOMEM; | ||
129 | goto fail_io; | ||
130 | } | ||
131 | |||
132 | irq = platform_get_irq(pdev, 0); | ||
133 | if (!irq) { | ||
134 | dev_err(&pdev->dev, "Failed to get IRQ\n"); | ||
135 | err = -ENODEV; | ||
136 | goto fail; | ||
137 | } | ||
138 | |||
139 | if (pdata->phy_init) | ||
140 | pdata->phy_init(pdev, S5P_USB_PHY_HOST); | ||
141 | |||
142 | ohci = hcd_to_ohci(hcd); | ||
143 | ohci_hcd_init(ohci); | ||
144 | |||
145 | err = usb_add_hcd(hcd, irq, IRQF_SHARED); | ||
146 | if (err) { | ||
147 | dev_err(&pdev->dev, "Failed to add USB HCD\n"); | ||
148 | goto fail; | ||
149 | } | ||
150 | |||
151 | platform_set_drvdata(pdev, exynos_ohci); | ||
152 | |||
153 | return 0; | ||
154 | |||
155 | fail: | ||
156 | iounmap(hcd->regs); | ||
157 | fail_io: | ||
158 | clk_disable(exynos_ohci->clk); | ||
159 | fail_clken: | ||
160 | clk_put(exynos_ohci->clk); | ||
161 | fail_clk: | ||
162 | usb_put_hcd(hcd); | ||
163 | fail_hcd: | ||
164 | kfree(exynos_ohci); | ||
165 | return err; | ||
166 | } | ||
167 | |||
168 | static int __devexit exynos_ohci_remove(struct platform_device *pdev) | ||
169 | { | ||
170 | struct exynos4_ohci_platdata *pdata = pdev->dev.platform_data; | ||
171 | struct exynos_ohci_hcd *exynos_ohci = platform_get_drvdata(pdev); | ||
172 | struct usb_hcd *hcd = exynos_ohci->hcd; | ||
173 | |||
174 | usb_remove_hcd(hcd); | ||
175 | |||
176 | if (pdata && pdata->phy_exit) | ||
177 | pdata->phy_exit(pdev, S5P_USB_PHY_HOST); | ||
178 | |||
179 | iounmap(hcd->regs); | ||
180 | |||
181 | clk_disable(exynos_ohci->clk); | ||
182 | clk_put(exynos_ohci->clk); | ||
183 | |||
184 | usb_put_hcd(hcd); | ||
185 | kfree(exynos_ohci); | ||
186 | |||
187 | return 0; | ||
188 | } | ||
189 | |||
190 | static void exynos_ohci_shutdown(struct platform_device *pdev) | ||
191 | { | ||
192 | struct exynos_ohci_hcd *exynos_ohci = platform_get_drvdata(pdev); | ||
193 | struct usb_hcd *hcd = exynos_ohci->hcd; | ||
194 | |||
195 | if (hcd->driver->shutdown) | ||
196 | hcd->driver->shutdown(hcd); | ||
197 | } | ||
198 | |||
199 | #ifdef CONFIG_PM | ||
200 | static int exynos_ohci_suspend(struct device *dev) | ||
201 | { | ||
202 | struct exynos_ohci_hcd *exynos_ohci = dev_get_drvdata(dev); | ||
203 | struct usb_hcd *hcd = exynos_ohci->hcd; | ||
204 | struct ohci_hcd *ohci = hcd_to_ohci(hcd); | ||
205 | struct platform_device *pdev = to_platform_device(dev); | ||
206 | struct exynos4_ohci_platdata *pdata = pdev->dev.platform_data; | ||
207 | unsigned long flags; | ||
208 | int rc = 0; | ||
209 | |||
210 | /* | ||
211 | * Root hub was already suspended. Disable irq emission and | ||
212 | * mark HW unaccessible, bail out if RH has been resumed. Use | ||
213 | * the spinlock to properly synchronize with possible pending | ||
214 | * RH suspend or resume activity. | ||
215 | * | ||
216 | * This is still racy as hcd->state is manipulated outside of | ||
217 | * any locks =P But that will be a different fix. | ||
218 | */ | ||
219 | spin_lock_irqsave(&ohci->lock, flags); | ||
220 | if (hcd->state != HC_STATE_SUSPENDED && hcd->state != HC_STATE_HALT) { | ||
221 | rc = -EINVAL; | ||
222 | goto fail; | ||
223 | } | ||
224 | |||
225 | clear_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags); | ||
226 | |||
227 | if (pdata && pdata->phy_exit) | ||
228 | pdata->phy_exit(pdev, S5P_USB_PHY_HOST); | ||
229 | fail: | ||
230 | spin_unlock_irqrestore(&ohci->lock, flags); | ||
231 | |||
232 | return rc; | ||
233 | } | ||
234 | |||
235 | static int exynos_ohci_resume(struct device *dev) | ||
236 | { | ||
237 | struct exynos_ohci_hcd *exynos_ohci = dev_get_drvdata(dev); | ||
238 | struct usb_hcd *hcd = exynos_ohci->hcd; | ||
239 | struct platform_device *pdev = to_platform_device(dev); | ||
240 | struct exynos4_ohci_platdata *pdata = pdev->dev.platform_data; | ||
241 | |||
242 | if (pdata && pdata->phy_init) | ||
243 | pdata->phy_init(pdev, S5P_USB_PHY_HOST); | ||
244 | |||
245 | /* Mark hardware accessible again as we are out of D3 state by now */ | ||
246 | set_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags); | ||
247 | |||
248 | ohci_finish_controller_resume(hcd); | ||
249 | |||
250 | return 0; | ||
251 | } | ||
252 | #else | ||
253 | #define exynos_ohci_suspend NULL | ||
254 | #define exynos_ohci_resume NULL | ||
255 | #endif | ||
256 | |||
257 | static const struct dev_pm_ops exynos_ohci_pm_ops = { | ||
258 | .suspend = exynos_ohci_suspend, | ||
259 | .resume = exynos_ohci_resume, | ||
260 | }; | ||
261 | |||
262 | static struct platform_driver exynos_ohci_driver = { | ||
263 | .probe = exynos_ohci_probe, | ||
264 | .remove = __devexit_p(exynos_ohci_remove), | ||
265 | .shutdown = exynos_ohci_shutdown, | ||
266 | .driver = { | ||
267 | .name = "exynos-ohci", | ||
268 | .owner = THIS_MODULE, | ||
269 | .pm = &exynos_ohci_pm_ops, | ||
270 | } | ||
271 | }; | ||
272 | |||
273 | MODULE_ALIAS("platform:exynos-ohci"); | ||
274 | MODULE_AUTHOR("Jingoo Han <jg1.han@samsung.com>"); | ||
diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c index b2639191549e..a1006ff79384 100644 --- a/drivers/usb/host/ohci-hcd.c +++ b/drivers/usb/host/ohci-hcd.c | |||
@@ -1005,6 +1005,11 @@ MODULE_LICENSE ("GPL"); | |||
1005 | #define PLATFORM_DRIVER ohci_hcd_s3c2410_driver | 1005 | #define PLATFORM_DRIVER ohci_hcd_s3c2410_driver |
1006 | #endif | 1006 | #endif |
1007 | 1007 | ||
1008 | #ifdef CONFIG_USB_OHCI_EXYNOS | ||
1009 | #include "ohci-exynos.c" | ||
1010 | #define PLATFORM_DRIVER exynos_ohci_driver | ||
1011 | #endif | ||
1012 | |||
1008 | #ifdef CONFIG_USB_OHCI_HCD_OMAP1 | 1013 | #ifdef CONFIG_USB_OHCI_HCD_OMAP1 |
1009 | #include "ohci-omap.c" | 1014 | #include "ohci-omap.c" |
1010 | #define OMAP1_PLATFORM_DRIVER ohci_hcd_omap_driver | 1015 | #define OMAP1_PLATFORM_DRIVER ohci_hcd_omap_driver |