lwn.git/drivers/input/mouse/psmouse.h, branch 763

Revert "psmouse: upstream sync, fix low power toggle bugs"

2008-09-22T22:19:35+00:00

This reverts commit 93970329291a9ff73301a96a27c4af274f096835. The original commit contains changes to psmouse-base.c and olpc.c that mention an upstream fix and fixing a low power toggle bug but the commit does not point to an upstream source or describe what the bug is. Upon searching lkml, it looks like this commit is a merge of several patches sent upstream. As this has not received wide-spread testing yet, I am reverting for now and we can add the changes back in properly as separate commits after the 8.2 release. Signed-off-by: Deepak Saxena

psmouse: upstream sync, fix low power toggle bugs

2008-09-12T22:33:06+00:00

Signed-off-by: Andres Salomon

Merge branch 'linux-2.6'

2008-02-11T03:56:47+00:00

Sloppiest merge ever. LXFB still needs to be updated, it will not build. Conflicts: Documentation/kernel-parameters.txt Documentation/power/basic-pm-debugging.txt Documentation/power/swsusp.txt Documentation/power_supply_class.txt Documentation/usb/persist.txt arch/i386/Kconfig arch/i386/kernel/Makefile arch/i386/kernel/head.S arch/i386/kernel/setup.c arch/i386/pci/Makefile arch/i386/pci/init.c arch/i386/pci/pci.h arch/powerpc/configs/pmac32_defconfig block/ll_rw_blk.c drivers/Kconfig drivers/base/dd.c drivers/hid/usbhid/hid-core.c drivers/input/keyboard/atkbd.c drivers/input/mouse/psmouse.h drivers/media/video/cafe_ccic.c drivers/misc/Kconfig drivers/misc/Makefile drivers/misc/eeprom_93cx6.c drivers/mmc/card/block.c drivers/net/wireless/Kconfig drivers/net/wireless/Makefile drivers/net/wireless/hostap/hostap_ap.c drivers/net/wireless/hostap/hostap_pci.c drivers/net/wireless/hostap/hostap_plx.c drivers/net/wireless/libertas/11d.c drivers/net/wireless/libertas/11d.h drivers/net/wireless/libertas/Makefile drivers/net/wireless/libertas/assoc.c drivers/net/wireless/libertas/assoc.h drivers/net/wireless/libertas/cmd.c drivers/net/wireless/libertas/cmdresp.c drivers/net/wireless/libertas/debugfs.c drivers/net/wireless/libertas/decl.h drivers/net/wireless/libertas/defs.h drivers/net/wireless/libertas/dev.h drivers/net/wireless/libertas/ethtool.c drivers/net/wireless/libertas/host.h drivers/net/wireless/libertas/hostcmd.h drivers/net/wireless/libertas/if_cs.c drivers/net/wireless/libertas/if_usb.c drivers/net/wireless/libertas/if_usb.h drivers/net/wireless/libertas/join.c drivers/net/wireless/libertas/join.h drivers/net/wireless/libertas/main.c drivers/net/wireless/libertas/rx.c drivers/net/wireless/libertas/scan.c drivers/net/wireless/libertas/scan.h drivers/net/wireless/libertas/tx.c drivers/net/wireless/libertas/types.h drivers/net/wireless/libertas/wext.c drivers/net/wireless/libertas/wext.h drivers/net/wireless/rtl8187.h drivers/net/wireless/rtl8187_dev.c drivers/net/wireless/rtl8187_rtl8225.c drivers/net/wireless/rtl8187_rtl8225.h drivers/net/wireless/rtl818x.h drivers/net/wireless/zd1211rw/Makefile drivers/net/wireless/zd1211rw/zd_rf_uw2453.c drivers/net/wireless/zd1211rw/zd_usb.c drivers/power/Kconfig drivers/power/Makefile drivers/power/apm_power.c drivers/power/ds2760_battery.c drivers/power/olpc_battery.c drivers/power/pda_power.c drivers/power/pmu_battery.c drivers/power/power_supply.h drivers/power/power_supply_core.c drivers/power/power_supply_leds.c drivers/power/power_supply_sysfs.c drivers/serial/serial_core.c drivers/usb/core/Kconfig drivers/usb/core/driver.c drivers/usb/core/generic.c drivers/usb/core/hcd.c drivers/usb/core/hcd.h drivers/usb/core/hub.c drivers/usb/host/ehci-hcd.c drivers/usb/host/ehci-q.c drivers/usb/host/ohci-pci.c drivers/usb/storage/usb.c drivers/video/geode/Kconfig drivers/video/geode/Makefile drivers/video/geode/lxfb.h drivers/video/geode/lxfb_core.c drivers/video/geode/lxfb_ops.c drivers/w1/slaves/w1_ds2760.c drivers/w1/slaves/w1_ds2760.h fs/Kconfig include/asm-i386/setup.h include/linux/console.h include/linux/eeprom_93cx6.h include/linux/i2c-id.h include/linux/pda_power.h include/linux/power_supply.h include/linux/suspend.h include/linux/usb.h include/linux/usb/quirks.h kernel/power/Kconfig kernel/printk.c kernel/time/timekeeping.c net/mac80211/ieee80211_ioctl.c scripts/kconfig/qconf.cc sound/pci/ac97/ac97_codec.c Signed-off-by: Andres Salomon

OLPC: psmouse: clean up hgpk_new_mode

2008-01-14T04:33:10+00:00

Update names, call psmouse_set_state() to tell psmouse-base when to start and stop ignoring packets, don't recv a parameter back from 0xF2, etc. Signed-off-by: Andres Salomon

sysfs: kill unnecessary attribute->owner

2007-07-11T23:09:06+00:00

sysfs is now completely out of driver/module lifetime game. After deletion, a sysfs node doesn't access anything outside sysfs proper, so there's no reason to hold onto the attribute owners. Note that often the wrong modules were accounted for as owners leading to accessing removed modules. This patch kills now unnecessary attribute->owner. Note that with this change, userland holding a sysfs node does not prevent the backing module from being unloaded. For more info regarding lifetime rule cleanup, please read the following message. http://article.gmane.org/gmane.linux.kernel/510293 (tweaked by Greg to not delete the field just yet, to make it easier to merge things properly.) Signed-off-by: Tejun Heo Cc: Cornelia Huck Cc: Andrew Morton Signed-off-by: Greg Kroah-Hartman

Input: psmouse - add support for Cortron PS/2 Trackballs

2007-07-10T04:35:15+00:00

Cortron PS/2 Trackballs (700-0001A) report the 4th button using the 4th bit of the first packet (yes, it breaks the standard PS/2 protocol). This patch adds an extra protocol to generate BTN_SIDE based on the 4th bit. There's no way to detect those trackballs using any kind of special sequence, thus the protocol must be activated explicitely by writing into 'protocol' sysfs attribute: echo -n "cortps" > /sys/devices/platform/i8042/serio1/protocol Signed-off-by: Aristeu Rozanski Signed-off-by: Dmitry Torokhov

Input: psmouse - add support for eGalax PS/2 touchscreen controller

2007-05-25T04:22:49+00:00

Based on the touchkit USB and lifebook PS/2 touchscreen driver. The egalax touchsreen controller (PS/2 or USB version) is used in this 7" device: http://www.cartft.com/catalog/il/449 Signed-off-by: Michal Piotrowski Signed-off-by: Andrew Morton Signed-off-by: Dmitry Torokhov

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into experimental

2007-02-19T23:44:26+00:00

Conflicts: drivers/input/keyboard/atkbd.c drivers/mtd/nand/cafe.c

Input: psmouse - add support for eGalax PS/2 touchscreen controller

2007-02-18T06:49:10+00:00

Input: psmouse - properly reset mouse on shutdown/suspend

2007-02-18T06:40:24+00:00

Some people report that they need psmouse module unloaded for suspend to ram/disk to work properly. Let's make port cleanup behave the same way as driver unload. This fixes "bad state" roblem on various HP laptops, such as nx7400. Signed-off-by: Dmitry Torokhov