Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c1084a56 authored by Alexander Shishkin's avatar Alexander Shishkin Committed by Felipe Balbi
Browse files

usb: otg: kill langwell_otg driver 



The way this driver was added by f0ae849d (usb: Add Intel Langwell USB
OTG Transceiver Driver) never even compiled together with langwell_udc,
and that's the only way for it to be useful.

Signed-off-by: default avatarAlexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: stable@vger.kernel.org # v2.6.31+
Cc: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Cc: Greg Kroah-Hartman <gregkh@suse.de>
Cc: Alan Cox <alan@linux.intel.com>
Cc: linux-usb@vger.kernel.org
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent 68d8a781

drivers/usb/otg/Kconfig

+0 −14
Original line number Diff line number Diff line
@@ -86,20 +86,6 @@ config NOP_USB_XCEIV 
	  built-in with usb ip or which are autonomous and doesn't require any

	  phy programming such as ISP1x04 etc.



config USB_LANGWELL_OTG

	tristate "Intel Langwell USB OTG dual-role support"

	depends on USB && PCI && INTEL_SCU_IPC

	select USB_OTG

	select USB_OTG_UTILS

	help

	  Say Y here if you want to build Intel Langwell USB OTG

	  transciever driver in kernel. This driver implements role

	  switch between EHCI host driver and Langwell USB OTG

	  client driver.



	  To compile this driver as a module, choose M here: the

	  module will be called langwell_otg.



config USB_MSM_OTG

	tristate "OTG support for Qualcomm on-chip USB controller"

	depends on (USB || USB_GADGET) && ARCH_MSM

drivers/usb/otg/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ obj-$(CONFIG_USB_GPIO_VBUS) += gpio_vbus.o 
obj-$(CONFIG_ISP1301_OMAP)	+= isp1301_omap.o

obj-$(CONFIG_TWL4030_USB)	+= twl4030-usb.o

obj-$(CONFIG_TWL6030_USB)	+= twl6030-usb.o

obj-$(CONFIG_USB_LANGWELL_OTG)	+= langwell_otg.o

obj-$(CONFIG_NOP_USB_XCEIV)	+= nop-usb-xceiv.o

obj-$(CONFIG_USB_ULPI)		+= ulpi.o

obj-$(CONFIG_USB_ULPI_VIEWPORT)	+= ulpi_viewport.o

drivers/usb/otg/langwell_otg.c

deleted100644 → 0
+0 −2347

File deleted.

Preview size limit exceeded, changes collapsed.

include/linux/usb/langwell_otg.h

deleted100644 → 0
+0 −139
Original line number Diff line number Diff line 
/*

 * Intel Langwell USB OTG transceiver driver

 * Copyright (C) 2008 - 2010, Intel Corporation.

 *

 * This program is free software; you can redistribute it and/or modify it

 * under the terms and conditions of the GNU General Public License,

 * version 2, as published by the Free Software Foundation.

 *

 * This program is distributed in the hope 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 St - Fifth Floor, Boston, MA 02110-1301 USA.

 *

 */



#ifndef __LANGWELL_OTG_H

#define __LANGWELL_OTG_H



#include <linux/usb/intel_mid_otg.h>



#define CI_USBCMD		0x30

#	define USBCMD_RST		BIT(1)

#	define USBCMD_RS		BIT(0)

#define CI_USBSTS		0x34

#	define USBSTS_SLI		BIT(8)

#	define USBSTS_URI		BIT(6)

#	define USBSTS_PCI		BIT(2)

#define CI_PORTSC1		0x74

#	define PORTSC_PP		BIT(12)

#	define PORTSC_LS		(BIT(11) | BIT(10))

#	define PORTSC_SUSP		BIT(7)

#	define PORTSC_CCS		BIT(0)

#define CI_HOSTPC1		0xb4

#	define HOSTPC1_PHCD		BIT(22)

#define CI_OTGSC		0xf4

#	define OTGSC_DPIE		BIT(30)

#	define OTGSC_1MSE		BIT(29)

#	define OTGSC_BSEIE		BIT(28)

#	define OTGSC_BSVIE		BIT(27)

#	define OTGSC_ASVIE		BIT(26)

#	define OTGSC_AVVIE		BIT(25)

#	define OTGSC_IDIE		BIT(24)

#	define OTGSC_DPIS		BIT(22)

#	define OTGSC_1MSS		BIT(21)

#	define OTGSC_BSEIS		BIT(20)

#	define OTGSC_BSVIS		BIT(19)

#	define OTGSC_ASVIS		BIT(18)

#	define OTGSC_AVVIS		BIT(17)

#	define OTGSC_IDIS		BIT(16)

#	define OTGSC_DPS		BIT(14)

#	define OTGSC_1MST		BIT(13)

#	define OTGSC_BSE		BIT(12)

#	define OTGSC_BSV		BIT(11)

#	define OTGSC_ASV		BIT(10)

#	define OTGSC_AVV		BIT(9)

#	define OTGSC_ID			BIT(8)

#	define OTGSC_HABA		BIT(7)

#	define OTGSC_HADP		BIT(6)

#	define OTGSC_IDPU		BIT(5)

#	define OTGSC_DP			BIT(4)

#	define OTGSC_OT			BIT(3)

#	define OTGSC_HAAR		BIT(2)

#	define OTGSC_VC			BIT(1)

#	define OTGSC_VD			BIT(0)

#	define OTGSC_INTEN_MASK		(0x7f << 24)

#	define OTGSC_INT_MASK		(0x5f << 24)

#	define OTGSC_INTSTS_MASK	(0x7f << 16)

#define CI_USBMODE		0xf8

#	define USBMODE_CM		(BIT(1) | BIT(0))

#	define USBMODE_IDLE		0

#	define USBMODE_DEVICE		0x2

#	define USBMODE_HOST		0x3

#define USBCFG_ADDR			0xff10801c

#define USBCFG_LEN			4

#	define USBCFG_VBUSVAL		BIT(14)

#	define USBCFG_AVALID		BIT(13)

#	define USBCFG_BVALID		BIT(12)

#	define USBCFG_SESEND		BIT(11)



#define INTR_DUMMY_MASK (USBSTS_SLI | USBSTS_URI | USBSTS_PCI)



enum langwell_otg_timer_type {

	TA_WAIT_VRISE_TMR,

	TA_WAIT_BCON_TMR,

	TA_AIDL_BDIS_TMR,

	TB_ASE0_BRST_TMR,

	TB_SE0_SRP_TMR,

	TB_SRP_INIT_TMR,

	TB_SRP_FAIL_TMR,

	TB_BUS_SUSPEND_TMR

};



#define TA_WAIT_VRISE	100

#define TA_WAIT_BCON	30000

#define TA_AIDL_BDIS	15000

#define TB_ASE0_BRST	5000

#define TB_SE0_SRP	2

#define TB_SRP_INIT	100

#define TB_SRP_FAIL	5500

#define TB_BUS_SUSPEND	500



struct langwell_otg_timer {

	unsigned long expires;	/* Number of count increase to timeout */

	unsigned long count;	/* Tick counter */

	void (*function)(unsigned long);	/* Timeout function */

	unsigned long data;	/* Data passed to function */

	struct list_head list;

};



struct langwell_otg {

	struct intel_mid_otg_xceiv	iotg;

	struct device			*dev;



	void __iomem			*usbcfg;	/* SCCBUSB config Reg */



	unsigned			region;

	unsigned			cfg_region;



	struct work_struct		work;

	struct workqueue_struct		*qwork;

	struct timer_list		hsm_timer;



	spinlock_t			lock;

	spinlock_t			wq_lock;



	struct notifier_block		iotg_notifier;

};



static inline

struct langwell_otg *mid_xceiv_to_lnw(struct intel_mid_otg_xceiv *iotg)

{

	return container_of(iotg, struct langwell_otg, iotg);

}



#endif /* __LANGWELL_OTG_H__ */