summaryrefslogtreecommitdiffstats
path: root/drivers/platform
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'for_linus' of ↵Linus Torvalds2010-03-038-895/+1042
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86 * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86: (45 commits) compal-laptop: Make it depend on CONFIG_RFKILL classmate-laptop: Added some keys present in other devices MAINTAINERS: Add git tree to x86 Platform Drivers asus-acpi: remove duplicate comparison of asus_model strings toshiba-acpi: fix multimedia keys on some machines dell-laptop: Fix errors on failure and exit paths dell-laptop: Fix build error by making buffer_mutex static asus-laptop: fix style problems reported by checkpath.pl asus-laptop: use device_create_file() instead of platform_group asus-laptop: clean led code asus-laptop: add gps rfkill asus-laptop: set initial lcd state asus-laptop: leds, remove dead code and fix asus_led_exit()/asus_led_init() asus-laptop: add backlight changes notifications asus-laptop: add bluetooth keys found on M9V asus-laptop: switch to sparse keymap library asus-laptop: rename wireless_status to wlan_status to avoid confusion asus-laptop: add error check for write_acpi_int calls asus-laptop: stop using ASUS_HANDLE and use relative methods instead asus-laptop: rename function talking directly to acpi with asus_xxx scheme ...
| * compal-laptop: Make it depend on CONFIG_RFKILLIngo Molnar2010-03-021-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | -tip testing found this build failure (x86 randconfig): drivers/built-in.o: In function `setup_rfkill': compal-laptop.c:(.text+0x36abe8): undefined reference to `rfkill_alloc' compal-laptop.c:(.text+0x36abfc): undefined reference to `rfkill_register' compal-laptop.c:(.text+0x36ac30): undefined reference to `rfkill_alloc' compal-laptop.c:(.text+0x36ac44): undefined reference to `rfkill_register' Which can happen with CONFIG_COMPAL_LAPTOP=y but COMPAL_LAPTOP=m. Signed-off-by: Ingo Molnar <mingo@elte.hu>
| * Merge branch 'for-upstream/platform-x86_tpacpi' of ↵Matthew Garrett2010-03-022-39/+87
| |\ | | | | | | | | | git://repo.or.cz/linux-2.6/linux-acpi-2.6/ibm-acpi-2.6 into x86-platform
| | * thinkpad-acpi: fix ALSA callback return statusHenrique de Moraes Holschuh2010-02-271-10/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clemens Ladisch reports that thinkpad-acpi improperly implements the ALSA API, and always returns 0 for success for the "put" callbacks while the API requires it to return "1" when the control value has been changed in the hardware/firmware. Rework the volume subdriver to be able to properly implement the ALSA API. Based on a patch by Clemens Ladisch <clemens@ladisch.de>. This fix is also needed on 2.6.33. Reported-by: Clemens Ladisch <clemens@ladisch.de> Signed-off-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br> Cc: stable@kernel.org
| | * thinkpad-acpi: lock down video output state accessHenrique de Moraes Holschuh2010-02-252-4/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Given the right combination of ThinkPad and X.org, just reading the video output control state is enough to hard-crash X.org. Until the day I somehow find out a model or BIOS cut date to not provide this feature to ThinkPads that can do video switching through X RandR, change permissions so that only processes with CAP_SYS_ADMIN can access any sort of video output control state. This bug could be considered a local DoS I suppose, as it allows any non-privledged local user to cause some versions of X.org to hard-crash some ThinkPads. Reported-by: Jidanni <jidanni@jidanni.org> Signed-off-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br> Cc: stable@kernel.org
| | * thinkpad-acpi: fix bluetooth/wwan resumeHenrique de Moraes Holschuh2010-02-251-8/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Studying the DSDTs of various thinkpads, it looks like bit 3 of the argument to SBDC and SWAN is not "set radio to last state on resume". Rather, it seems to be "if this bit is set, enable radio on resume, otherwise disable it on resume". So, the proper way to prepare the radios for S3 suspend is: disable radio and clear bit 3 on the SBDC/SWAN call to to resume with radio disabled, and enable radio and set bit 3 on the SBDC/SWAN call to resume with the radio enabled. Also, for persistent devices, the rfkill core does not restore state, so we really need to get the firmware to do the right thing. We don't sync the radio state on suspend, instead we trust the BIOS to not do anything weird if we never touched the radio state since boot. Time will tell if that's a wise way of doing things... Signed-off-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br> Cc: stable@kernel.org
| | * thinkpad-acpi: make driver events work in NVRAM poll modeHenrique de Moraes Holschuh2010-02-251-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thadeu Lima de Souza Cascardo reports this: Brightness notification does not work until the user writes to hotkey_mask attribute. That's because the polling thread will only run if hotkey_user_mask is set and someone is reading the input device or if hotkey_driver_mask is set. In this second case, this condition is not tested after the mask is changed, because the brightness and volume drivers are started after the hotkey drivers. Fix tpacpi_hotkey_driver_mask_set() to call hotkey_poll_setup(), so that the poller kthread will be started when needed. Reported-by: Thadeu Lima de Souza Cascardo <cascardo@holoscopio.com> Tested-by: Thadeu Lima de Souza Cascardo <cascardo@holoscopio.com> Signed-off-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: stable@kernel.org
| | * thinkpad-acpi: fix poll thread auto-startHenrique de Moraes Holschuh2010-02-251-9/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The driver was not starting the NVRAM polling thread if the input device was bound immediately after registration. This fixes: http://bugzilla.kernel.org/show_bug.cgi?id=15118 Reported-by: Florian Zumbiehl <florz@florz.de> Signed-off-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br> Cc: stable@kernel.org
| | * thinkpad-acpi: R52 brightness_mode has been confirmedHenrique de Moraes Holschuh2010-02-251-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We can stop pestering users for confirmation of the brightness_mode default for firmware TP-76. While at it, add a few missing comments in that quirk table. Reported-by: Whoopie <whoopie79@gmx.net> Signed-off-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br> Cc: stable@kernel.org
| | * thinkpad-acpi: document HKEY event 3006Henrique de Moraes Holschuh2010-02-251-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Event 0x3006 is used to help power management of the ODD in the UltraBay. The EC generates this event when the ODD eject button is pressed (even if the bay is powered down). Normally, Linux doesn't need this as we keep the SATA link powered up (which wastes power). The EC powers up the bay by itself when the ODD eject button is pressed, and the SATA PHY reports the hotplug. However, we could also power that SATA link down (and for that matter, also power down the Ultrabay) if the ODD is left idle for a while with no disk inside, and use event 0x3006 to know when we need that SATA link powered back up. For now, just stop asking for more information when event 0x3006 is seen, there is no point in pestering users about it anymore. Signed-off-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br> Cc: stable@kernel.org
| * | classmate-laptop: Added some keys present in other devicesThadeu Lima de Souza Cascardo2010-03-011-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Some new devices have extra keys, which we add to our list. Currently, they all generate events that allow us to use a simple table/array, without need for the sparse keymap. Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@holoscopio.com>
| * | asus-acpi: remove duplicate comparison of asus_model stringsRoel Kluin2010-03-011-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These tests already occur elsewhere Signed-off-by: Roel Kluin <roel.kluin@gmail.com> Cc: Corentin Chary <corentincj@iksaif.net> Cc: Karol Kozimor <sziwan@users.sourceforge.net> Cc: Len Brown <lenb@kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
| * | Merge git://git.iksaif.net/acpi4asus into x86-platformMatthew Garrett2010-03-013-836/+928
| |\ \
| | * \ Merge branch 'eeepc-laptop' into acpi4asusCorentin Chary2010-02-281-1/+20
| | |\ \
| | | * | eeepc-laptop: check wireless hotplug eventsAlan Jenkins2010-02-281-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before we mark the wireless device as unplugged, check PCI config space to see whether the wireless device is really disabled (and vice versa). This works around newer models which don't want the hotplug code, where we end up disabling the wired network device. My old 701 still works correctly with this. I can also simulate an afflicted model by changing the hardcoded PCI bus/slot number in the driver, and it seems to work nicely (although it is a bit noisy). In future this type of hotplug support will be implemented by the PCI core. The existing blacklist and the new warning message will be removed at that point. Signed-off-by: Alan Jenkins <alan-jenkins@tuffmail.co.uk> Signed-off-by: Corentin Chary <corentincj@iksaif.net>
| | | * | eeepc-laptop: disable wireless hotplug for 1005PEAlan Jenkins2010-02-281-1/+2
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The wireless hotplug code is not needed on this model, and it disables the wired ethernet card. (Like on the 1005HA and 1201N). References: <http://lists.alioth.debian.org/pipermail/debian-eeepc-devel/2010-February/003281.html> Signed-off-by: Alan Jenkins <alan-jenkins@tuffmail.co.uk> Reported-by: Ansgar Burchardt <ansgar@43-1.org> CC: stable@kernel.org
| | * | asus-laptop: fix style problems reported by checkpath.plCorentin Chary2010-02-281-47/+47
| | | | | | | | | | | | | | | | Signed-off-by: Corentin Chary <corentincj@iksaif.net>
| | * | asus-laptop: use device_create_file() instead of platform_groupCorentin Chary2010-02-281-82/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is two reason to do that: - we don't want a "gps" file if the model doesn't have a gps - we don't want to use global variables anymore Signed-off-by: Corentin Chary <corentincj@iksaif.net>
| | * | asus-laptop: clean led codeCorentin Chary2010-02-281-120/+115
| | | | | | | | | | | | | | | | | | | | | | | | Remove all "templates" and add a generic struct asus_led instead. Signed-off-by: Corentin Chary <corentincj@iksaif.net>
| | * | asus-laptop: add gps rfkillCorentin Chary2010-02-282-7/+59
| | | | | | | | | | | | | | | | | | | | | | | | The rfkill subsystem will enable gps by default. Signed-off-by: Corentin Chary <corentincj@iksaif.net>
| | * | asus-laptop: set initial lcd stateCorentin Chary2010-02-281-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | There is no way to find the initial lcd state. A quick workaround is to set it "on" by default. Anyway this feature is scheduled for removal. Signed-off-by: Corentin Chary <corentin.chary@gmail.com>
| | * | asus-laptop: leds, remove dead code and fix asus_led_exit()/asus_led_init()Corentin Chary2010-02-281-17/+14
| | | | | | | | | | | | | | | | | | | | | | | | These bug where introduced in "asus-laptop: code movement". Signed-off-by: Corentin Chary <corentin.chary@gmail.com>
| | * | asus-laptop: add backlight changes notificationsCorentin Chary2010-02-281-2/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't want to send KEY_BRIGHTNESSDOWN or KEY_BRIGHTNESSUP because it would be a lie to tell userspace that we want to change the brightness while it's actually done by the firmware. Signed-off-by: Corentin Chary <corentincj@iksaif.net>
| | * | asus-laptop: add bluetooth keys found on M9VCorentin Chary2010-02-281-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Reported by Andrey F. Ilchuk Signed-off-by: Corentin Chary <corentincj@iksaif.net>
| | * | asus-laptop: switch to sparse keymap libraryCorentin Chary2010-02-282-141/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch is based on Dmitry Torokhov's patch with some modifications and cleanups. Signed-off-by: Corentin Chary <corentincj@iksaif.net>
| | * | asus-laptop: rename wireless_status to wlan_status to avoid confusionCorentin Chary2010-02-281-5/+5
| | | | | | | | | | | | | | | | Signed-off-by: Corentin Chary <corentincj@iksaif.net>
| | * | asus-laptop: add error check for write_acpi_int callsCorentin Chary2010-02-281-8/+25
| | | | | | | | | | | | | | | | | | | | | | | | Also add to helpers for bluetooth and wlan. Signed-off-by: Corentin Chary <corentincj@iksaif.net>
| | * | asus-laptop: stop using ASUS_HANDLE and use relative methods insteadCorentin Chary2010-02-281-111/+129
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Stop using ASUS_HANDLE because most of the time it is not needed. This macro was introduced to display_get and lcd_switch which are not part of the interface provided by Asus, and are scheduled for removal. Signed-off-by: Corentin Chary <corentincj@iksaif.net>
| | * | asus-laptop: rename function talking directly to acpi with asus_xxx schemeCorentin Chary2010-02-281-19/+19
| | | | | | | | | | | | | | | | Signed-off-by: Corentin Chary <corentincj@iksaif.net>
| | * | asus-laptop: removing read_status/store_status/write_status and asus->statusCorentin Chary2010-02-281-57/+24
| | | | | | | | | | | | | | | | Signed-off-by: Corentin Chary <corentincj@iksaif.net>
| | * | asus-laptop: stop using read_status for lcdCorentin Chary2010-02-281-17/+20
| | | | | | | | | | | | | | | | | | | | | | | | (anyway lcd code is scheduled for removal) Signed-off-by: Corentin Chary <corentincj@iksaif.net>
| | * | asus-laptop: stop using read_status and store_status for GPSCorentin Chary2010-02-281-21/+35
| | | | | | | | | | | | | | | | Signed-off-by: Corentin Chary <corentincj@iksaif.net>
| | * | asus-laptop: stop using read_status for bluetooth and wlanCorentin Chary2010-02-281-26/+29
| | | | | | | | | | | | | | | | Signed-off-by: Corentin Chary <corentincj@iksaif.net>
| | * | asus-laptop: code movementCorentin Chary2010-02-281-217/+223
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The asus-laptop driver implements a number of interfaces like the backlight class driver. This change makes it easier to examine the implementation of one interface at at a time, without having to search through the file to find init() and exit() functions etc. Signed-off-by: Corentin Chary <corentincj@iksaif.net>
| | * | asus-laptop: callbacks should use "driver data" parameter or fieldCorentin Chary2010-02-281-153/+209
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (Changelog stolen from Alan's patch for eeepc-laptop, but this patch does the same thing for asus-laptop) Callback methods should not refer to a variable like "asus" (formally "hotk"). Instead, they should extract the data they need either from a "driver data" parameter, or the "driver data" field of the object which they operate on. The "asus" variable can then be removed. In practice, drivers under "drivers/platform" can get away without using driver data, because it doesn't make sense to have more than one instance of them. However this makes it harder to review them for correctness. This is especially true for core ACPI developers who have not previously been exposed to this anti-pattern :-). This will serve as an example of best practice for new driver writers (whether they find it themselves, or have it pointed out during review :-). Signed-off-by: Corentin Chary <corentincj@iksaif.net>
| | * | asus-laptop: move backlight and dsdt info inside asus_laptop structCorentin Chary2010-02-281-39/+30
| | | | | | | | | | | | | | | | | | | | | | | | Prepare the use of "driver data" for callbacks. Signed-off-by: Corentin Chary <corentincj@iksaif.net>
| | * | asus-laptop: revise namesCorentin Chary2010-02-281-110/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | asus-laptop now does a lot more than just hotkeys. Replace the "hotk" names used throughout the driver with some slightly more appropriate names. The actual strings used in kernel messages and sysfs are left unchanged. Signed-off-by: Corentin Chary <corentincj@iksaif.net>
| | * | asus-laptop: change initialization orderCorentin Chary2010-02-281-189/+180
| | | | | | | | | | | | | | | | | | | | | | | | Clean asus-laptop initialization to match new eeepc-laptop code. Signed-off-by: Corentin Chary <corentincj@iksaif.net>
| | * | asus-laptop: remove unecessary hotk != NULL checkCorentin Chary2010-02-281-4/+1
| | | | | | | | | | | | | | | | Signed-off-by: Corentin Chary <corentincj@iksaif.net>
| | * | asus-laptop: use tabs to indent macros and remove unused onesCorentin Chary2010-02-281-29/+22
| | | | | | | | | | | | | | | | Signed-off-by: Corentin Chary <corentincj@iksaif.net>
| | * | asus-laptop: simplify write_acpi_intCorentin Chary2010-02-281-11/+16
| | | | | | | | | | | | | | | | | | | | | | | | We only need a buffer for "INIT". Adds write_acpi_init_ret for it. Signed-off-by: Corentin Chary <corentincj@iksaif.net>
| | * | asus-laptop: no need to check argument of set_brightness()Corentin Chary2010-02-281-8/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We already tell the backlight class our maximum brightness value; it will validate the user requested values for us. Signed-off-by: Corentin Chary <corentincj@iksaif.net>
| | * | asus-laptop: add wireless and bluetooth status parameterCorentin Chary2010-02-281-2/+17
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | These to parameter allow to set the status of wlan and bluetooth device when the module load. On some models, the device will always be down on boot, so the default behavior is to always enable these devices. Signed-off-by: Corentin Chary <corentincj@iksaif.net>
| * | toshiba-acpi: fix multimedia keys on some machinesFrans Pop2010-03-011-14/+16
| | | | | | | | | | | | | | | | | | | | | | | | Some Toshibas only send ACPI events on key down, not key release. Ignore any release events and send key down and key up events on every ACPI key down event. Signed-off-by: Frans Pop <elendil@planet.nl>
| * | dell-laptop: Fix errors on failure and exit pathsMatthew Garrett2010-03-011-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | Make sure that work is cancelled after removing the i8042 filter, and unregister the platform device rather than deleting it. Signed-off-by: Matthew Garrett <mjg@redhat.com> Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
| * | dell-laptop: Fix build error by making buffer_mutex staticIngo Molnar2010-03-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The following build bug (x86, allyesconfig): arch/x86/oprofile/built-in.o:(.data+0x250): multiple definition of `buffer_mutex' Was triggered in -tip testing, caused by this upstream commit: 116ee77: dell-laptop: Use buffer with 32-bit physical address There's multiple buffer_mutex's in the kernel. Make this new one static. Signed-off-by: Ingo Molnar <mingo@elte.hu>
* | | Merge branch 'acpica' of ↵Linus Torvalds2010-03-012-4/+4
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 * 'acpica' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: ACPI: replace acpi_integer by u64 ACPICA: Update version to 20100121. ACPICA: Remove unused uint32_struct type ACPICA: Disassembler: Remove obsolete "Integer64" field in parse object ACPICA: Remove obsolete ACPI_INTEGER (acpi_integer) type ACPICA: Predefined name repair: fix NULL package elements ACPICA: AcpiGetDevices: Eliminate unnecessary _STA calls ACPICA: Update all ACPICA copyrights and signons to 2010 ACPICA: Update for new gcc-4 warning options
| * | ACPI: replace acpi_integer by u64Lin Ming2010-01-282-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | acpi_integer is now obsolete and removed from the ACPICA code base, replaced by u64. Signed-off-by: Lin Ming <ming.m.lin@intel.com> Signed-off-by: Len Brown <len.brown@intel.com>
* | | toshiba_acpi: Add full hotkey supportMatthew Garrett2010-02-251-7/+199
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Calling the ENAB method on Toshiba laptops results in notifications being sent when laptop hotkeys are pressed. This patch simply calls that method and sets up an input device if it's successful. Signed-off-by: Matthew Garrett <mjg@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Len Brown <len.brown@intel.com>
* | | hp-wmi: Add support for tablet rotation keyMatthew Garrett2010-02-251-0/+1
| | | | | | | | | | | | | | | | | | | | | The HP touchsmart tablet has a key for rotating the UI from landscape to portrait. Add support for it. Signed-off-by: Matthew Garrett <mjg@redhat.com>
OpenPOWER on IntegriCloud