summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'x86-platform-next' into x86-platformMatthew Garrett2011-05-2935-1192/+1393
|\
| * acer-wmi: support integer return type from WMI methodsLee, Chun-Yi2011-05-271-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Acer WMID_GUID1/2 method's return value was declared to integer type on Gateway notebook. So, add this patch for support integer return type. Reference: bko#33032 https://bugzilla.kernel.org/show_bug.cgi?id=33032 Tested on Gateway NV5909H laptop Tested-by: Filipus Klutiero <chealer@gmail.com> Cc: Carlos Corbacho <carlos@strangeworlds.co.uk> Cc: Matthew Garrett <mjg@redhat.com> Cc: Dmitry Torokhov <dtor@mail.ru> Cc: Corentin Chary <corentincj@iksaif.net> Cc: Thomas Renninger <trenn@suse.de> Signed-off-by: Lee, Chun-Yi <jlee@novell.com> Signed-off-by: Matthew Garrett <mjg@redhat.com>
| * msi-laptop: fix section mismatch in reference from the function ↵Lee, Chun-Yi2011-05-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | load_scm_model_init There have section mismatch warning message shows up when building the kernel with make CONFIG_DEBUG_SECTION_MISMATCH=y. The problem is the load_scm_model_init() calls msi_laptop_input_setup() which is an __init function, but load_scm_model_init() lacks a __init annotation. This patch add __init on load_scm_model_init() to avoid warning message. Cc: Matthew Garrett <mjg@redhat.com> Cc: Dmitry Torokhov <dtor@mail.ru> Cc: Corentin Chary <corentincj@iksaif.net> Cc: Thomas Renninger <trenn@suse.de> Signed-off-by: Lee, Chun-Yi <jlee@novell.com> Signed-off-by: Matthew Garrett <mjg@redhat.com>
| * acer-wmi: support to set communication device state by new wmid methodLee, Chun-Yi2011-05-271-1/+110
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Have many Acer notebooks' BIOS already support new WMID_GUID3 method. On those machines, that will be better set communication device by evaluate WMID_GUID3 method. Tested on Acer Travelmate 8572 Cc: Carlos Corbacho <carlos@strangeworlds.co.uk> Cc: Matthew Garrett <mjg@redhat.com> Cc: Dmitry Torokhov <dtor@mail.ru> Cc: Corentin Chary <corentincj@iksaif.net> Cc: Thomas Renninger <trenn@suse.de> Signed-off-by: Lee, Chun-Yi <jlee@novell.com> Signed-off-by: Matthew Garrett <mjg@redhat.com>
| * acer-wmi: allow 64-bits return buffer from WMI methodsLee, Chun-Yi2011-05-271-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Acer WMID_GUID1/2 method's return buffer was declared to 64-bits on some Acer notebook, but WMI method only use 32-bits in return buffer. So, add this patch for allow 64-bits return buffer. Reference: bko#34142 https://bugzilla.kernel.org/show_bug.cgi?id=34142 Tested on Acer Travelmate 5735Z-452G32Mnss Tested-by: Melchior FRANZ <melchior.franz@gmail.com> Cc: Carlos Corbacho <carlos@strangeworlds.co.uk> Cc: Matthew Garrett <mjg@redhat.com> Cc: Dmitry Torokhov <dtor@mail.ru> Cc: Corentin Chary <corentincj@iksaif.net> Cc: Thomas Renninger <trenn@suse.de> Signed-off-by: Lee, Chun-Yi <jlee@novell.com> Signed-off-by: Matthew Garrett <mjg@redhat.com>
| * acer-wmi: check the existence of internal 3G device when set capabilityLee, Chun-Yi2011-05-271-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | That will be better to check the existence of internal 3G device when we set threeg capability and generate killswitch for threeg. It can avoid userland access 3G rfkill but the machine doesn't have internal 3G device. Reference: bko#32862 https://bugzilla.kernel.org/show_bug.cgi?id=32862 Tested on Acer Aspire 8930G, Acer Travelmate 8572 Tested-by: Hector Martin <hector@marcansoft.com> Cc: Carlos Corbacho <carlos@strangeworlds.co.uk> Cc: Matthew Garrett <mjg@redhat.com> Cc: Dmitry Torokhov <dtor@mail.ru> Cc: Corentin Chary <corentincj@iksaif.net> Cc: Thomas Renninger <trenn@suse.de> Signed-off-by: Lee, Chun-Yi <jlee@novell.com> Signed-off-by: Matthew Garrett <mjg@redhat.com>
| * platform/x86:delete two unused variablesWeiping Pan2011-05-271-2/+0
| | | | | | | | | | | | | | | | variable handle is not used in these two functions, just delete them. Signed-off-by: Weiping Pan <panweiping3@gmail.com> Signed-off-by: Matthew Garrett <mjg@redhat.com>
| * support wlan hotkey on Acer Travelmate 5735ZMelchior FRANZ2011-05-271-1/+14
| | | | | | | | | | | | | | | | | | | | | | On an Acer Travelmate 5735Z-452G32Mnss the WLAN-enable/disable key doesn't send 0x1 as acpi event key code, but 0x3. This patch also makes the module ignore hotkey acpi events for functions that are already handled without. This avoids warning message "keyboard: can't emulate rawmode for keycode 240". Signed-off-by: Melchior FRANZ <mfranz@aon.at> Signed-off-by: Matthew Garrett <mjg@redhat.com>
| * platform-x86: intel_mid_thermal: Fix memory leakAmeya Palande2011-05-271-0/+1
| | | | | | | | | | Signed-off-by: Ameya Palande <2ameya@gmail.com> Signed-off-by: Matthew Garrett <mjg@redhat.com>
| * platform/x86: Fix Makefile for intel_mid_powerbtnAmeya Palande2011-05-271-1/+1
| | | | | | | | | | Signed-off-by: Ameya Palande <2ameya@gmail.com> Signed-off-by: Matthew Garrett <mjg@redhat.com>
| * platform/x86: Simplify intel_mid_powerbtnAmeya Palande2011-05-271-42/+30
| | | | | | | | | | | | | | | | | | | | This patch: 1. Removes unnecessay #defines 2. Removes 'mfld_pb_priv' data structure which results in simpler error handling and less memory allocations. Signed-off-by: Ameya Palande <2ameya@gmail.com> Signed-off-by: Matthew Garrett <mjg@redhat.com>
| * acer-wmi: Delete out-of-date documentationCarlos Corbacho2011-05-271-184/+0
| | | | | | | | | | | | | | | | The documentation file for acer-wmi is long out of date, and there's not much point in keeping it around either. Signed-off-by: Carlos Corbacho <carlos@strangeworlds.co.uk> Signed-off-by: Matthew Garrett <mjg@redhat.com>
| * acerhdf: Clean up includesJean Delvare2011-05-271-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * The acerhdf driver isn't an ACPI driver, so it needs not include <acpi/acpi_drivers.h>. All it uses is ec_read() and ec_write(), for which <linux/acpi.h> is sufficient. * I couldn't find any reason why <linux/fs.h> and <linux/sched.h> were included. This should avoid unneeded rebuilds of the acerhdf driver. Signed-off-by: Jean Delvare <khali@linux-fr.org> Cc: Peter Feuerer <peter@piie.net> Cc: Matthew Garrett <mjg@redhat.com> Signed-off-by: Matthew Garrett <mjg@redhat.com>
| * acerhdf: Drop pointless dependency on THERMAL_HWMONJean Delvare2011-05-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | The THERMAL_HWMON config option simply exposes the thermal zone temperature values and limits to user-space. It makes no sense for a kernel driver to depend on this. Signed-off-by: Jean Delvare <khali@linux-fr.org> Cc: Peter Feuerer <peter@piie.net> Cc: Matthew Garrett <mjg@redhat.com> Signed-off-by: Matthew Garrett <mjg@redhat.com>
| * acer-wmi: Update MAINTAINERSCarlos Corbacho2011-05-271-3/+1
| | | | | | | | | | | | | | | | | | | | I don't have the time or much interest these days in maintaining acer-wmi, as I don't have access to newer Acer hardware. As he's been doing most of the work these days anyway, Joey Lee has kindly agreed to take over. Signed-off-by: Carlos Corbacho <carlos@strangeworlds.co.uk> Cc: Joey Lee <jlee@novell.com> Signed-off-by: Matthew Garrett <mjg@redhat.com>
| * wmi: Orphan ACPI-WMI driverCarlos Corbacho2011-05-271-3/+1
| | | | | | | | | | | | | | | | I no longer have the time to work on this, and haven't really been doing any work to this either. Time to let someone else take the reins. Signed-off-by: Carlos Corbacho <carlos@strangeworlds.co.uk> Signed-off-by: Matthew Garrett <mjg@redhat.com>
| * tc1100-wmi: Orphan driverCarlos Corbacho2011-05-271-2/+1
| | | | | | | | | | | | | | | | I've never owned the hardware, this was a port of an existing driver to prove that the ACPI-WMI code was useful to more than just acer-wmi. Signed-off-by: Carlos Corbacho <carlos@strangeworlds.co.uk> Signed-off-by: Matthew Garrett <mjg@redhat.com>
| * acer-wmi: does not allow negative number set to initial device stateLee, Chun-Yi2011-05-271-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The driver set module parameter value: mailled, threeg and brightness to BIOS by evaluate wmi method when driver was initialed. The default values for those parameters are -1, so, that will be better don't set negative value to BIOS. Cc: Carlos Corbacho <carlos@strangeworlds.co.uk> Cc: Matthew Garrett <mjg@redhat.com> Cc: Dmitry Torokhov <dtor@mail.ru> Cc: Corentin Chary <corentincj@iksaif.net> Signed-off-by: Lee, Chun-Yi <jlee@novell.com> Signed-off-by: Matthew Garrett <mjg@redhat.com>
| * platform/oaktrail: ACPI EC Extra driver for OaktrailYin Kangkai2011-05-273-0/+406
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This driver implements an Extra ACPI EC driver for products based on Intel Oaktrail platform. This driver does below things: 1. registers itself in the Linux backlight control in /sys/class/backlight/intel_oaktrail/ 2. registers in the rfkill subsystem here: /sys/class/rfkill/rfkillX/ for these components: wifi, bluetooth, wwan (3g), gps Signed-off-by: Yin Kangkai <kangkai.yin@linux.intel.com> [Extracted from a bigger patch by Yin Kangkai, this version leaves out some sysfs bits that probably want to be driver managed, and ACPI i2c enumeration] Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Matthew Garrett <mjg@redhat.com>
| * thinkpad_acpi: Convert printks to pr_<level>Joe Perches2011-05-271-284/+188
| | | | | | | | | | | | | | | | | | | | | | | | Add pr_fmt. Removed local TPACPI_<level> #defines, convert to pr_<level>. Neaten dbg_<foo> macros. Added a few missing newlines to logging messages. Added static inline str_supported for !CONFIG_THINKPAD_ACPI_DEBUG vdbg_printk defect reported by Sedat Dilek <sedat.dilek@googlemail.com>. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Matthew Garrett <mjg@redhat.com>
| * thinkpad_acpi: Correct !CONFIG_THINKPAD_ACPI_VIDEO warningJoe Perches2011-05-271-9/+9
| | | | | | | | | | | | | | | | Move TPACPI_HANDLE declaration into #ifdef block and neaten it a bit. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Matthew Garrett <mjg@redhat.com>
| * platform-x86: intel_mid_thermal: Fix coding styleAmeya Palande2011-05-271-306/+300
| | | | | | | | | | | | | | Before fixing checkpatch.pl reported 74 errors and 234 warnings Signed-off-by: Ameya Palande <ameya.palande@nokia.com> Signed-off-by: Matthew Garrett <mjg@redhat.com>
| * xo15-ebook: Use pr_<level>Joe Perches2011-05-271-2/+3
| | | | | | | | | | | | | | | | | | | | | | Use the current logging styles. Remove local #define PREFIX. Add pr_fmt. Convert printk to pr_<level>. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Matthew Garrett <mjg@redhat.com>
| * wmi: Removed trailing whitespace from logging message.Joe Perches2011-05-271-5/+5
| | | | | | | | | | | | | | Just neatening. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Matthew Garrett <mjg@redhat.com>
| * toshiba: Convert printks to pr_<level>Joe Perches2011-05-272-36/+34
| | | | | | | | | | | | | | | | | | Add pr_fmt. Remove local MY_<foo> #defines. Convert printks to pr_<level>. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Matthew Garrett <mjg@redhat.com>
| * topstar-laptop: Convert remaining printk to pr_infoJoe Perches2011-05-271-1/+1
| | | | | | | | | | | | | | To be similar to all other uses. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Matthew Garrett <mjg@redhat.com>
| * tc1100-wmi: Add pr_fmt, use pr_<level>Joe Perches2011-05-271-4/+3
| | | | | | | | | | | | | | | | Use the more normal logging styles. Removed now unused local logging #defines. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Matthew Garrett <mjg@redhat.com>
| * sony-laptop: Add and use #define pr_fmtJoe Perches2011-05-271-55/+49
| | | | | | | | | | | | | | | | | | Add pr_fmt. Remove now unused #define DRV_PRX. Neaten dprintk macro. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Matthew Garrett <mjg@redhat.com>
| * msi-wmi: Use pr_fmt and pr_<level>Joe Perches2011-05-271-25/+20
| | | | | | | | | | | | | | | | | | | | Added pr_fmt. Removed now unused #define DRV_PFX Convert dprintk to pr_debug. Convert printks to pr_<level>. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Matthew Garrett <mjg@redhat.com>
| * msi-laptop: pr_<level> neateningJoe Perches2011-05-271-5/+4
| | | | | | | | | | | | | | Just making it a bit more like other logging message uses. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Matthew Garrett <mjg@redhat.com>
| * intel_pmic_gpio: Convert printks to pr_<level>Joe Perches2011-05-271-7/+7
| | | | | | | | | | | | | | | | | | Add #define pr_fmt(fmt) "%s: " fmt, __func__ to prefix function name to each output message. Convert printks to pr_<level>. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Matthew Garrett <mjg@redhat.com>
| * intel_menlow: Add pr_fmt and use pr_<level>Joe Perches2011-05-271-2/+3
| | | | | | | | | | | | | | | | Add pr_fmt to prefix the logging messages. Convert printk to pr_<level>. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Matthew Garrett <mjg@redhat.com>
| * ideapad-laptop: Add pr_fmtJoe Perches2011-05-271-0/+2
| | | | | | | | | | | | | | Add pr_fmt to prefix logging messages. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Matthew Garrett <mjg@redhat.com>
| * ibm_rtl: Use pr_fmt and pr_<level>Joe Perches2011-05-271-8/+11
| | | | | | | | | | | | | | | | | | Remove hard coded prefixes from logging messages. Neaten RTL_DEBUG macro and uses. Convert __FUNCTION__ to __func__. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Matthew Garrett <mjg@redhat.com>
| * hp-wmi: Convert printks to pr_<level>Joe Perches2011-05-271-26/+17
| | | | | | | | | | | | | | | | Added pr_fmt and converted printks to pr_<level>. Removed now unused PREFIX and UNIMPL #defines. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Matthew Garrett <mjg@redhat.com>
| * hdaps: Convert printks to pr_<level>Joe Perches2011-05-271-9/+10
| | | | | | | | | | | | | | | | Added pr_fmt, converted printks and removed hard coded prefixes. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Matthew Garrett <mjg@redhat.com>
| * fujitsu-laptop: Convert printks to pr_<level>Joe Perches2011-05-271-20/+19
| | | | | | | | | | | | | | | | Added pr_fmt, converted printks and removed hard coded prefixes. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Matthew Garrett <mjg@redhat.com>
| * eeepc: Use pr_warnJoe Perches2011-05-272-17/+18
| | | | | | | | | | | | | | | | Just a trivial pr_warning to pr_warn conversion while adding a few missing newlines. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Matthew Garrett <mjg@redhat.com>
| * dell: Convert printks to pr_<level>Joe Perches2011-05-273-16/+16
| | | | | | | | | | | | | | | | Add pr_fmt. Remove hard coded prefixes and use pr_<level>. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Matthew Garrett <mjg@redhat.com>
| * compal-laptop: Convert printks to pr_<level>Joe Perches2011-05-271-13/+9
| | | | | | | | | | | | | | | | Add pr_fmt. Convert printks to pr_<level> removing DRIVER_NAME prefix. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Matthew Garrett <mjg@redhat.com>
| * asus: Add pr_fmt and convert printks to pr_<level>Joe Perches2011-05-273-72/+59
| | | | | | | | | | | | | | | | | | Add pr_fmt, prefixes each log message. Convert printks to pr_<level>. Convert pr_warning to pr_warn. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Matthew Garrett <mjg@redhat.com>
| * acer-wmi: pr_<level> cleanupsJoe Perches2011-05-271-16/+16
| | | | | | | | | | | | | | | | Convert pr_warning to pr_warn. Add some missing newlines to pr_<level> uses. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Matthew Garrett <mjg@redhat.com>
| * ibm_rtl: Remove warnings from casts of pointer to intJoe Perches2011-05-271-2/+2
| | | | | | | | | | | | | | Just print them as %p. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Matthew Garrett <mjg@redhat.com>
| * asus-wmi: Remove __init from asus_wmi_platform_initJoe Perches2011-05-271-1/+1
| | | | | | | | | | | | | | It's used by a non-init function. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Matthew Garrett <mjg@redhat.com>
* | Merge branch 'for-linus' of ↵Linus Torvalds2011-05-2815-569/+62
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin: Blackfin: debug-mmrs: include RSI_PID[4567] MMRs Blackfin: bf51x: fix up RSI_PID# MMR defines Blackfin: bf52x/bf54x: fix up usb MMR defines Blackfin: debug-mmrs: fix typos with gptimers/mdma/ppi Blackfin: gptimers: add structure for hardware register layout Blackfin: wire up new sendmmsg syscall Blackfin: mach/bfin_serial_5xx.h: punt now-unused header Blackfin: bfin_serial.h: turn default port wrappers into stubs
| * | Blackfin: debug-mmrs: include RSI_PID[4567] MMRsMike Frysinger2011-05-281-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | The documentation is a little iffy as to whether these are actual MMRs, but reading them on the hardware works, and the previous version of this logic (the SDH) had PID[4567]. So add it for RSI too. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * | Blackfin: bf51x: fix up RSI_PID# MMR definesMike Frysinger2011-05-281-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | Looks like the copying of MMR defines from the SDH block missed updating the addresses of the RSI_PID# registers. So tweak them to reflect the actual hardware. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * | Blackfin: bf52x/bf54x: fix up usb MMR definesMike Frysinger2011-05-282-11/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The bf52x/bf54x have the incorrect addresses for USB_EP_NI7_RXINTERVAL and USB_EP_NI7_TXCOUNT, so adjust those. Further, the bf54x header puts the USB defines in the wrong place, so shuffle them back to the right grouping. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * | Blackfin: debug-mmrs: fix typos with gptimers/mdma/ppiMike Frysinger2011-05-281-18/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This code was mostly developed against a BF54x, so some BF537-specific issues were missed. The PPI block starts at PPI_CONTROL, not PPI_STATUS (which is the reverse of the EPPI block). The MDMA block starts at MDMA_NEXT_DESC_PTR, not MDMA_CONFIG. Seems the sim does not catch misreads here so that'll need to get fixed. The gptimer block is mostly 32bit regs, not 16bit. Use the gptimer struct to figure that out rather than hardcoding it locally. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * | Blackfin: gptimers: add structure for hardware register layoutMike Frysinger2011-05-281-0/+18
| | | | | | | | | | | | Signed-off-by: Mike Frysinger <vapier@gentoo.org>
OpenPOWER on IntegriCloud