Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6 (cc6120c6) · Commits · e / devices / android_kernel_xiaomi_markw

Documentation/input/appletouch.txt

0 → 100644

+84 −0

Original line number	Diff line number	Diff line
		Apple Touchpad Driver (appletouch)
		----------------------------------
		Copyright (C) 2005 Stelian Pop <stelian@popies.net>

		appletouch is a Linux kernel driver for the USB touchpad found on post
		February 2005 Apple Alu Powerbooks.

		This driver is derived from Johannes Berg's appletrackpad driver[1], but it has
		been improved in some areas:
		* appletouch is a full kernel driver, no userspace program is necessary
		* appletouch can be interfaced with the synaptics X11 driver, in order
		to have touchpad acceleration, scrolling, etc.

		Credits go to Johannes Berg for reverse-engineering the touchpad protocol,
		Frank Arnold for further improvements, and Alex Harper for some additional
		information about the inner workings of the touchpad sensors.

		Usage:
		------

		In order to use the touchpad in the basic mode, compile the driver and load
		the module. A new input device will be detected and you will be able to read
		the mouse data from /dev/input/mice (using gpm, or X11).

		In X11, you can configure the touchpad to use the synaptics X11 driver, which
		will give additional functionalities, like acceleration, scrolling, 2 finger
		tap for middle button mouse emulation, 3 finger tap for right button mouse
		emulation, etc. In order to do this, make sure you're using a recent version of
		the synaptics driver (tested with 0.14.2, available from [2]), and configure a
		new input device in your X11 configuration file (take a look below for an
		example). For additional configuration, see the synaptics driver documentation.

		Section "InputDevice"
		Identifier "Synaptics Touchpad"
		Driver "synaptics"
		Option "SendCoreEvents" "true"
		Option "Device" "/dev/input/mice"
		Option "Protocol" "auto-dev"
		Option "LeftEdge" "0"
		Option "RightEdge" "850"
		Option "TopEdge" "0"
		Option "BottomEdge" "645"
		Option "MinSpeed" "0.4"
		Option "MaxSpeed" "1"
		Option "AccelFactor" "0.02"
		Option "FingerLow" "0"
		Option "FingerHigh" "30"
		Option "MaxTapMove" "20"
		Option "MaxTapTime" "100"
		Option "HorizScrollDelta" "0"
		Option "VertScrollDelta" "30"
		Option "SHMConfig" "on"
		EndSection

		Section "ServerLayout"
		...
		InputDevice "Mouse"
		InputDevice "Synaptics Touchpad"
		...
		EndSection

		Fuzz problems:
		--------------

		The touchpad sensors are very sensitive to heat, and will generate a lot of
		noise when the temperature changes. This is especially true when you power-on
		the laptop for the first time.

		The appletouch driver tries to handle this noise and auto adapt itself, but it
		is not perfect. If finger movements are not recognized anymore, try reloading
		the driver.

		You can activate debugging using the 'debug' module parameter. A value of 0
		deactivates any debugging, 1 activates tracing of invalid samples, 2 activates
		full tracing (each sample is being traced):
		modprobe appletouch debug=1
		or
		echo "1" > /sys/module/appletouch/parameters/debug

		Links:
		------

		[1]: http://johannes.sipsolutions.net/PowerBook/touchpad/
		[2]: http://web.telia.com/~u89404340/touchpad/index.html

Documentation/usb/proc_usb_info.txt

+8 −5

Original line number	Diff line number	Diff line
		@@ -297,18 +297,21 @@ S: SerialNumber=dce0
		C:* #Ifs= 1 Cfg#= 1 Atr=40 MxPwr= 0mA
		I: If#= 0 Alt= 0 #EPs= 1 Cls=09(hub ) Sub=00 Prot=00 Driver=hub
		E: Ad=81(I) Atr=03(Int.) MxPS= 8 Ivl=255ms

		T: Bus=00 Lev=01 Prnt=01 Port=00 Cnt=01 Dev#= 2 Spd=12 MxCh= 4
		D: Ver= 1.00 Cls=09(hub ) Sub=00 Prot=00 MxPS= 8 #Cfgs= 1
		P: Vendor=0451 ProdID=1446 Rev= 1.00
		C:* #Ifs= 1 Cfg#= 1 Atr=e0 MxPwr=100mA
		I: If#= 0 Alt= 0 #EPs= 1 Cls=09(hub ) Sub=00 Prot=00 Driver=hub
		E: Ad=81(I) Atr=03(Int.) MxPS= 1 Ivl=255ms

		T: Bus=00 Lev=02 Prnt=02 Port=00 Cnt=01 Dev#= 3 Spd=1.5 MxCh= 0
		D: Ver= 1.00 Cls=00(>ifc ) Sub=00 Prot=00 MxPS= 8 #Cfgs= 1
		P: Vendor=04b4 ProdID=0001 Rev= 0.00
		C:* #Ifs= 1 Cfg#= 1 Atr=80 MxPwr=100mA
		I: If#= 0 Alt= 0 #EPs= 1 Cls=03(HID ) Sub=01 Prot=02 Driver=mouse
		E: Ad=81(I) Atr=03(Int.) MxPS= 3 Ivl= 10ms

		T: Bus=00 Lev=02 Prnt=02 Port=02 Cnt=02 Dev#= 4 Spd=12 MxCh= 0
		D: Ver= 1.00 Cls=00(>ifc ) Sub=00 Prot=00 MxPS= 8 #Cfgs= 1
		P: Vendor=0565 ProdID=0001 Rev= 1.08

drivers/usb/class/audio.c

+8 −4

Original line number	Diff line number	Diff line
		@@ -631,8 +631,10 @@ static void usbin_stop(struct usb_audiodev *as)
		i = u->flags;
		spin_unlock_irqrestore(&as->lock, flags);
		while (i & (FLG_URB0RUNNING\|FLG_URB1RUNNING\|FLG_SYNC0RUNNING\|FLG_SYNC1RUNNING)) {
		set_current_state(notkilled ? TASK_INTERRUPTIBLE : TASK_UNINTERRUPTIBLE);
		schedule_timeout(1);
		if (notkilled)
		schedule_timeout_interruptible(1);
		else
		schedule_timeout_uninterruptible(1);
		spin_lock_irqsave(&as->lock, flags);
		i = u->flags;
		spin_unlock_irqrestore(&as->lock, flags);
		@@ -1102,8 +1104,10 @@ static void usbout_stop(struct usb_audiodev *as)
		i = u->flags;
		spin_unlock_irqrestore(&as->lock, flags);
		while (i & (FLG_URB0RUNNING\|FLG_URB1RUNNING\|FLG_SYNC0RUNNING\|FLG_SYNC1RUNNING)) {
		set_current_state(notkilled ? TASK_INTERRUPTIBLE : TASK_UNINTERRUPTIBLE);
		schedule_timeout(1);
		if (notkilled)
		schedule_timeout_interruptible(1);
		else
		schedule_timeout_uninterruptible(1);
		spin_lock_irqsave(&as->lock, flags);
		i = u->flags;
		spin_unlock_irqrestore(&as->lock, flags);

drivers/usb/core/hcd.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -1606,7 +1606,7 @@ irqreturn_t usb_hcd_irq (int irq, void __hcd, struct pt_regs r)
		return IRQ_NONE;

		hcd->saw_irq = 1;
		if (hcd->state != start && hcd->state == HC_STATE_HALT)
		if (hcd->state == HC_STATE_HALT)
		usb_hc_died (hcd);
		return IRQ_HANDLED;
		}
		@@ -1630,7 +1630,6 @@ void usb_hc_died (struct usb_hcd *hcd)
		spin_lock_irqsave (&hcd_root_hub_lock, flags);
		if (hcd->rh_registered) {
		hcd->poll_rh = 0;
		del_timer(&hcd->rh_timer);

		/* make khubd clean up old urbs and devices */
		usb_set_device_state (hcd->self.root_hub,

drivers/usb/core/hub.c

+6 −5

Original line number	Diff line number	Diff line
		@@ -435,6 +435,7 @@ void usb_hub_tt_clear_buffer (struct usb_device *udev, int pipe)
		static void hub_power_on(struct usb_hub *hub)
		{
		int port1;
		unsigned pgood_delay = hub->descriptor->bPwrOn2PwrGood * 2;

		/* if hub supports power switching, enable power on each port */
		if ((hub->descriptor->wHubCharacteristics & HUB_CHAR_LPSM) < 2) {
		@@ -444,8 +445,8 @@ static void hub_power_on(struct usb_hub *hub)
		USB_PORT_FEAT_POWER);
		}

		/* Wait for power to be enabled */
		msleep(hub->descriptor->bPwrOn2PwrGood * 2);
		/* Wait at least 100 msec for power to become stable */
		msleep(max(pgood_delay, (unsigned) 100));
		}

		static void hub_quiesce(struct usb_hub *hub)
		@@ -1460,7 +1461,7 @@ static int hub_port_reset(struct usb_hub *hub, int port1,
		port1, status);
		else {
		status = hub_port_wait_reset(hub, port1, udev, delay);
		if (status)
		if (status && status != -ENOTCONN)
		dev_dbg(hub->intfdev,
		"port_wait_reset: err = %d\n",
		status);
		@@ -1469,8 +1470,8 @@ static int hub_port_reset(struct usb_hub *hub, int port1,
		/* return on disconnect or reset */
		switch (status) {
		case 0:
		/* TRSTRCY = 10 ms */
		msleep(10);
		/* TRSTRCY = 10 ms; plus some extra */
		msleep(10 + 40);
		/* FALL THROUGH */
		case -ENOTCONN:
		case -ENODEV: