From ac9b0b574d54be28b300bf99ffe092a2c589484f Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Mon, 28 Jan 2013 20:06:21 +0100 Subject: [PATCH 03/11] MIPS: BCM63XX: move code touching the USB private register This patch moves the code touching the USB private register in the bcm63xx USB gadget driver to arch/mips/bcm63xx/usb-common.c in preparation for adding support for OHCI and EHCI host controllers which will also touch the USB private register. Signed-off-by: Florian Fainelli --- arch/mips/bcm63xx/Makefile | 2 +- arch/mips/bcm63xx/usb-common.c | 53 ++++++++++++++++++++ .../include/asm/mach-bcm63xx/bcm63xx_usb_priv.h | 9 ++++ drivers/usb/gadget/bcm63xx_udc.c | 27 ++-------- 4 files changed, 67 insertions(+), 24 deletions(-) create mode 100644 arch/mips/bcm63xx/usb-common.c create mode 100644 arch/mips/include/asm/mach-bcm63xx/bcm63xx_usb_priv.h --- a/arch/mips/bcm63xx/Makefile +++ b/arch/mips/bcm63xx/Makefile @@ -1,7 +1,7 @@ obj-y += clk.o cpu.o cs.o gpio.o irq.o nvram.o prom.o reset.o \ setup.o timer.o dev-dsp.o dev-enet.o dev-flash.o \ dev-pcmcia.o dev-rng.o dev-spi.o dev-hsspi.o dev-uart.o \ - dev-wdt.o dev-usb-usbd.o + dev-wdt.o dev-usb-usbd.o usb-common.o obj-$(CONFIG_EARLY_PRINTK) += early_printk.o obj-y += boards/ --- /dev/null +++ b/arch/mips/bcm63xx/usb-common.c @@ -0,0 +1,53 @@ +/* + * Broadcom BCM63xx common USB device configuration code + * + * This file is subject to the terms and conditions of the GNU General Public + * License. See the file "COPYING" in the main directory of this archive + * for more details. + * + * Copyright (C) 2012 Kevin Cernekee + * Copyright (C) 2012 Broadcom Corporation + * + */ +#include + +#include +#include +#include +#include + +void bcm63xx_usb_priv_select_phy_mode(u32 portmask, bool is_device) +{ + u32 val; + + val = bcm_rset_readl(RSET_USBH_PRIV, USBH_PRIV_UTMI_CTL_6368_REG); + if (is_device) { + val |= (portmask << USBH_PRIV_UTMI_CTL_HOSTB_SHIFT); + val |= (portmask << USBH_PRIV_UTMI_CTL_NODRIV_SHIFT); + } else { + val &= ~(portmask << USBH_PRIV_UTMI_CTL_HOSTB_SHIFT); + val &= ~(portmask << USBH_PRIV_UTMI_CTL_NODRIV_SHIFT); + } + bcm_rset_writel(RSET_USBH_PRIV, val, USBH_PRIV_UTMI_CTL_6368_REG); + + val = bcm_rset_readl(RSET_USBH_PRIV, USBH_PRIV_SWAP_6368_REG); + if (is_device) + val |= USBH_PRIV_SWAP_USBD_MASK; + else + val &= ~USBH_PRIV_SWAP_USBD_MASK; + bcm_rset_writel(RSET_USBH_PRIV, val, USBH_PRIV_SWAP_6368_REG); +} +EXPORT_SYMBOL(bcm63xx_usb_priv_select_phy_mode); + +void bcm63xx_usb_priv_select_pullup(u32 portmask, bool is_on) +{ + u32 val; + + val = bcm_rset_readl(RSET_USBH_PRIV, USBH_PRIV_UTMI_CTL_6368_REG); + if (is_on) + val &= ~(portmask << USBH_PRIV_UTMI_CTL_NODRIV_SHIFT); + else + val |= (portmask << USBH_PRIV_UTMI_CTL_NODRIV_SHIFT); + bcm_rset_writel(RSET_USBH_PRIV, val, USBH_PRIV_UTMI_CTL_6368_REG); +} +EXPORT_SYMBOL(bcm63xx_usb_priv_select_pullup); --- /dev/null +++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_usb_priv.h @@ -0,0 +1,9 @@ +#ifndef BCM63XX_USB_PRIV_H_ +#define BCM63XX_USB_PRIV_H_ + +#include + +void bcm63xx_usb_priv_select_phy_mode(u32 portmask, bool is_device); +void bcm63xx_usb_priv_select_pullup(u32 portmask, bool is_on); + +#endif /* BCM63XX_USB_PRIV_H_ */ --- a/drivers/usb/gadget/bcm63xx_udc.c +++ b/drivers/usb/gadget/bcm63xx_udc.c @@ -40,6 +40,7 @@ #include #include #include +#include #define DRV_MODULE_NAME "bcm63xx_udc" @@ -868,22 +869,7 @@ static void bcm63xx_select_phy_mode(stru bcm_gpio_writel(val, GPIO_PINMUX_OTHR_REG); } - val = bcm_rset_readl(RSET_USBH_PRIV, USBH_PRIV_UTMI_CTL_6368_REG); - if (is_device) { - val |= (portmask << USBH_PRIV_UTMI_CTL_HOSTB_SHIFT); - val |= (portmask << USBH_PRIV_UTMI_CTL_NODRIV_SHIFT); - } else { - val &= ~(portmask << USBH_PRIV_UTMI_CTL_HOSTB_SHIFT); - val &= ~(portmask << USBH_PRIV_UTMI_CTL_NODRIV_SHIFT); - } - bcm_rset_writel(RSET_USBH_PRIV, val, USBH_PRIV_UTMI_CTL_6368_REG); - - val = bcm_rset_readl(RSET_USBH_PRIV, USBH_PRIV_SWAP_6368_REG); - if (is_device) - val |= USBH_PRIV_SWAP_USBD_MASK; - else - val &= ~USBH_PRIV_SWAP_USBD_MASK; - bcm_rset_writel(RSET_USBH_PRIV, val, USBH_PRIV_SWAP_6368_REG); + bcm63xx_usb_priv_select_phy_mode(portmask, is_device); } /** @@ -897,14 +883,9 @@ static void bcm63xx_select_phy_mode(stru */ static void bcm63xx_select_pullup(struct bcm63xx_udc *udc, bool is_on) { - u32 val, portmask = BIT(udc->pd->port_no); + u32 portmask = BIT(udc->pd->port_no); - val = bcm_rset_readl(RSET_USBH_PRIV, USBH_PRIV_UTMI_CTL_6368_REG); - if (is_on) - val &= ~(portmask << USBH_PRIV_UTMI_CTL_NODRIV_SHIFT); - else - val |= (portmask << USBH_PRIV_UTMI_CTL_NODRIV_SHIFT); - bcm_rset_writel(RSET_USBH_PRIV, val, USBH_PRIV_UTMI_CTL_6368_REG); + bcm63xx_usb_priv_select_pullup(portmask, is_on); } /**