| Message ID | 1323880913-3655-1-git-send-email-l.majewski@samsung.com |
|---|---|
| State | Superseded |
| Delegated to: | Remy Bohmer |
| Headers | show |
Dear Lukasz Majewski, On 15 December 2011 01:41, Lukasz Majewski <l.majewski@samsung.com> wrote: > This commit enables support for USB Gadgets on the Exynos4210 (C210 Universal) > reference target. > > Signed-off-by: Lukasz Majewski <l.majewski@samsung.com> > Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> > Cc: Minkyu Kang <mk7.kang@samsung.com> > CC: Remy Bohmer <linux@bohmer.net> > --- > Changes for v2: > - Rename the S5PC210_Universal to Exynos4210 > --- > /checkpatch.pl - > total: 0 errors, 0 warnings, 72 lines checked > > --- > arch/arm/include/asm/arch-exynos/cpu.h | 1 + > board/samsung/universal_c210/universal.c | 48 ++++++++++++++++++++++++++++++ > include/configs/s5pc210_universal.h | 4 ++ > 3 files changed, 53 insertions(+), 0 deletions(-) > > diff --git a/board/samsung/universal_c210/universal.c b/board/samsung/universal_c210/universal.c > index f9b8a76..1f5b454 100644 > --- a/board/samsung/universal_c210/universal.c > +++ b/board/samsung/universal_c210/universal.c > @@ -28,6 +28,9 @@ > #include <asm/arch/gpio.h> > #include <asm/arch/mmc.h> > #include <pmic.h> > +#include <usb/s3c_udc.h> > +#include <asm/arch/cpu.h> > +#include <max8998_pmic.h> > > DECLARE_GLOBAL_DATA_PTR; > > @@ -253,3 +256,48 @@ int board_mmc_init(bd_t *bis) > > } > #endif > + > +#ifdef CONFIG_USB_GADGET > +static int s5pc210_phy_control(int on) > +{ > + int ret; > + static int status; > + struct pmic *p = get_pmic(); > + > + if (pmic_probe(p)) > + return -1; > + > + if (on && !status) { No. Don't need to check status. There are possibility that LDO values are changed, so please go on without checking status. > + ret = pmic_set_output(p, MAX8998_REG_ONOFF1, > + MAX8998_LDO3, LDO_ON); > + ret = pmic_set_output(p, MAX8998_REG_ONOFF2, > + MAX8998_LDO8, LDO_ON); > + if (ret) { Then, how to handle the result of LDO3? And we should on or off the SAFEOUT1 also. > + puts("MAX8998 LDO setting error!\n"); > + return -1; > + } > + status = 1; > + } else if (!on && status) { > + ret = pmic_set_output(p, MAX8998_REG_ONOFF1, > + MAX8998_LDO3, LDO_OFF); > + ret = pmic_set_output(p, MAX8998_REG_ONOFF2, > + MAX8998_LDO8, LDO_OFF); > + if (ret) { > + puts("MAX8998 LDO setting error!\n"); > + return -1; > + } > + status = 0; > + } > + udelay(10000); Why need the delay here? > + > + return 0; > +} > + > +struct s3c_plat_otg_data s5pc210_otg_data = { > + .phy_control = s5pc210_phy_control, > + .regs_phy = EXYNOS4_USBPHY_BASE, > + .regs_otg = EXYNOS4_USBOTG_BASE, > + .usb_phy_ctrl = EXYNOS4_USBPHY_CONTROL, > + .usb_flags = PHY0_SLEEP, > +}; > +#endif Thanks, Minkyu Kang.
diff --git a/arch/arm/include/asm/arch-exynos/cpu.h b/arch/arm/include/asm/arch-exynos/cpu.h index 4464d27..6d97b99 100644 --- a/arch/arm/include/asm/arch-exynos/cpu.h +++ b/arch/arm/include/asm/arch-exynos/cpu.h @@ -46,6 +46,7 @@ #define EXYNOS4_ADC_BASE 0x13910000 #define EXYNOS4_PWMTIMER_BASE 0x139D0000 #define EXYNOS4_MODEM_BASE 0x13A00000 +#define EXYNOS4_USBPHY_CONTROL 0x10020704 #ifndef __ASSEMBLY__ #include <asm/io.h> diff --git a/board/samsung/universal_c210/universal.c b/board/samsung/universal_c210/universal.c index f9b8a76..1f5b454 100644 --- a/board/samsung/universal_c210/universal.c +++ b/board/samsung/universal_c210/universal.c @@ -28,6 +28,9 @@ #include <asm/arch/gpio.h> #include <asm/arch/mmc.h> #include <pmic.h> +#include <usb/s3c_udc.h> +#include <asm/arch/cpu.h> +#include <max8998_pmic.h> DECLARE_GLOBAL_DATA_PTR; @@ -253,3 +256,48 @@ int board_mmc_init(bd_t *bis) } #endif + +#ifdef CONFIG_USB_GADGET +static int s5pc210_phy_control(int on) +{ + int ret; + static int status; + struct pmic *p = get_pmic(); + + if (pmic_probe(p)) + return -1; + + if (on && !status) { + ret = pmic_set_output(p, MAX8998_REG_ONOFF1, + MAX8998_LDO3, LDO_ON); + ret = pmic_set_output(p, MAX8998_REG_ONOFF2, + MAX8998_LDO8, LDO_ON); + if (ret) { + puts("MAX8998 LDO setting error!\n"); + return -1; + } + status = 1; + } else if (!on && status) { + ret = pmic_set_output(p, MAX8998_REG_ONOFF1, + MAX8998_LDO3, LDO_OFF); + ret = pmic_set_output(p, MAX8998_REG_ONOFF2, + MAX8998_LDO8, LDO_OFF); + if (ret) { + puts("MAX8998 LDO setting error!\n"); + return -1; + } + status = 0; + } + udelay(10000); + + return 0; +} + +struct s3c_plat_otg_data s5pc210_otg_data = { + .phy_control = s5pc210_phy_control, + .regs_phy = EXYNOS4_USBPHY_BASE, + .regs_otg = EXYNOS4_USBOTG_BASE, + .usb_phy_ctrl = EXYNOS4_USBPHY_CONTROL, + .usb_flags = PHY0_SLEEP, +}; +#endif diff --git a/include/configs/s5pc210_universal.h b/include/configs/s5pc210_universal.h index b36ad3a..be000cb 100644 --- a/include/configs/s5pc210_universal.h +++ b/include/configs/s5pc210_universal.h @@ -262,4 +262,8 @@ #define CONFIG_PMIC_I2C #define CONFIG_PMIC_MAX8998 +#define CONFIG_USB_GADGET +#define CONFIG_USB_GADGET_S3C_UDC_OTG +#define CONFIG_USB_GADGET_DUALSPEED + #endif /* __CONFIG_H */