linux-toradex.git/drivers/platform, branch v2.6.32-rc3

Merge branches 'sony-laptop', 'bugzilla-14247' and 'bugzilla-14271' into release

2009-10-02T15:27:57+00:00

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

2009-09-30T15:07:12+00:00

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (33 commits)
  sony-laptop: re-read the rfkill state when resuming from suspend
  sony-laptop: check for rfkill hard block at load time
  wext: add back wireless/ dir in sysfs for cfg80211 interfaces
  wext: Add bound checks for copy_from_user
  mac80211: improve/fix mlme messages
  cfg80211: always get BSS
  iwlwifi: fix 3945 ucode info retrieval after failure
  iwlwifi: fix memory leak in command queue handling
  iwlwifi: fix debugfs buffer handling
  cfg80211: don't set privacy w/o key
  cfg80211: wext: don't display BSSID unless associated
  net: Add explicit bound checks in net/socket.c
  bridge: Fix double-free in br_add_if.
  isdn: fix netjet/isdnhdlc build errors
  atm: dereference of he_dev->rbps_virt in he_init_group()
  ax25: Add missing dev_put in ax25_setsockopt
  Revert "sit: stateless autoconf for isatap"
  net: fix double skb free in dcbnl
  net: fix nlmsg len size for skb when error bit is set.
  net: fix vlan_get_size to include vlan_flags size
  ...

sony-laptop: re-read the rfkill state when resuming from suspend

2009-09-28T20:55:08+00:00

Without this, the hard-blocked state will be reported incorrectly if
the hardware switch is changed while the laptop is suspended.

Signed-off-by: Alan Jenkins 
Tested-by: Norbert Preining 
Acked-by: Mattia Dongili 
Signed-off-by: John W. Linville

sony-laptop: check for rfkill hard block at load time

2009-09-28T20:55:07+00:00

"I recently (on a flight) I found out that when I boot with the hard-switch
activated, so turning off all wireless activity on my laptop, the state
is not correctly announced in /dev/rfkill (reading it with rfkill command,
or my own gnome applet)...

After turning off and on again the hard-switch the events were right."

We can fix this by querying the firmware at load time and calling
rfkill_set_hw_state().

Signed-off-by: Alan Jenkins 
Tested-by: Norbert Preining 
Acked-by: Johannes Berg 
Acked-by: Mattia Dongili 
CC: stable@kernel.org
Signed-off-by: John W. Linville

sony-laptop: Don't unregister the SPIC driver if it wasn't registered

2009-09-28T03:20:13+00:00

This fixes a warning when the module is unloaded on machines without SPIC.

------------[ cut here ]------------
WARNING: at drivers/base/driver.c:261 driver_unregister+0x6e/0x80()
Hardware name: OEM
Unexpected driver unregister!
Modules linked in: sony_laptop(-) rfkill af_packet i915
 drm i2c_algo_bit cfbcopyarea i2c_core cfbimgblt cfbfillrect binfmt_misc
 ipv6 kvm_intel kvm acpi_cpufreq cpufreq_userspace cpufreq_powersave
 cpufreq_stats acpi_pad ac video output battery pci_slot sbs sbshc
 container iptable_filter ip_tables x_tables ext2 fuse
 snd_hda_codec_realtek snd_hda_intel snd_hda_codec snd_hwdep snd_pcm_oss
 snd_mixer_oss snd_pcm snd_seq_dummy snd_seq_oss snd_seq_midi_event
 snd_seq snd_timer snd_seq_device snd fan sg serio_raw sr_mod cdrom
 soundcore button thermal processor thermal_sys floppy snd_page_alloc
 pcspkr intel_agp evdev [last unloaded: asus_atk0110]
Pid: 8136, comm: modprobe Not tainted 2.6.31-rc8debug #50
Call Trace:
[] ? driver_unregister+0x6e/0x80
[] warn_slowpath_common+0x87/0xb0
[] warn_slowpath_fmt+0x64/0x70
[] ? kobject_release+0x0/0x1f0
[] ? kobject_put+0x27/0x60
[] ? bus_put+0x16/0x20
[] ? bus_remove_driver+0xb6/0xf0
[] driver_unregister+0x6e/0x80
[] acpi_bus_unregister_driver+0x10/0x12
[] sony_laptop_exit+0x2c/0x2e [sony_laptop]
[] sys_delete_module+0x176/0x230
[] ? trace_hardirqs_on_caller+0x14d/0x1a0
[] ? trace_hardirqs_on_thunk+0x3a/0x3f
[] system_call_fastpath+0x16/0x1b
---[ end trace f638b6a59b19703e ]---

Signed-off-by: Alan Jenkins 
Signed-off-by: Mattia Dongili 
Signed-off-by: Len Brown

sony-laptop: remove _INI call at init time

2009-09-28T03:19:59+00:00

This is unnecessary as OSPM is supposed to call the method already when
the device is discovered.

Signed-off-by: Mattia Dongili 
Signed-off-by: Len Brown

sony-laptop: SPIC unset IRQF_SHARED, set IRQF_DISABLED

2009-09-28T03:19:37+00:00

The SPIC irq is not really shareable, the IO port cannot be cleared and
always returns some data so there is no real way to understand if the irq
is for us or not. Moreover the _PRS acpi method says the irq is not
shareable.
In addition to this, in some cases, an additional write to the IO port has
to be performed in order to properly decode the event received from the
device. This generates another interrupt which may overlap with the
previous one. In the future this is going to be important for properly
decoding events.

Signed-off-by: Mattia Dongili 
Signed-off-by: Len Brown

sony-laptop: remove device_ctrl and the SPIC mini drivers

2009-09-28T03:19:16+00:00

Having separate drivers for SPIC showed to be useless, only type3 has a
slightly different behaviour than the others and there seem to be no real
conflict between them.

Signed-off-by: Mattia Dongili 
Signed-off-by: Len Brown

thinkpad-acpi: fix CONFIG_THINKPAD_ACPI_HOTKEY_POLL build problem

2009-09-27T06:13:06+00:00

Fix this problem when CONFIG_THINKPAD_ACPI_HOTKEY_POLL is undefined:

  CHECK   drivers/platform/x86/thinkpad_acpi.c
drivers/platform/x86/thinkpad_acpi.c:1968:21: error: not an lvalue
  CC [M]  drivers/platform/x86/thinkpad_acpi.o
drivers/platform/x86/thinkpad_acpi.c: In function 'tpacpi_hotkey_driver_mask_set':
drivers/platform/x86/thinkpad_acpi.c:1968: error: lvalue required as left operand of assignment

Reported-by: Noah Dain 
Reported-by: Audrius Kazukauskas 
Signed-off-by: Henrique de Moraes Holschuh 
Signed-off-by: Len Brown

Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-backlight

2009-09-26T17:49:42+00:00

* 'for-linus' of git://git.o-hand.com/linux-rpurdie-backlight:
  backlight: new driver for ADP5520/ADP5501 MFD PMICs
  backlight: extend event support to also support poll()
  backlight/eeepc-laptop: Update the backlight state when we change brightness
  backlight/acpi: Update the backlight state when we change brightness
  backlight: Allow drivers to update the core, and generate events on changes
  backlight: switch to da903x driver to dev_pm_ops
  backlight: Add support for the Avionic Design Xanthos backlight device.
  backlight: spi driver for LMS283GF05 LCD
  backlight: move hp680-bl's probe function to .devinit.text
  backlight: Add support for new Apple machines.
  backlight: mbp_nvidia_bl: add support for MacBookAir 1,1
  backlight: Add WM831x backlight driver

Trivial conflicts due to '#ifdef CONFIG_PM' differences in
drivers/video/backlight/da903x_bl.c