Message ID | 1321118942-7180-1-git-send-email-fermata7@gmail.com |
---|---|
State | Superseded |
Delegated to: | Remy Bohmer |
Headers | show |
Hi Jana, On 11/12/11 19:29, Jana Rapava wrote: > Add generic functions for ULPI init and setting bits in > ULPI registers. > > Signed-off-by: Jana Rapava <fermata7@gmail.com> > Cc: Marek Vasut <marek.vasut@gmail.com> > Cc: Remy Bohmer <linux@bohmer.net> > Cc: Stefano Babic <sbabic@denx.de> > Cc: Igor Grinberg <grinberg@compulab.co.il> > Cc: Wolfgang Grandegger <wg@denx.de> > --- > This patch is a prerequisite for Efika USB patchset. > > Changes for v2: > - make code EHCI-independent > - use udelay() in waiting loop > - mark static functions as static > - naming changes > I haven't rewritten the ULPI registers interface, because I haven't any > idea how to implement it in some better way. > > Makefile | 1 + > drivers/usb/ulpi/Makefile | 45 +++++++++++++++ > drivers/usb/ulpi/ulpi-viewport.c | 87 +++++++++++++++++++++++++++++ > drivers/usb/ulpi/ulpi.c | 113 ++++++++++++++++++++++++++++++++++++++ > 4 files changed, 246 insertions(+), 0 deletions(-) > create mode 100644 drivers/usb/ulpi/Makefile > create mode 100644 drivers/usb/ulpi/ulpi-viewport.c > create mode 100644 drivers/usb/ulpi/ulpi.c > > diff --git a/Makefile b/Makefile > index dfe939f..70a1e1e 100644 > --- a/Makefile > +++ b/Makefile > @@ -272,6 +272,7 @@ LIBS += drivers/usb/gadget/libusb_gadget.o > LIBS += drivers/usb/host/libusb_host.o > LIBS += drivers/usb/musb/libusb_musb.o > LIBS += drivers/usb/phy/libusb_phy.o > +LIBS += drivers/usb/ulpi/libusb_ulpi.o > LIBS += drivers/video/libvideo.o > LIBS += drivers/watchdog/libwatchdog.o > LIBS += common/libcommon.o > diff --git a/drivers/usb/ulpi/Makefile b/drivers/usb/ulpi/Makefile > new file mode 100644 > index 0000000..64561af > --- /dev/null > +++ b/drivers/usb/ulpi/Makefile > @@ -0,0 +1,45 @@ > +# > +# Copyright (C) 2011 Jana Rapava <fermata7@gmail.com> > +# See file CREDITS for list of people who contributed to this > +# project. > +# > +# 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 > +# > + > +include $(TOPDIR)/config.mk > + > +LIB := $(obj)libusb_ulpi.o > + > +COBJS-$(CONFIG_USB_ULPI) += ulpi.o > +COBJS-$(CONFIG_USB_ULPI_VIEWPORT) += ulpi-viewport.o It would be nice to align the above, but only if you want (you don't have to). > + > +COBJS := $(COBJS-y) > +SRCS := $(COBJS:.o=.c) > +OBJS := $(addprefix $(obj),$(COBJS)) > + > +all: $(LIB) > + > +$(LIB): $(obj).depend $(OBJS) > + $(call cmd_link_o_target, $(OBJS)) > + > +######################################################################### > + > +# defines $(obj).depend target > +include $(SRCTREE)/rules.mk > + > +sinclude $(obj).depend > + > +######################################################################### > diff --git a/drivers/usb/ulpi/ulpi-viewport.c b/drivers/usb/ulpi/ulpi-viewport.c > new file mode 100644 > index 0000000..9250b09 > --- /dev/null > +++ b/drivers/usb/ulpi/ulpi-viewport.c > @@ -0,0 +1,87 @@ > +/* > + * Copyright (C) 2011 Jana Rapava <fermata7@gmail.com> > + * Based on: > + * linux/drivers/usb/otg/ulpi_viewport.c > + * > + * Original Copyright follow: > + * Copyright (C) 2011 Google, Inc. > + * > + * This software is licensed under the terms of the GNU General Public > + * License version 2, as published by the Free Software Foundation, and > + * may be copied, distributed, and modified under those terms. > + * > + * 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. > + * > + */ > + > +#include <common.h> > +#include <asm/io.h> > +#include <usb/ulpi.h> > + > +/* ULPI viewport control bits */ > +#define ULPI_WU (1 << 31) > +#define ULPI_SS (1 << 27) > +#define ULPI_RWRUN (1 << 30) > +#define ULPI_RWCTRL (1 << 29) > + > +#define ULPI_ADDR_SHIFT 16 > +#define ulpi_write_mask(value) ((value) & 0xff) > +#define ulpi_read_mask(value) (((value) >> 8) & 0xff) > + > +static int ulpi_wait(u32 ulpi_viewport, u32 ulpi_value, u32 ulpi_mask) > +{ > + int timeout = ULPI_TIMEOUT; > + u32 tmp; > + > + writel(ulpi_value, ulpi_viewport); > + > + /* Wait for the bits in ulpi_mask to become zero. */ > + while (--timeout) { > + tmp = readl(ulpi_viewport); > + if (!(tmp & ulpi_mask)) > + break; > + udelay(1); > + } > + > + return !timeout; > +} > + > +static int ulpi_wakeup(u32 ulpi_viewport) > +{ > + if (readl(ulpi_viewport) & ULPI_SS) > + return 0; /* already awake */ > + > + return ulpi_wait(ulpi_viewport, ULPI_WU, ULPI_WU); > +} > + > +void ulpi_write(u32 ulpi_viewport, u32 reg, u32 value) > +{ > + u32 tmp; > + if (ulpi_wakeup(ulpi_viewport)) { > + printf("ULPI wakeup timed out\n"); > + return; > + } > + > + tmp = ulpi_wait(ulpi_viewport, ULPI_RWRUN | ULPI_RWCTRL | > + reg << ULPI_ADDR_SHIFT | ulpi_write_mask(value), ULPI_RWRUN); > + if (tmp) > + printf("ULPI write timed out\n"); > +} > + > +u32 ulpi_read(u32 ulpi_viewport, u32 reg) > +{ > + if (ulpi_wakeup(ulpi_viewport)) { > + printf("ULPI wakeup timed out\n"); > + return 0; > + } > + > + if (ulpi_wait(ulpi_viewport, ULPI_RWRUN | reg << ULPI_ADDR_SHIFT, ULPI_RWRUN)) { > + printf("ULPI read timed out\n"); > + return 0; > + } > + > + return ulpi_read_mask(readl(ulpi_viewport)); > +} > diff --git a/drivers/usb/ulpi/ulpi.c b/drivers/usb/ulpi/ulpi.c > new file mode 100644 > index 0000000..c17bb73 > --- /dev/null > +++ b/drivers/usb/ulpi/ulpi.c > @@ -0,0 +1,113 @@ > +/* > + * Copyright (C) 2011 Jana Rapava <fermata7@gmail.com> > + * Based on: > + * linux/drivers/usb/otg/ulpi.c > + * Generic ULPI USB transceiver support > + * > + * Original Copyright follow: > + * Copyright (C) 2009 Daniel Mack <daniel@caiaq.de> > + * > + * Based on sources from > + * > + * Sascha Hauer <s.hauer@pengutronix.de> > + * Freescale Semiconductors > + * > + * 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. > + */ > + > +#include <common.h> > +#include <exports.h> > +#include <usb/ulpi.h> > + > +static void ulpi_integrity_check(u32 ulpi_viewport, struct ulpi_regs *ulpi) > +{ > + u32 tmp = 0; > + int i; > + for (i = 0; i < 2; i++) { > + ulpi_write(ulpi_viewport, (u32)&ulpi->scratch, > + ULPI_TEST_VALUE << i); > + tmp = ulpi_read(ulpi_viewport, (u32)&ulpi->scratch); > + > + if (tmp != (ULPI_TEST_VALUE << i)) { > + printf("ULPI integrity check failed\n"); > + return; > + } > + } > +} > + > +/* > + * This is a family of wrapper functions which sets bits in ULPI registers. > + * Access mode could be WRITE, SET or CLEAR. > + * For further informations see ULPI 1.1 specification. > + */ > +void ulpi_otg_ctrl_flags(u32 ulpi_viewport, > + struct ulpi_regs *ulpi, int access_mode, u32 flags) > +{ > + switch (access_mode) { > + case ULPI_WRITE: > + ulpi_write(ulpi_viewport, (u32)&ulpi->otg_ctrl, flags); > + break; > + case ULPI_SET: > + ulpi_write(ulpi_viewport, (u32)&ulpi->otg_ctrl_set, flags); > + break; > + case ULPI_CLEAR: > + ulpi_write(ulpi_viewport, (u32)&ulpi->otg_ctrl_clear, flags); > + break; > + } > +} > + > +void ulpi_function_ctrl_flags(u32 ulpi_viewport, > + struct ulpi_regs *ulpi, int access_mode, u32 flags) > +{ > + switch (access_mode) { > + case ULPI_WRITE: > + ulpi_write(ulpi_viewport, (u32)&ulpi->function_ctrl, flags); > + break; > + case ULPI_SET: > + ulpi_write(ulpi_viewport, (u32)&ulpi->function_ctrl_set, flags); > + break; > + case ULPI_CLEAR: > + ulpi_write(ulpi_viewport, (u32)&ulpi->function_ctrl_clear, flags); > + break; > + } > +} > + > +void ulpi_iface_ctrl_flags(u32 ulpi_viewport, > + struct ulpi_regs *ulpi, int access_mode, u32 flags) > +{ > + switch (access_mode) { > + case ULPI_WRITE: > + ulpi_write(ulpi_viewport, (u32)&ulpi->iface_ctrl, flags); > + break; > + case ULPI_SET: > + ulpi_write(ulpi_viewport, (u32)&ulpi->iface_ctrl_set, flags); > + break; > + case ULPI_CLEAR: > + ulpi_write(ulpi_viewport, (u32)&ulpi->iface_ctrl_clear, flags); > + break; > + } > + > +} All this access mode crap should not be needed once there is a functional API. > + > +void ulpi_init(u32 ulpi_viewport, struct ulpi_regs *ulpi) > +{ > + u32 tmp = 0; > + int reg; > + > + /* Assemble ID from four ULPI ID registers (8 bits each). */ > + for (reg = ULPI_ID_REGS_COUNT - 1; reg >= 0; reg--) > + tmp |= ulpi_read(ulpi_viewport, reg) << (reg * 8); > + > + /* Split ID into vendor and product ID. */ > + debug("Found ULPI TX, ID %04x:%04x\n", tmp >> 16, tmp & 0xffff); > + > + ulpi_integrity_check(ulpi_viewport, ulpi); > +}
diff --git a/Makefile b/Makefile index dfe939f..70a1e1e 100644 --- a/Makefile +++ b/Makefile @@ -272,6 +272,7 @@ LIBS += drivers/usb/gadget/libusb_gadget.o LIBS += drivers/usb/host/libusb_host.o LIBS += drivers/usb/musb/libusb_musb.o LIBS += drivers/usb/phy/libusb_phy.o +LIBS += drivers/usb/ulpi/libusb_ulpi.o LIBS += drivers/video/libvideo.o LIBS += drivers/watchdog/libwatchdog.o LIBS += common/libcommon.o diff --git a/drivers/usb/ulpi/Makefile b/drivers/usb/ulpi/Makefile new file mode 100644 index 0000000..64561af --- /dev/null +++ b/drivers/usb/ulpi/Makefile @@ -0,0 +1,45 @@ +# +# Copyright (C) 2011 Jana Rapava <fermata7@gmail.com> +# See file CREDITS for list of people who contributed to this +# project. +# +# 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 +# + +include $(TOPDIR)/config.mk + +LIB := $(obj)libusb_ulpi.o + +COBJS-$(CONFIG_USB_ULPI) += ulpi.o +COBJS-$(CONFIG_USB_ULPI_VIEWPORT) += ulpi-viewport.o + +COBJS := $(COBJS-y) +SRCS := $(COBJS:.o=.c) +OBJS := $(addprefix $(obj),$(COBJS)) + +all: $(LIB) + +$(LIB): $(obj).depend $(OBJS) + $(call cmd_link_o_target, $(OBJS)) + +######################################################################### + +# defines $(obj).depend target +include $(SRCTREE)/rules.mk + +sinclude $(obj).depend + +######################################################################### diff --git a/drivers/usb/ulpi/ulpi-viewport.c b/drivers/usb/ulpi/ulpi-viewport.c new file mode 100644 index 0000000..9250b09 --- /dev/null +++ b/drivers/usb/ulpi/ulpi-viewport.c @@ -0,0 +1,87 @@ +/* + * Copyright (C) 2011 Jana Rapava <fermata7@gmail.com> + * Based on: + * linux/drivers/usb/otg/ulpi_viewport.c + * + * Original Copyright follow: + * Copyright (C) 2011 Google, Inc. + * + * This software is licensed under the terms of the GNU General Public + * License version 2, as published by the Free Software Foundation, and + * may be copied, distributed, and modified under those terms. + * + * 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. + * + */ + +#include <common.h> +#include <asm/io.h> +#include <usb/ulpi.h> + +/* ULPI viewport control bits */ +#define ULPI_WU (1 << 31) +#define ULPI_SS (1 << 27) +#define ULPI_RWRUN (1 << 30) +#define ULPI_RWCTRL (1 << 29) + +#define ULPI_ADDR_SHIFT 16 +#define ulpi_write_mask(value) ((value) & 0xff) +#define ulpi_read_mask(value) (((value) >> 8) & 0xff) + +static int ulpi_wait(u32 ulpi_viewport, u32 ulpi_value, u32 ulpi_mask) +{ + int timeout = ULPI_TIMEOUT; + u32 tmp; + + writel(ulpi_value, ulpi_viewport); + + /* Wait for the bits in ulpi_mask to become zero. */ + while (--timeout) { + tmp = readl(ulpi_viewport); + if (!(tmp & ulpi_mask)) + break; + udelay(1); + } + + return !timeout; +} + +static int ulpi_wakeup(u32 ulpi_viewport) +{ + if (readl(ulpi_viewport) & ULPI_SS) + return 0; /* already awake */ + + return ulpi_wait(ulpi_viewport, ULPI_WU, ULPI_WU); +} + +void ulpi_write(u32 ulpi_viewport, u32 reg, u32 value) +{ + u32 tmp; + if (ulpi_wakeup(ulpi_viewport)) { + printf("ULPI wakeup timed out\n"); + return; + } + + tmp = ulpi_wait(ulpi_viewport, ULPI_RWRUN | ULPI_RWCTRL | + reg << ULPI_ADDR_SHIFT | ulpi_write_mask(value), ULPI_RWRUN); + if (tmp) + printf("ULPI write timed out\n"); +} + +u32 ulpi_read(u32 ulpi_viewport, u32 reg) +{ + if (ulpi_wakeup(ulpi_viewport)) { + printf("ULPI wakeup timed out\n"); + return 0; + } + + if (ulpi_wait(ulpi_viewport, ULPI_RWRUN | reg << ULPI_ADDR_SHIFT, ULPI_RWRUN)) { + printf("ULPI read timed out\n"); + return 0; + } + + return ulpi_read_mask(readl(ulpi_viewport)); +} diff --git a/drivers/usb/ulpi/ulpi.c b/drivers/usb/ulpi/ulpi.c new file mode 100644 index 0000000..c17bb73 --- /dev/null +++ b/drivers/usb/ulpi/ulpi.c @@ -0,0 +1,113 @@ +/* + * Copyright (C) 2011 Jana Rapava <fermata7@gmail.com> + * Based on: + * linux/drivers/usb/otg/ulpi.c + * Generic ULPI USB transceiver support + * + * Original Copyright follow: + * Copyright (C) 2009 Daniel Mack <daniel@caiaq.de> + * + * Based on sources from + * + * Sascha Hauer <s.hauer@pengutronix.de> + * Freescale Semiconductors + * + * 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. + */ + +#include <common.h> +#include <exports.h> +#include <usb/ulpi.h> + +static void ulpi_integrity_check(u32 ulpi_viewport, struct ulpi_regs *ulpi) +{ + u32 tmp = 0; + int i; + for (i = 0; i < 2; i++) { + ulpi_write(ulpi_viewport, (u32)&ulpi->scratch, + ULPI_TEST_VALUE << i); + tmp = ulpi_read(ulpi_viewport, (u32)&ulpi->scratch); + + if (tmp != (ULPI_TEST_VALUE << i)) { + printf("ULPI integrity check failed\n"); + return; + } + } +} + +/* + * This is a family of wrapper functions which sets bits in ULPI registers. + * Access mode could be WRITE, SET or CLEAR. + * For further informations see ULPI 1.1 specification. + */ +void ulpi_otg_ctrl_flags(u32 ulpi_viewport, + struct ulpi_regs *ulpi, int access_mode, u32 flags) +{ + switch (access_mode) { + case ULPI_WRITE: + ulpi_write(ulpi_viewport, (u32)&ulpi->otg_ctrl, flags); + break; + case ULPI_SET: + ulpi_write(ulpi_viewport, (u32)&ulpi->otg_ctrl_set, flags); + break; + case ULPI_CLEAR: + ulpi_write(ulpi_viewport, (u32)&ulpi->otg_ctrl_clear, flags); + break; + } +} + +void ulpi_function_ctrl_flags(u32 ulpi_viewport, + struct ulpi_regs *ulpi, int access_mode, u32 flags) +{ + switch (access_mode) { + case ULPI_WRITE: + ulpi_write(ulpi_viewport, (u32)&ulpi->function_ctrl, flags); + break; + case ULPI_SET: + ulpi_write(ulpi_viewport, (u32)&ulpi->function_ctrl_set, flags); + break; + case ULPI_CLEAR: + ulpi_write(ulpi_viewport, (u32)&ulpi->function_ctrl_clear, flags); + break; + } +} + +void ulpi_iface_ctrl_flags(u32 ulpi_viewport, + struct ulpi_regs *ulpi, int access_mode, u32 flags) +{ + switch (access_mode) { + case ULPI_WRITE: + ulpi_write(ulpi_viewport, (u32)&ulpi->iface_ctrl, flags); + break; + case ULPI_SET: + ulpi_write(ulpi_viewport, (u32)&ulpi->iface_ctrl_set, flags); + break; + case ULPI_CLEAR: + ulpi_write(ulpi_viewport, (u32)&ulpi->iface_ctrl_clear, flags); + break; + } + +} + +void ulpi_init(u32 ulpi_viewport, struct ulpi_regs *ulpi) +{ + u32 tmp = 0; + int reg; + + /* Assemble ID from four ULPI ID registers (8 bits each). */ + for (reg = ULPI_ID_REGS_COUNT - 1; reg >= 0; reg--) + tmp |= ulpi_read(ulpi_viewport, reg) << (reg * 8); + + /* Split ID into vendor and product ID. */ + debug("Found ULPI TX, ID %04x:%04x\n", tmp >> 16, tmp & 0xffff); + + ulpi_integrity_check(ulpi_viewport, ulpi); +}
Add generic functions for ULPI init and setting bits in ULPI registers. Signed-off-by: Jana Rapava <fermata7@gmail.com> Cc: Marek Vasut <marek.vasut@gmail.com> Cc: Remy Bohmer <linux@bohmer.net> Cc: Stefano Babic <sbabic@denx.de> Cc: Igor Grinberg <grinberg@compulab.co.il> Cc: Wolfgang Grandegger <wg@denx.de> --- This patch is a prerequisite for Efika USB patchset. Changes for v2: - make code EHCI-independent - use udelay() in waiting loop - mark static functions as static - naming changes I haven't rewritten the ULPI registers interface, because I haven't any idea how to implement it in some better way. Makefile | 1 + drivers/usb/ulpi/Makefile | 45 +++++++++++++++ drivers/usb/ulpi/ulpi-viewport.c | 87 +++++++++++++++++++++++++++++ drivers/usb/ulpi/ulpi.c | 113 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 246 insertions(+), 0 deletions(-) create mode 100644 drivers/usb/ulpi/Makefile create mode 100644 drivers/usb/ulpi/ulpi-viewport.c create mode 100644 drivers/usb/ulpi/ulpi.c