Patchwork [U-Boot,v4,2/2] usb:gadget:s5p Enabling the USB Gadget framework at GONI

login
register
mail settings
Submitter Łukasz Majewski
Date Oct. 17, 2011, 11:47 a.m.
Message ID <1318852044-6480-3-git-send-email-l.majewski@samsung.com>
Download mbox | patch
Permalink /patch/120190/
State Superseded
Delegated to: Marek Vasut
Headers show

Comments

Łukasz Majewski - Oct. 17, 2011, 11:47 a.m.
This commit is enabling support for USB Gadgets support
at GONI reference target.
It uses new generic PMIC framework.

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:
	- None
Changes for v3:
	- Error handlers for max8998_set_ldo functions
Changes for v4:
	- Adjust to new generic PMIC framework

Depend on: "New generic PMIC framework"

http://patchwork.ozlabs.org/patch/118071/
http://patchwork.ozlabs.org/patch/117565/
http://patchwork.ozlabs.org/patch/117563/
---
 arch/arm/include/asm/arch-s5pc1xx/cpu.h    |    4 ++
 arch/arm/include/asm/arch-s5pc1xx/hs_otg.h |   32 +++++++++++++++++++
 board/samsung/goni/goni.c                  |   47 +++++++++++++++++++++++++++-
 include/configs/s5p_goni.h                 |    3 ++
 4 files changed, 85 insertions(+), 1 deletions(-)
 create mode 100644 arch/arm/include/asm/arch-s5pc1xx/hs_otg.h

Patch

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 <asm/io.h>
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 <mk7.kang@samsung.com>
+ *
+ * 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 e191bfb..c4fc3e9 100644
--- a/board/samsung/goni/goni.c
+++ b/board/samsung/goni/goni.c
@@ -26,7 +26,9 @@ 
 #include <asm/arch/gpio.h>
 #include <asm/arch/mmc.h>
 #include <pmic.h>
-
+#include <asm/arch/hs_otg.h>
+#include <asm/arch/cpu.h>
+#include <max8998_pmic.h>
 DECLARE_GLOBAL_DATA_PTR;
 
 static struct s5pc110_gpio *s5pc110_gpio;
@@ -100,3 +102,46 @@  int board_mmc_init(bd_t *bis)
 	return s5p_mmc_init(0, 4);
 }
 #endif
+
+#ifdef CONFIG_USB_GADGET
+static int s5pc1xx_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 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 f58f4f1..969e060 100644
--- a/include/configs/s5p_goni.h
+++ b/include/configs/s5p_goni.h
@@ -240,5 +240,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 */