Commit Graph

34458 Commits

Author SHA1 Message Date
黄涛
1f1e84a12d Revert "input: Add keyreset driver."
This reverts commit d94329d008.

Conflicts:

	drivers/input/Makefile
2011-07-30 22:55:10 +08:00
黄涛
9a4b4eecd5 Revert "input: keychord: Add keychord driver"
This reverts commit 6cd91b7b3e.
2011-07-30 22:53:41 +08:00
黄涛
09f9b10843 Revert "Input: synaptics_i2c_rmi: Driver for Synaptics Touchscreens using RMI over I2C."
This reverts commit cf8b77e6a6.
2011-07-30 22:53:39 +08:00
黄涛
b097e55847 Revert "Input: synaptics_i2c_rmi: Add sensitivity adjust option."
This reverts commit 3929c1894c.
2011-07-30 22:53:36 +08:00
黄涛
2f86d55056 Revert "Input: synaptics_i2c_rmi: Add irqflags to platform data struct to pass them to driver"
This reverts commit 252e0e32ac.
2011-07-30 22:53:33 +08:00
黄涛
8700a6545b Revert "mmc: Add status IRQ and status callback function to mmc platform data"
This reverts commit cfd429c655.
2011-07-30 22:53:31 +08:00
黄涛
6b99136498 Revert "mmc: Add concept of an 'embedded' SDIO device."
This reverts commit 6558addc2a.
2011-07-30 22:53:07 +08:00
黄涛
e09b1d3ea8 Revert "trout: Add functions for WiFi"
This reverts commit 8c542b3a4e.
2011-07-30 22:53:05 +08:00
黄涛
ad7271f11e Revert "mmc: core: Add deferred bus resume policy."
This reverts commit 40594a0045.

Conflicts:

	include/linux/mmc/host.h
2011-07-30 22:51:57 +08:00
黄涛
bef8796251 Revert "android_usb: Composite USB gadget driver for android."
This reverts commit 2c7c4829ac.
2011-07-30 22:48:57 +08:00
黄涛
7ff3fd1403 Revert "USB: composite: Add flag to usb_function to hide its interface during enumeration"
This reverts commit ee26eaf139.
2011-07-30 22:48:44 +08:00
黄涛
4c0244f8ef Revert "USB: gadget: android: android USB gadget improvements:"
This reverts commit dd5acba95d.

Conflicts:

	drivers/usb/gadget/f_adb.c
2011-07-30 22:46:25 +08:00
黄涛
0e4a76aad7 Revert "tiwlan: Add abstract wifi control functions support"
This reverts commit 17a60bbffc.
2011-07-30 22:45:26 +08:00
黄涛
193325765c Revert "net: add PPP on L2TP Access Concentrator (PPPoLAC) driver."
This reverts commit dbdb1c3278.
2011-07-30 22:45:00 +08:00
黄涛
648a0a228c Revert "net: add PPP on PPTP Network Server (PPPoPNS) driver."
This reverts commit 7cc7c63e62.
2011-07-30 22:44:57 +08:00
黄涛
f3d870811c Revert "net: PPPoPNS and PPPoLAC fixes."
This reverts commit 286fcd1c1e.
2011-07-30 22:44:45 +08:00
黄涛
5f0dc84d54 Revert "security: Add AID_NET_RAW and AID_NET_ADMIN capability check in cap_capable()."
This reverts commit c30cd45aad.
2011-07-30 22:44:43 +08:00
黄涛
b1da95bb09 Revert "kernel_debugger_core: add interrupt-context debugger core"
This reverts commit 25049b34a8.
2011-07-30 22:44:36 +08:00
黄涛
25b9908282 Revert "wl127x-rfkill: Add power control driver for TI WL127X Bluetooth chips"
This reverts commit 6adc27186c.

Conflicts:

	drivers/misc/Kconfig
	drivers/misc/Makefile
2011-07-30 22:43:35 +08:00
黄涛
e13f235ea5 Revert "serial_core: Add wake_peer uart operation which is called before starting UART TX. The idea here is to provide a mechanism where we can wakeup our peer before sending data."
This reverts commit f5353976c6.
2011-07-30 22:41:09 +08:00
黄涛
2c568ed308 Revert "Bluetooth: Increase timeout for legacy pairing from 10 seconds to 40 seconds."
This reverts commit 1f39bbdd42.
2011-07-30 22:41:01 +08:00
黄涛
c471b11ba3 Revert "Bluetooth: Add ACL MTU, available buffers and total buffers to hci_conn_info."
This reverts commit 7b75ff3c3f.
2011-07-30 22:32:28 +08:00
黄涛
98169f6cd0 Revert "Bluetooth: Introduce L2CAP_LM_FLUSHABLE to allow flushing of ACL packets."
This reverts commit d7897fd1e9.
2011-07-30 22:32:26 +08:00
黄涛
8634a0f46e Revert "USB: composite: Add class driver for enabling and disabling USB functions."
This reverts commit f8cf7f90ac.
2011-07-30 22:26:57 +08:00
黄涛
d8958cec3f Revert "Revert "Bluetooth: Fix rejected connection not disconnecting ACL link""
This reverts commit ce1c698ea8.
2011-07-30 22:26:44 +08:00
黄涛
e56efa4115 Revert "Bluetooth: Allow SCO/eSCO packet type selection for outgoing SCO connections."
This reverts commit 3b077241e0.
2011-07-30 22:26:31 +08:00
黄涛
4c9ec236d2 Revert "pmem: Add cache flush ioctl for pmem buffers"
This reverts commit f6320db511.
2011-07-30 22:26:26 +08:00
黄涛
c387a6e64f Revert "Revert "Bluetooth: Introduce L2CAP_LM_FLUSHABLE to allow flushing of ACL packets.""
This reverts commit 71682ea19f.
2011-07-30 22:26:25 +08:00
黄涛
1cd04b76d6 Revert "Bluetooth: Use non-flushable pb flag by default for ACL data on capable chipsets."
This reverts commit a47633bdbc.
2011-07-30 22:26:23 +08:00
黄涛
d93f4ea7e3 Revert "USB: gadget: f_rndis: Add platform data for RNDIS vendor ID and MAC address."
This reverts commit 7dc693330c.
2011-07-30 22:26:21 +08:00
黄涛
380873f76d Revert "Merge commit 'v2.6.32.9' into android-2.6.32"
This reverts commit 67078ecae3, reversing
changes made to dc136618cb.

Conflicts:

	drivers/net/wireless/ath/ar9170/usb.c
	drivers/net/wireless/ath/ath5k/base.c
	drivers/net/wireless/ath/ath5k/eeprom.c
	drivers/net/wireless/ath/ath5k/eeprom.h
	drivers/net/wireless/ath/ath5k/phy.c
	drivers/net/wireless/ath/ath9k/ath9k.h
	drivers/net/wireless/ath/ath9k/hw.c
	drivers/net/wireless/ath/ath9k/hw.h
	drivers/net/wireless/ath/ath9k/mac.c
	drivers/net/wireless/ath/ath9k/mac.h
	drivers/net/wireless/ath/ath9k/main.c
	drivers/net/wireless/ath/ath9k/reg.h
	drivers/net/wireless/ath/ath9k/xmit.c
	drivers/net/wireless/b43/b43.h
	drivers/net/wireless/b43/main.c
	drivers/net/wireless/b43/rfkill.c
	drivers/net/wireless/b43legacy/rfkill.c
	drivers/net/wireless/ipw2x00/ipw2100.c
	drivers/net/wireless/iwlwifi/iwl-3945.c
	drivers/net/wireless/iwlwifi/iwl-4965.c
	drivers/net/wireless/iwlwifi/iwl-5000-hw.h
	drivers/net/wireless/iwlwifi/iwl-5000.c
	drivers/net/wireless/iwlwifi/iwl-agn-rs.c
	drivers/net/wireless/iwlwifi/iwl-core.c
	drivers/net/wireless/iwlwifi/iwl-dev.h
	drivers/net/wireless/iwlwifi/iwl-eeprom.c
	drivers/net/wireless/iwlwifi/iwl-eeprom.h
	drivers/net/wireless/iwlwifi/iwl3945-base.c
	drivers/net/wireless/iwmc3200wifi/iwm.h
	drivers/net/wireless/libertas/scan.c
	drivers/net/wireless/libertas/wext.c
	drivers/net/wireless/orinoco/wext.c
	drivers/net/wireless/rt2x00/rt61pci.c
	drivers/net/wireless/rtl818x/rtl8187.h
	drivers/net/wireless/rtl818x/rtl8187_dev.c
	drivers/net/wireless/rtl818x/rtl8187_rfkill.c
	drivers/usb/serial/option.c
2011-07-30 22:24:29 +08:00
黄涛
efaabc0db0 Revert "wlan: Extract generic wlan platform data from tiwlan specific header"
This reverts commit 275f83d836.
2011-07-30 22:16:55 +08:00
黄涛
496721f1c2 Revert "sched: Add a generic notifier when a task struct is about to be freed"
This reverts commit 9e6cb2f4db.
2011-07-30 22:16:32 +08:00
黄涛
c69559f6a6 Revert "Merge remote branch 'common/android-2.6.32' into develop"
This reverts commit c7e039e278, reversing
changes made to d00e5f74ae.
2011-07-30 16:25:42 +08:00
黄涛
35b9b535e7 Revert "Merge remote branch 'linux-2.6.32.y/master' into develop"
This reverts commit 6e2688ca84, reversing
changes made to 4b7c9de4de.

Conflicts:

	drivers/gpio/wm831x-gpio.c
	drivers/i2c/busses/Kconfig
	drivers/net/dm9000.c
	drivers/net/wireless/airo.c
	drivers/net/wireless/ath/ar9170/hw.h
	drivers/net/wireless/ath/ar9170/main.c
	drivers/net/wireless/ath/ar9170/usb.c
	drivers/net/wireless/ath/ath5k/ath5k.h
	drivers/net/wireless/ath/ath5k/attach.c
	drivers/net/wireless/ath/ath5k/base.c
	drivers/net/wireless/ath/ath5k/qcu.c
	drivers/net/wireless/ath/ath5k/reset.c
	drivers/net/wireless/ath/ath9k/ath9k.h
	drivers/net/wireless/ath/ath9k/beacon.c
	drivers/net/wireless/ath/ath9k/eeprom.h
	drivers/net/wireless/ath/ath9k/eeprom_def.c
	drivers/net/wireless/ath/ath9k/hw.c
	drivers/net/wireless/ath/ath9k/hw.h
	drivers/net/wireless/ath/ath9k/initvals.h
	drivers/net/wireless/ath/ath9k/main.c
	drivers/net/wireless/ath/ath9k/pci.c
	drivers/net/wireless/ath/ath9k/phy.h
	drivers/net/wireless/ath/ath9k/rc.c
	drivers/net/wireless/ath/ath9k/xmit.c
	drivers/net/wireless/ath/regd.h
	drivers/net/wireless/b43/Kconfig
	drivers/net/wireless/b43/Makefile
	drivers/net/wireless/b43/b43.h
	drivers/net/wireless/b43/dma.c
	drivers/net/wireless/b43/main.c
	drivers/net/wireless/b43/pio.c
	drivers/net/wireless/b43/pio.h
	drivers/net/wireless/b43/xmit.c
	drivers/net/wireless/b43legacy/main.c
	drivers/net/wireless/hostap/hostap_cs.c
	drivers/net/wireless/hostap/hostap_hw.c
	drivers/net/wireless/hostap/hostap_pci.c
	drivers/net/wireless/hostap/hostap_wlan.h
	drivers/net/wireless/iwlwifi/iwl-3945.c
	drivers/net/wireless/iwlwifi/iwl-4965.c
	drivers/net/wireless/iwlwifi/iwl-5000.c
	drivers/net/wireless/iwlwifi/iwl-agn-rs.c
	drivers/net/wireless/iwlwifi/iwl-agn.c
	drivers/net/wireless/iwlwifi/iwl-core.c
	drivers/net/wireless/iwlwifi/iwl-core.h
	drivers/net/wireless/iwlwifi/iwl-dev.h
	drivers/net/wireless/iwlwifi/iwl-helpers.h
	drivers/net/wireless/iwlwifi/iwl-rx.c
	drivers/net/wireless/iwlwifi/iwl-scan.c
	drivers/net/wireless/iwlwifi/iwl-tx.c
	drivers/net/wireless/iwlwifi/iwl3945-base.c
	drivers/net/wireless/libertas/if_sdio1.c
	drivers/net/wireless/p54/eeprom.c
	drivers/net/wireless/p54/p54pci.c
	drivers/net/wireless/p54/p54usb.c
	drivers/net/wireless/p54/txrx.c
	drivers/net/wireless/rndis_wlan.c
	drivers/net/wireless/rtl818x/rtl8180_dev.c
	drivers/net/wireless/wl12xx/wl1251_debugfs.c
	drivers/net/wireless/wl12xx/wl1251_sdio.c
	drivers/usb/serial/option.c
	net/bluetooth/rfcomm/core.c
2011-07-30 16:24:52 +08:00
黄涛
7de15596db Revert "Merge remote branch 'linux-2.6.32.y/master' into develop"
This reverts commit 84aa38e58d, reversing
changes made to 9505d021e0.
2011-07-30 16:11:20 +08:00
黄涛
5f1e6e97d5 Revert "Merge remote-tracking branch 'linux-2.6.32.y/master' into develop"
This reverts commit 7cd3739f32, reversing
changes made to 2748ae2cc2.

Conflicts:

	drivers/usb/core/hub.c
	drivers/usb/serial/option.c
2011-07-30 16:09:59 +08:00
黄涛
6a3f004727 Revert "Merge remote-tracking branch 'linux-2.6.32.y/master' into develop"
This reverts commit 2caa51d22a, reversing
changes made to cc88c1f62a.
2011-07-30 16:01:15 +08:00
黄涛
2448a5573a Revert "clocksource: Provide a generic mult/shift factor calculation"
This reverts commit cfc80b6829.
2011-07-30 15:56:49 +08:00
黄涛
45c82a64f8 Revert "lib: add support for LZO-compressed kernels"
This reverts commit 3a3ba0241a.
2011-07-30 15:55:13 +08:00
黄涛
3f2bbceb46 Revert "timer: Added usleep_range timer"
This reverts commit 18464b0b75.
2011-07-30 15:54:41 +08:00
黄涛
57a57994d5 Revert "clockevents: Use u32 for mult and shift factors"
This reverts commit b7ad2a012a.
2011-07-30 15:53:44 +08:00
黄涛
b877bcb0ec rk29: include/linux/regulator/consumer.h: fix warning: no return statement in function returning non-void 2011-07-25 17:03:22 +08:00
Thomas Gleixner
b7ad2a012a clockevents: Use u32 for mult and shift factors
The mult and shift factors of clock events differ in their data type
from those of clock sources for no reason. u32 is sufficient for
both. shift is always <= 32 and mult is limited to 2^32-1 to avoid
64bit multiplication overflows in the conversion.

Preparatory patch for a generic mult/shift factor calculation
function.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Tested-by: Mikael Pettersson <mikpe@it.uu.se>
Acked-by: Ralf Baechle <ralf@linux-mips.org>
Acked-by: Linus Walleij <linus.walleij@stericsson.com>
Cc: John Stultz <johnstul@us.ibm.com>
LKML-Reference: <20091111134229.725664788@linutronix.de>
2011-07-25 09:29:10 +08:00
黄涛
5675bfaadd Revert "rk29: add hr_msleep/hr_msleep_interruptible/usleep"
This reverts commit c4c6281fd7.
2011-07-22 16:40:22 +08:00
黄涛
c4c6281fd7 rk29: add hr_msleep/hr_msleep_interruptible/usleep 2011-07-22 16:20:36 +08:00
Patrick Pannuto
18464b0b75 timer: Added usleep_range timer
usleep_range is a finer precision implementations of msleep
and is designed to be a drop-in replacement for udelay where
a precise sleep / busy-wait is unnecessary.

Since an easy interface to hrtimers could lead to an undesired
proliferation of interrupts, we provide only a "range" API,
forcing the caller to think about an acceptable tolerance on
both ends and hopefully avoiding introducing another interrupt.

INTRO

As discussed here ( http://lkml.org/lkml/2007/8/3/250 ), msleep(1) is not
precise enough for many drivers (yes, sleep precision is an unfair notion,
but consistently sleeping for ~an order of magnitude greater than requested
is worth fixing). This patch adds a usleep API so that udelay does not have
to be used. Obviously not every udelay can be replaced (those in atomic
contexts or being used for simple bitbanging come to mind), but there are
many, many examples of

mydriver_write(...)
/* Wait for hardware to latch */
udelay(100)

in various drivers where a busy-wait loop is neither beneficial nor
necessary, but msleep simply does not provide enough precision and people
are using a busy-wait loop instead.

CONCERNS FROM THE RFC

Why is udelay a problem / necessary? Most callers of udelay are in device/
driver initialization code, which is serial...

	As I see it, there is only benefit to sleeping over a delay; the
	notion of "refactoring" areas that use udelay was presented, but
	I see usleep as the refactoring. Consider i2c, if the bus is busy,
	you need to wait a bit (say 100us) before trying again, your
	current options are:

		* udelay(100)
		* msleep(1) <-- As noted above, actually as high as ~20ms
				on some platforms, so not really an option
		* Manually set up an hrtimer to try again in 100us (which
		  is what usleep does anyway...)

	People choose the udelay route because it is EASY; we need to
	provide a better easy route.

	Device / driver / boot code is *currently* serial, but every few
	months someone makes noise about parallelizing boot, and IMHO, a
	little forward-thinking now is one less thing to worry about
	if/when that ever happens

udelay's could be preempted

	Sure, but if udelay plans on looping 1000 times, and it gets
	preempted on loop 200, whenever it's scheduled again, it is
	going to do the next 800 loops.

Is the interruptible case needed?

	Probably not, but I see usleep as a very logical parallel to msleep,
	so it made sense to include the "full" API. Processors are getting
	faster (albeit not as quickly as they are becoming more parallel),
	so if someone wanted to be interruptible for a few usecs, why not
	let them? If this is a contentious point, I'm happy to remove it.

OTHER THOUGHTS

I believe there is also value in exposing the usleep_range option; it gives
the scheduler a lot more flexibility and allows the programmer to express
his intent much more clearly; it's something I would hope future driver
writers will take advantage of.

To get the results in the NUMBERS section below, I literally s/udelay/usleep
the kernel tree; I had to go in and undo the changes to the USB drivers, but
everything else booted successfully; I find that extremely telling in and
of itself -- many people are using a delay API where a sleep will suit them
just fine.

SOME ATTEMPTS AT NUMBERS

It turns out that calculating quantifiable benefit on this is challenging,
so instead I will simply present the current state of things, and I hope
this to be sufficient:

How many udelay calls are there in 2.6.35-rc5?

	udealy(ARG) >=	| COUNT
	1000		| 319
	500		| 414
	100		| 1146
	20		| 1832

I am working on Android, so that is my focus for this. The following table
is a modified usleep that simply printk's the amount of time requested to
sleep; these tests were run on a kernel with udelay >= 20 --> usleep

"boot" is power-on to lock screen
"power collapse" is when the power button is pushed and the device suspends
"resume" is when the power button is pushed and the lock screen is displayed
         (no touchscreen events or anything, just turning on the display)
"use device" is from the unlock swipe to clicking around a bit; there is no
	sd card in this phone, so fail loading music, video, camera

	ACTION		| TOTAL NUMBER OF USLEEP CALLS	| NET TIME (us)
	boot		| 22				| 1250
	power-collapse	| 9				| 1200
	resume		| 5				| 500
	use device	| 59				| 7700

The most interesting category to me is the "use device" field; 7700us of
busy-wait time that could be put towards better responsiveness, or at the
least less power usage.

Signed-off-by: Patrick Pannuto <ppannuto@codeaurora.org>
Cc: apw@canonical.com
Cc: corbet@lwn.net
Cc: arjan@linux.intel.com
Cc: Randy Dunlap <rdunlap@xenotime.net>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
2011-07-22 16:20:35 +08:00
kfx
6631c31b41 update hdmi driver 2011-07-21 09:29:37 +08:00
杨云
be8970a989 Merge branch 'develop' of /home/rockchip/kernel into develop 2011-07-20 09:56:48 +08:00
Albin Tonnerre
3a3ba0241a lib: add support for LZO-compressed kernels
This patch series adds generic support for creating and extracting
LZO-compressed kernel images, as well as support for using such images on
the x86 and ARM architectures, and support for creating and using
LZO-compressed initrd and initramfs images.

Russell King said:

: Testing on a Cortex A9 model:
: - lzo decompressor is 65% of the time gzip takes to decompress a kernel
: - lzo kernel is 9% larger than a gzip kernel
:
: which I'm happy to say confirms your figures when comparing the two.
:
: However, when comparing your new gzip code to the old gzip code:
: - new is 99% of the size of the old code
: - new takes 42% of the time to decompress than the old code
:
: What this means is that for a proper comparison, the results get even better:
: - lzo is 7.5% larger than the old gzip'd kernel image
: - lzo takes 28% of the time that the old gzip code took
:
: So the expense seems definitely worth the effort.  The only reason I
: can think of ever using gzip would be if you needed the additional
: compression (eg, because you have limited flash to store the image.)
:
: I would argue that the default for ARM should therefore be LZO.

This patch:

The lzo compressor is worse than gzip at compression, but faster at
extraction.  Here are some figures for an ARM board I'm working on:

Uncompressed size: 3.24Mo
gzip  1.61Mo 0.72s
lzo   1.75Mo 0.48s

So for a compression ratio that is still relatively close to gzip, it's
much faster to extract, at least in that case.

This part contains:
 - Makefile routine to support lzo compression
 - Fixes to the existing lzo compressor so that it can be used in
   compressed kernels
 - wrapper around the existing lzo1x_decompress, as it only extracts one
   block at a time, while we need to extract a whole file here
 - config dialog for kernel compression

[akpm@linux-foundation.org: coding-style fixes]
[akpm@linux-foundation.org: cleanup]
Signed-off-by: Albin Tonnerre <albin.tonnerre@free-electrons.com>
Tested-by: Wu Zhangjin <wuzhangjin@gmail.com>
Acked-by: "H. Peter Anvin" <hpa@zytor.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Tested-by: Russell King <rmk@arm.linux.org.uk>
Acked-by: Russell King <rmk@arm.linux.org.uk>
Cc: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-07-19 16:51:28 +08:00