From patchwork Wed Apr 10 12:07:53 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Piotr Wilczek X-Patchwork-Id: 235381 X-Patchwork-Delegate: promsoft@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id EEAB02C00BD for ; Wed, 10 Apr 2013 22:08:57 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id A75A24A056; Wed, 10 Apr 2013 14:08:53 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id TVbe8VeIow3N; Wed, 10 Apr 2013 14:08:53 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id F05A74A03B; Wed, 10 Apr 2013 14:08:37 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 00DA14A02D for ; Wed, 10 Apr 2013 14:08:34 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id jtRjewvK3PbE for ; Wed, 10 Apr 2013 14:08:32 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mailout2.samsung.com (mailout2.samsung.com [203.254.224.25]) by theia.denx.de (Postfix) with ESMTP id DF94C4A02F for ; Wed, 10 Apr 2013 14:08:25 +0200 (CEST) Received: from epcpsbgm2.samsung.com (epcpsbgm2 [203.254.230.27]) by mailout2.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0ML100HNGGDNJLI0@mailout2.samsung.com> for u-boot@lists.denx.de; Wed, 10 Apr 2013 21:08:24 +0900 (KST) X-AuditID: cbfee61b-b7f076d0000034b6-d7-5165563832b1 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 52.94.13494.83655615; Wed, 10 Apr 2013 21:08:24 +0900 (KST) Received: from mcdsrvbld02.digital.local ([106.116.37.23]) by mmp1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0ML1004ZLGD7WO10@mmp1.samsung.com>; Wed, 10 Apr 2013 21:08:24 +0900 (KST) From: Piotr Wilczek To: u-boot@lists.denx.de Date: Wed, 10 Apr 2013 14:07:53 +0200 Message-id: <1365595673-23272-5-git-send-email-p.wilczek@samsung.com> X-Mailer: git-send-email 1.7.10 In-reply-to: <1365595673-23272-1-git-send-email-p.wilczek@samsung.com> References: <1365595673-23272-1-git-send-email-p.wilczek@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrNJMWRmVeSWpSXmKPExsVy+t9jAV2LsNRAg/0LxCzONr1ht3jzcDOj RceRFkaLdU/Wslq83dvJ7sDqcfbODkaPvi2rGAOYorhsUlJzMstSi/TtErgynk7vZCp4oFEx eUpBA+MaxS5GTg4JAROJtsXPmSFsMYkL99azdTFycQgJLGKU2P/nJztIQkigi0niyjkOEJtN QFti+Zs3jCC2iICExK/+q4wgDcwCyxglGhp+gzUIC1hKnPs2gQnEZhFQlbjVugHM5hVwlTjd 2MAOsU1e4un9PjYQm1PATeLiyy1sEMtcJRacXcA+gZF3ASPDKkbR1ILkguKk9FwjveLE3OLS vHS95PzcTYzgIHkmvYNxVYPFIUYBDkYlHt4FhimBQqyJZcWVuYcYJTiYlUR47/qkBgrxpiRW VqUW5ccXleakFh9ilOZgURLnPdhqHSgkkJ5YkpqdmlqQWgSTZeLglGpgZDH76ljcJa8Z62/y 2vxJSs2rxjTXR+zsvxaxvNUWzVx/TlrmeNf07fmaiV9bS1+uK5G04VqorllQ0md2/ZvqosU/ Ax7uXx1oauzQf/HXnm3dz6faHliy7Mvnwsm/jojYb5ydFBDyl61B3YpvcdTUM6bRB4KUXHgL cmZo+ef47hBeusQ662SxEktxRqKhFnNRcSIAmlUPMQ4CAAA= Cc: Piotr Wilczek , Kyungmin Park Subject: [U-Boot] [PATCH 4/4] trats2: enable ums support on Trats2 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de This patch enables 'ums' command on Trats2 board. Signed-off-by: Piotr Wilczek Signed-off-by: Kyungmin Park --- board/samsung/trats2/trats2.c | 133 +++++++++++++++++++++++++++++++++++++++++ include/configs/trats2.h | 19 ++++++ 2 files changed, 152 insertions(+) diff --git a/board/samsung/trats2/trats2.c b/board/samsung/trats2/trats2.c index 32fb699..d9de862 100644 --- a/board/samsung/trats2/trats2.c +++ b/board/samsung/trats2/trats2.c @@ -45,6 +45,8 @@ #include #include #include +#include +#include DECLARE_GLOBAL_DATA_PTR; @@ -326,6 +328,75 @@ int board_mmc_init(bd_t *bis) return err; } +#ifdef CONFIG_USB_GADGET +static int s5pc210_phy_control(int on) +{ + int ret = 0; + unsigned int val; + + struct pmic *p = pmic_get("MAX77686_PMIC"); + if (!p) + return -ENODEV; + + if (pmic_probe(p)) + return -1; + + if (on) { + ret = max77686_set_ldo_mode(p, 12, OPMODE_ON); + + p = pmic_get("MAX77693_PMIC"); + pmic_probe(p); + if (pmic_probe(p)) + return -1; + + /* SAFEOUT */ + ret |= pmic_reg_read(p, MAX77693_SAFEOUT, &val); + val |= MAX77693_ENSAFEOUT1; + ret |= pmic_reg_write(p, MAX77693_SAFEOUT, val); + + p = pmic_get("MAX77693_MUIC"); + if (pmic_probe(p)) + return -1; + + /* PATH: USB */ + ret |= pmic_reg_write(p, MAX77693_MUIC_CONTROL1, + MAX77693_MUIC_CTRL1_DN1DP2); + + } else { + ret |= max77686_set_ldo_mode(p, 12, OPMODE_LPM); + + p = pmic_get("MAX77693_MUIC"); + if (pmic_probe(p)) + return -1; + + /* PATH: UART */ + ret |= pmic_reg_write(p, MAX77693_MUIC_CONTROL1, + MAX77693_MUIC_CTRL1_UT1UR2); + } + + if (ret) { + puts("MAX77693 setting error!\n"); + return -1; + } + + return 0; +} + +struct s3c_plat_otg_data s5pc210_otg_data = { + .phy_control = s5pc210_phy_control, + .regs_phy = EXYNOS4X12_USBPHY_BASE, + .regs_otg = EXYNOS4X12_USBOTG_BASE, + .usb_phy_ctrl = EXYNOS4X12_USBPHY_CONTROL, + .usb_flags = PHY0_SLEEP, +}; + +void board_usb_init(void) +{ + debug("USB_udc_probe\n"); + s3c_udc_probe(&s5pc210_otg_data); +} +#endif + static int pmic_init_max77686(void) { struct pmic *p = pmic_get("MAX77686_PMIC"); @@ -525,3 +596,65 @@ int misc_init_r(void) return 0; } #endif + +#ifdef CONFIG_USB_GADGET_MASS_STORAGE +static int ums_read_sector(struct ums_device *ums_dev, + ulong start, lbaint_t blkcnt, void *buf) +{ + if (ums_dev->mmc->block_dev.block_read(ums_dev->dev_num, + start + ums_dev->offset, blkcnt, buf) != blkcnt) + return -1; + + return 0; +} + +static int ums_write_sector(struct ums_device *ums_dev, + ulong start, lbaint_t blkcnt, const void *buf) +{ + if (ums_dev->mmc->block_dev.block_write(ums_dev->dev_num, + start + ums_dev->offset, blkcnt, buf) != blkcnt) + return -1; + + return 0; +} + +static void ums_get_capacity(struct ums_device *ums_dev, + long long int *capacity) +{ + long long int tmp_capacity; + + tmp_capacity = (long long int) ((ums_dev->offset + ums_dev->part_size) + * SECTOR_SIZE); + *capacity = ums_dev->mmc->capacity - tmp_capacity; +} + +static struct ums_board_info ums_board = { + .read_sector = ums_read_sector, + .write_sector = ums_write_sector, + .get_capacity = ums_get_capacity, + .name = "TRATS2 UMS disk", + .ums_dev = { + .mmc = NULL, + .dev_num = 0, + .offset = 0, + .part_size = 0. + }, +}; + +struct ums_board_info *board_ums_init(unsigned int dev_num, unsigned int offset, + unsigned int part_size) +{ + struct mmc *mmc; + + mmc = find_mmc_device(dev_num); + if (!mmc) + return NULL; + + ums_board.ums_dev.mmc = mmc; + ums_board.ums_dev.dev_num = dev_num; + ums_board.ums_dev.offset = offset; + ums_board.ums_dev.part_size = part_size; + + return &ums_board; +} +#endif diff --git a/include/configs/trats2.h b/include/configs/trats2.h index 5637734..8f86d8c 100644 --- a/include/configs/trats2.h +++ b/include/configs/trats2.h @@ -133,6 +133,16 @@ #define CONFIG_CMD_EXT4 #define CONFIG_CMD_EXT4_WRITE +/* USB Composite download gadget - g_dnl */ +#define CONFIG_USBDOWNLOAD_GADGET +#define CONFIG_DFU_FUNCTION +#define CONFIG_DFU_MMC + +/* USB Samsung's IDs */ +#define CONFIG_G_DNL_VENDOR_NUM 0x04E8 +#define CONFIG_G_DNL_PRODUCT_NUM 0x6601 +#define CONFIG_G_DNL_MANUFACTURER "Samsung" + /* To use the TFTPBOOT over USB, Please enable the CONFIG_CMD_NET */ #undef CONFIG_CMD_NET @@ -288,6 +298,10 @@ #define CONFIG_POWER_MUIC_MAX77693 #define CONFIG_POWER_FG_MAX77693 #define CONFIG_POWER_BATTERY_TRATS2 +#define CONFIG_USB_GADGET +#define CONFIG_USB_GADGET_S3C_UDC_OTG +#define CONFIG_USB_GADGET_DUALSPEED +#define CONFIG_USB_GADGET_VBUS_DRAW 2 /* PWM */ #define CONFIG_PWM @@ -306,4 +320,9 @@ #define CONFIG_VIDEO_BMP_GZIP #define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE ((500 * 250 * 4) + (1 << 12)) +#define CONFIG_CMD_USB_MASS_STORAGE +#if defined(CONFIG_CMD_USB_MASS_STORAGE) +#define CONFIG_USB_GADGET_MASS_STORAGE +#endif + #endif /* __CONFIG_H */