From patchwork Wed Jul 13 14:29:49 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?=C5=81ukasz_Majewski?= X-Patchwork-Id: 104513 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 9834BB6F70 for ; Thu, 14 Jul 2011 00:30:51 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id D318928109; Wed, 13 Jul 2011 16:30:47 +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 g3OoqXwvFwf7; Wed, 13 Jul 2011 16:30:47 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 94DBC280EA; Wed, 13 Jul 2011 16:30:26 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id B1114280E4 for ; Wed, 13 Jul 2011 16:30:17 +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 a9dvE02eGXjR for ; Wed, 13 Jul 2011 16:30:13 +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 mailout1.w1.samsung.com (mailout1.w1.samsung.com [210.118.77.11]) by theia.denx.de (Postfix) with ESMTP id 26E2A280CE for ; Wed, 13 Jul 2011 16:30:11 +0200 (CEST) Received: from spt2.w1.samsung.com (mailout1.w1.samsung.com [210.118.77.11]) by mailout1.w1.samsung.com (iPlanet Messaging Server 5.2 Patch 2 (built Jul 14 2004)) with ESMTP id <0LOA00HLN0AADJ@mailout1.w1.samsung.com> for u-boot@lists.denx.de; Wed, 13 Jul 2011 15:30:10 +0100 (BST) Received: from linux.samsung.com ([106.116.38.10]) by spt2.w1.samsung.com (iPlanet Messaging Server 5.2 Patch 2 (built Jul 14 2004)) with ESMTPA id <0LOA00G7O0A9AO@spt2.w1.samsung.com> for u-boot@lists.denx.de; Wed, 13 Jul 2011 15:30:09 +0100 (BST) Received: from mcdsrvbld02.digital.local (unknown [106.116.37.23]) by linux.samsung.com (Postfix) with ESMTP id D19C527005D; Wed, 13 Jul 2011 16:30:48 +0200 (CEST) Date: Wed, 13 Jul 2011 16:29:49 +0200 From: Lukasz Majewski In-reply-to: <1310567392-29082-1-git-send-email-l.majewski@samsung.com> To: u-boot@lists.denx.de Message-id: <1310567392-29082-3-git-send-email-l.majewski@samsung.com> MIME-version: 1.0 X-Mailer: git-send-email 1.7.2.5 References: <1310567392-29082-1-git-send-email-l.majewski@samsung.com> Cc: Kyungmin Park , Minkyu Kang , Marek Szyprowski Subject: [U-Boot] [PATCH v2 2/5] usb:gadget:s5p Enabling the USB Gadget framework at GONI X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.9 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de This commit is enabling support for USB Gadgets support at GONI reference target Signed-off-by: Lukasz Majewski Signed-off-by: Kyungmin Park Cc: Minkyu Kang Cc: Remy Bohmer --- arch/arm/include/asm/arch-s5pc1xx/cpu.h | 4 ++ arch/arm/include/asm/arch-s5pc1xx/hs_otg.h | 32 ++++++++++++ board/samsung/goni/goni.c | 71 ++++++++++++++++++++++++++++ include/configs/s5p_goni.h | 4 ++ 4 files changed, 111 insertions(+), 0 deletions(-) create mode 100644 arch/arm/include/asm/arch-s5pc1xx/hs_otg.h diff --git a/arch/arm/include/asm/arch-s5pc1xx/cpu.h b/arch/arm/include/asm/arch-s5pc1xx/cpu.h index e74959f..e699fc4 100644 --- a/arch/arm/include/asm/arch-s5pc1xx/cpu.h +++ b/arch/arm/include/asm/arch-s5pc1xx/cpu.h @@ -55,6 +55,10 @@ #define S5PC110_VIC1_BASE 0xF2100000 #define S5PC110_VIC2_BASE 0xF2200000 #define S5PC110_VIC3_BASE 0xF2300000 +#define S5PC110_OTG_BASE 0xEC000000 +#define S5PC110_PHY_BASE 0xEC100000 +#define S5PC110_USB_PHY_CONTROL 0xE010E80C + #ifndef __ASSEMBLY__ #include diff --git a/arch/arm/include/asm/arch-s5pc1xx/hs_otg.h b/arch/arm/include/asm/arch-s5pc1xx/hs_otg.h new file mode 100644 index 0000000..d68db04 --- /dev/null +++ b/arch/arm/include/asm/arch-s5pc1xx/hs_otg.h @@ -0,0 +1,32 @@ +/* + * (C) Copyright 2009 SAMSUNG Electronics + * Minkyu Kang + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ + +#ifndef __ASM_ARCH_HSOTG_H_ +#define __ASM_ARCH_HSOTG_H_ + +#ifndef __ASSEMBLY__ +struct s3c_plat_otg_data { + int (*phy_control)(int on); + unsigned int regs_phy; + unsigned int regs_otg; +}; + +#endif /* __ASSEMBLY__ */ +#endif diff --git a/board/samsung/goni/goni.c b/board/samsung/goni/goni.c index dbbd7ed..2935bd7 100644 --- a/board/samsung/goni/goni.c +++ b/board/samsung/goni/goni.c @@ -26,6 +26,8 @@ #include #include #include +#include +#include DECLARE_GLOBAL_DATA_PTR; @@ -149,3 +151,72 @@ inline void gpio_set_value(int nr, int value) s5p_gpio_get_pin(nr), value); } #endif + +#ifdef CONFIG_USB_GADGET + +static int max8998_probe(void) +{ + unsigned char addr = 0xCC >> 1; + + i2c_set_bus_num(I2C_PMIC); + + if (i2c_probe(addr)) { + puts("Can't found max8998\n"); + return 1; + } + + return 0; +} + +#define MAX8998_REG_ONOFF1 0x11 +#define MAX8998_REG_ONOFF2 0x12 +#define MAX8998_LDO3 (1 << 2) +#define MAX8998_LDO8 (1 << 5) + +enum { LDO_OFF, LDO_ON }; + +inline void max8998_set_ldo(unsigned int reg, unsigned char ldo, int on) +{ + unsigned char addr; + unsigned char val[2]; + + addr = 0xCC >> 1; /* max8998 */ + + i2c_read(addr, reg, 1, val, 1); + if (on) + val[0] |= ldo; + else + val[0] &= ~ldo; + + i2c_write(addr, reg, 1, val, 1); + printf("MAX ONOFF1: val[0]:0x%x val[1]:0x%x\n", val[0], val[1]); +} + +static int s5pc1xx_phy_control(int on) +{ + static int status; + + if (max8998_probe()) + return -1; + + if (on && !status) { + max8998_set_ldo(MAX8998_REG_ONOFF1, MAX8998_LDO3, LDO_ON); + max8998_set_ldo(MAX8998_REG_ONOFF2, MAX8998_LDO8, LDO_ON); + status = 1; + } else if (!on && status) { + max8998_set_ldo(MAX8998_REG_ONOFF1, MAX8998_LDO3, LDO_OFF); + max8998_set_ldo(MAX8998_REG_ONOFF2, MAX8998_LDO8, LDO_OFF); + status = 0; + } + udelay(10000); + + return 0; +} + + +struct s3c_plat_otg_data s5pc110_otg_data = { + .phy_control = s5pc1xx_phy_control, + .regs_phy = S5PC110_PHY_BASE, + .regs_otg = S5PC110_OTG_BASE, +}; +#endif diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h index ee87927..a47d0b4 100644 --- a/include/configs/s5p_goni.h +++ b/include/configs/s5p_goni.h @@ -237,4 +237,8 @@ #define CONFIG_SYS_I2C_SPEED 50000 #define CONFIG_I2C_MULTI_BUS #define CONFIG_SYS_MAX_I2C_BUS 7 +#define CONFIG_USB_GADGET 1 +#define CONFIG_USB_GADGET_S3C_UDC_OTG 1 +#define CONFIG_USB_GADGET_DUALSPEED 1 + #endif /* __CONFIG_H */