On Wed, 10 Jun 2009 13:57:07 +0200
Daniel Mack <daniel@xxxxxxxx> wrote:
comment inline..
> From: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
>
> The ARC USB OTG Core has support for accessing ULPI tranceivers
> through so called ULPI viewports. Export a set of function for use with
> the new xcvr framework.
>
> Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
> Signed-off-by: Daniel Mack <daniel@xxxxxxxx>
> ---
> arch/arm/mach-mx2/Kconfig | 1 +
> arch/arm/plat-mxc/Kconfig | 2 +
> arch/arm/plat-mxc/Makefile | 1 +
> arch/arm/plat-mxc/include/mach/ulpi.h | 7 ++
> arch/arm/plat-mxc/ulpi.c | 110 +++++++++++++++++++++++++++++++++
> 5 files changed, 121 insertions(+), 0 deletions(-)
> create mode 100644 arch/arm/plat-mxc/include/mach/ulpi.h
> create mode 100644 arch/arm/plat-mxc/ulpi.c
>
> diff --git a/arch/arm/mach-mx2/Kconfig b/arch/arm/mach-mx2/Kconfig
> index 42a7888..a8e06d0 100644
> --- a/arch/arm/mach-mx2/Kconfig
> +++ b/arch/arm/mach-mx2/Kconfig
> @@ -40,6 +40,7 @@ choice
> config MACH_PCM970_BASEBOARD
> prompt "PHYTEC PCM970 development board"
> bool
> + select MXC_ULPI
> help
> This adds board specific devices that can be found on Phytec's
> PCM970 evaluation board.
> diff --git a/arch/arm/plat-mxc/Kconfig b/arch/arm/plat-mxc/Kconfig
> index 17d0e99..b5668a8 100644
> --- a/arch/arm/plat-mxc/Kconfig
> +++ b/arch/arm/plat-mxc/Kconfig
> @@ -51,4 +51,6 @@ config MXC_PWM
> help
> Enable support for the i.MX PWM controller(s).
>
> +config MXC_ULPI
> + bool
> endif
> diff --git a/arch/arm/plat-mxc/Makefile b/arch/arm/plat-mxc/Makefile
> index 0554063..3ce830a 100644
> --- a/arch/arm/plat-mxc/Makefile
> +++ b/arch/arm/plat-mxc/Makefile
> @@ -8,3 +8,4 @@ obj-y := irq.o clock.o gpio.o time.o devices.o cpu.o system.o
> obj-$(CONFIG_ARCH_MX1) += iomux-mx1-mx2.o dma-mx1-mx2.o
> obj-$(CONFIG_ARCH_MX2) += iomux-mx1-mx2.o dma-mx1-mx2.o
> obj-$(CONFIG_MXC_PWM) += pwm.o
> +obj-$(CONFIG_MXC_ULPI) += ulpi.o
> diff --git a/arch/arm/plat-mxc/include/mach/ulpi.h b/arch/arm/plat-mxc/include/mach/ulpi.h
> new file mode 100644
> index 0000000..7b7db44
> --- /dev/null
> +++ b/arch/arm/plat-mxc/include/mach/ulpi.h
> @@ -0,0 +1,7 @@
> +#ifndef __MACH_ULPI_H
> +#define __MACH_ULPI_H
> +
> +extern struct usb_xcvr_access_ops mxc_ulpi_access_ops;
> +
> +#endif /* __MACH_ULPI_H */
> +
> diff --git a/arch/arm/plat-mxc/ulpi.c b/arch/arm/plat-mxc/ulpi.c
> new file mode 100644
> index 0000000..c35d8ee
> --- /dev/null
> +++ b/arch/arm/plat-mxc/ulpi.c
> @@ -0,0 +1,110 @@
> +/*
> + * Copyright 2008 Sascha Hauer, Pengutronix <s.hauer@xxxxxxxxxxxxxx>
> + *
> + * 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., 51 Franklin Street, Fifth Floor, Boston,
> + * MA 02110-1301, USA.
> + */
> +
> +#include <linux/module.h>
> +#include <linux/kernel.h>
> +#include <linux/io.h>
> +#include <linux/delay.h>
> +#include <linux/usb/xcvr.h>
> +
> +#include <mach/ulpi.h>
> +
> +/* ULPIVIEW register bits */
> +#define ULPIVW_WU (1 << 31) /* Wakeup */
> +#define ULPIVW_RUN (1 << 30) /* read/write run */
> +#define ULPIVW_WRITE (1 << 29) /* 0 = read 1 = write */
> +#define ULPIVW_SS (1 << 27) /* SyncState */
> +#define ULPIVW_PORT_MASK 0x07 /* Port field */
> +#define ULPIVW_PORT_SHIFT 24
> +#define ULPIVW_ADDR_MASK 0xff /* data address field */
> +#define ULPIVW_ADDR_SHIFT 16
> +#define ULPIVW_RDATA_MASK 0xff /* read data field */
> +#define ULPIVW_RDATA_SHIFT 8
> +#define ULPIVW_WDATA_MASK 0xff /* write data field */
> +#define ULPIVW_WDATA_SHIFT 0
> +
> +static int ulpi_poll(void __iomem *view, u32 bit)
> +{
> + uint32_t data;
> + int timeout = 10000;
> +
> + data = __raw_readl(view);
> + while (data & bit) {
> + if (!timeout--) {
> + printk(KERN_WARNING
> + "timeout polling for ULPI device\n");
> + return -ETIMEDOUT;
> + }
> +
> + udelay(10);
> + data = __raw_readl(view);
> + }
> +
> + return (data >> ULPIVW_RDATA_SHIFT) & ULPIVW_RDATA_MASK;
> +}
> +
> +static int ulpi_read(struct usb_xcvr *xcvr, u32 reg)
> +{
> + int ret;
> + void __iomem *view = xcvr->access_priv;
> +
> + /* make sure interface is running */
> + if (!(__raw_readl(view) && ULPIVW_SS)) {
> + __raw_writel(ULPIVW_WU, view);
> +
> + /* wait for wakeup */
> + ret = ulpi_poll(view, ULPIVW_WU);
> + if (ret < 0)
> + return ret;
> + }
> +
> + /* read the register */
> + __raw_writel((ULPIVW_RUN | (reg << ULPIVW_ADDR_SHIFT)), view);
> +
> + /* wait for completion */
> + return ulpi_poll(view, ULPIVW_RUN);
> +}
> +
> +static int ulpi_write(struct usb_xcvr *xcvr, u32 val, u32 reg)
> +{
> + int ret;
> + void __iomem *view = xcvr->access_priv;
> +
> + /* make sure the interface is running */
> + if (!(__raw_readl(view) && ULPIVW_SS)) {
> + __raw_writel(ULPIVW_WU, view);
> + /* wait for wakeup */
> + ret = ulpi_poll(view, ULPIVW_WU);
> + if (ret < 0)
> + return ret;
> + }
> +
> + __raw_writel((ULPIVW_RUN | ULPIVW_WRITE |
> + (reg << ULPIVW_ADDR_SHIFT) |
> + ((val & ULPIVW_WDATA_MASK) << ULPIVW_WDATA_SHIFT)),
> + view);
> +
> + /* wait for completion */
> + return ulpi_poll(view, ULPIVW_RUN);
> +}
Why do you return results of polling?
You may want this..
- return ulpi_poll(view, ULPIVW_RUN);
+ ret = ulpi_poll(view, ULPIVW_RUN);
+ if(ret < 0)
+ return ret;
+ return 0;
> +
> +struct usb_xcvr_access_ops mxc_ulpi_access_ops = {
> + .read = ulpi_read,
> + .write = ulpi_write,
> +};
> +
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
