| Message ID | 1319704608-8646-4-git-send-email-l.majewski@samsung.com |
|---|---|
| State | Superseded |
| Headers | show |
Hi, 2011/10/27 Lukasz Majewski <l.majewski@samsung.com>: > This commit enables support for USB Gadgets on the 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> > --- > Depend on: "New generic PMIC framework" > > http://patchwork.ozlabs.org/patch/118071/ > http://patchwork.ozlabs.org/patch/117565/ > http://patchwork.ozlabs.org/patch/117563/ > > tools/checkpatch.pl - > total: 0 errors, 0 warnings, 74 lines checked Applied to u-boot-usb Remy
Hi Lukasz, 2011/11/27 Remy Bohmer <linux@bohmer.net>: > Hi, > > 2011/10/27 Lukasz Majewski <l.majewski@samsung.com>: >> This commit enables support for USB Gadgets on the 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> >> --- >> Depend on: "New generic PMIC framework" >> >> http://patchwork.ozlabs.org/patch/118071/ >> http://patchwork.ozlabs.org/patch/117565/ >> http://patchwork.ozlabs.org/patch/117563/ >> >> tools/checkpatch.pl - >> total: 0 errors, 0 warnings, 74 lines checked > > Applied to u-boot-usb Unfortunately this patch conflicts a rename action and therefor it I cannot push it further upstream. Can you please rebase this change on u-boot-usb/master? Kind regards, Remy
diff --git a/arch/arm/include/asm/arch-s5pc2xx/cpu.h b/arch/arm/include/asm/arch-s5pc2xx/cpu.h index f9015c7..615513f 100644 --- a/arch/arm/include/asm/arch-s5pc2xx/cpu.h +++ b/arch/arm/include/asm/arch-s5pc2xx/cpu.h @@ -46,6 +46,9 @@ #define S5PC210_ADC_BASE 0x13910000 #define S5PC210_PWMTIMER_BASE 0x139D0000 #define S5PC210_MODEM_BASE 0x13A00000 +#define S5PC210_OTG_BASE 0x12480000 +#define S5PC210_PHY_BASE 0x125B0000 +#define S5PC210_USB_PHY_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 d767eaa..a693047 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 = S5PC210_PHY_BASE, + .regs_otg = S5PC210_OTG_BASE, + .usb_phy_ctrl = S5PC210_USB_PHY_CONTROL, + .usb_flags = PHY0_SLEEP, +}; +#endif diff --git a/include/configs/s5pc210_universal.h b/include/configs/s5pc210_universal.h index cc14f97..d94f977 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 */