linux.git/drivers/platform, branch v3.2-rc1

Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux

2011-11-07T03:44:47+00:00

* 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux: (230 commits)
  Revert "tracing: Include module.h in define_trace.h"
  irq: don't put module.h into irq.h for tracking irqgen modules.
  bluetooth: macroize two small inlines to avoid module.h
  ip_vs.h: fix implicit use of module_get/module_put from module.h
  nf_conntrack.h: fix up fallout from implicit moduleparam.h presence
  include: replace linux/module.h with "struct module" wherever possible
  include: convert various register fcns to macros to avoid include chaining
  crypto.h: remove unused crypto_tfm_alg_modname() inline
  uwb.h: fix implicit use of asm/page.h for PAGE_SIZE
  pm_runtime.h: explicitly requires notifier.h
  linux/dmaengine.h: fix implicit use of bitmap.h and asm/page.h
  miscdevice.h: fix up implicit use of lists and types
  stop_machine.h: fix implicit use of smp.h for smp_processor_id
  of: fix implicit use of errno.h in include/linux/of.h
  of_platform.h: delete needless include 
  acpi: remove module.h include from platform/aclinux.h
  miscdevice.h: delete unnecessary inclusion of module.h
  device_cgroup.h: delete needless include 
  net: sch_generic remove redundant use of 
  net: inet_timewait_sock doesnt need 
  ...

Fix up trivial conflicts (other header files, and  removal of the ab3550 mfd driver) in
 - drivers/media/dvb/frontends/dibx000_common.c
 - drivers/media/video/{mt9m111.c,ov6650.c}
 - drivers/mfd/ab3550-core.c
 - include/linux/dmaengine.h

Merge branch 'akpm' (Andrew's incoming)

2011-11-01T00:46:07+00:00

Quoth Andrew:

 - Most of MM.  Still waiting for the poweroc guys to get off their
   butts and review some threaded hugepages patches.

 - alpha

 - vfs bits

 - drivers/misc

 - a few core kerenl tweaks

 - printk() features

 - MAINTAINERS updates

 - backlight merge

 - leds merge

 - various lib/ updates

 - checkpatch updates

* akpm: (127 commits)
  epoll: fix spurious lockdep warnings
  checkpatch: add a --strict check for utf-8 in commit logs
  kernel.h/checkpatch: mark strict_strto and simple_strto as obsolete
  llist-return-whether-list-is-empty-before-adding-in-llist_add-fix
  wireless: at76c50x: follow rename pack_hex_byte to hex_byte_pack
  fat: follow rename pack_hex_byte() to hex_byte_pack()
  security: follow rename pack_hex_byte() to hex_byte_pack()
  kgdb: follow rename pack_hex_byte() to hex_byte_pack()
  lib: rename pack_hex_byte() to hex_byte_pack()
  lib/string.c: fix strim() semantics for strings that have only blanks
  lib/idr.c: fix comment for ida_get_new_above()
  lib/percpu_counter.c: enclose hotplug only variables in hotplug ifdef
  lib/bitmap.c: quiet sparse noise about address space
  lib/spinlock_debug.c: print owner on spinlock lockup
  lib/kstrtox: common code between kstrto*() and simple_strto*() functions
  drivers/leds/leds-lp5521.c: check if reset is successful
  leds: turn the blink_timer off before starting to blink
  leds: save the delay values after a successful call to blink_set()
  drivers/leds/leds-gpio.c: use gpio_get_value_cansleep() when initializing
  drivers/leds/leds-lm3530.c: add __devexit_p where needed
  ...

lis3: change exported function to use passed parameter

2011-11-01T00:30:52+00:00

Change exported functions to use the device given as parameter
instead of the global one.

Signed-off-by: Ilkka Koskinen 
Signed-off-by: Éric Piel 
Cc: Matthew Garrett 
Cc: Witold Pilat 
Cc: Lyall Pearce 
Cc: Malte Starostik 
Cc: Thadeu Lima de Souza Cascardo 
Cc: Christian Lamparter 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

hp_accel: add HP ProBook 655x

2011-11-01T00:30:52+00:00

Add axis correction for HP ProBook 6555b.

Signed-off-by: Malte Starostik 
Signed-off-by: Éric Piel 
Cc: Matthew Garrett 
Cc: Witold Pilat 
Cc: Lyall Pearce 
Cc: Ilkka Koskinen 
Cc: Thadeu Lima de Souza Cascardo 
Cc: Christian Lamparter 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

lis3: add support for HP EliteBook 8540w

2011-11-01T00:30:52+00:00

Add axis correction for HP EliteBook 8540w.

Reported-by: Lyall Pearce 
Signed-off-by: Éric Piel 
Cc: Matthew Garrett 
Cc: Witold Pilat 
Cc: Malte Starostik 
Cc: Ilkka Koskinen 
Cc: Thadeu Lima de Souza Cascardo 
Cc: Christian Lamparter 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

lis3: add support for HP EliteBook 2730p

2011-11-01T00:30:52+00:00

Add axis correction for HP EliteBook 2730p.

Tested-by: Witold Pilat 
Signed-off-by: Éric Piel 
Cc: Matthew Garrett 
Cc: Lyall Pearce 
Cc: Malte Starostik 
Cc: Ilkka Koskinen 
Cc: Thadeu Lima de Souza Cascardo 
Cc: Christian Lamparter 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

lis3lv02d: avoid divide by zero due to unchecked

2011-11-01T00:30:51+00:00

After an "unexpected" reboot, I found this Oops in my logs:

divide error: 0000 [#1] PREEMPT SMP=20
CPU 0=20
Modules linked in: lis3lv02d hp_wmi input_polldev [...]
Pid: 390, comm: modprobe Tainted: G         C  2.6.39-rc7-wl+=20
RIP: 0010:[]  []
		 lis3lv02d_poweron+0x4e/0x94 [lis3lv02d]
RSP: 0018:ffff8801d6407cf8  EFLAGS: 00010246
RAX: 0000000000000bb8 RBX: ffffffffa014e000 RCX: 0000000000000000
RDX: 0000000000000000 RSI: ffffea00066e4708 RDI: ffff8801df002700
RBP: ffff8801d6407d18 R08: ffffea00066c5a30 R09: ffffffff812498c9
R10: ffff8801d7bfcea0 R11: ffff8801d7bfce10 R12: 0000000000000bb8
R13: 00000000ffffffda R14: ffffffffa0154120 R15: ffffffffa0154030
=46S:  00007fc0705db700(0000) GS:ffff8801dfa00000(0000) knlGS:0
CS:  0010 DS: 0000 ES: 0000 CR0: 000000008005003b
CR2: 00007f33549174f0 CR3: 00000001d65c9000 CR4: 00000000000406f0
Process modprobe (pid: 390, threadinfo ffff8801d6406000, task ffff8801d6b40=
000)
Stack:
 ffffffffa0154120 62ffffffa0154030 ffffffffa014e000 00000000ffffffea
 ffff8801d6407d58 ffffffffa014bcc1 0000000000000000 0000000000000048
 ffff8801d8bae800 00000000ffffffea 00000000ffffffda ffffffffa0154120
Call Trace:
 [] lis3lv02d_init_device+0x1ce/0x496 [lis3lv02d]
 [] lis3lv02d_add+0x10f/0x17c [hp_accel]
 [] acpi_device_probe+0x49/0x117
[...]
Code: 3a 75 06 80 4d ef 50 eb 04 80 4d ef 40 0f b6 55 ef be 21
00 00 00 48 89 df ff 53 18 44 8b 63 6c e8 3e fc ff ff 89 c1 44
89 e0 99  f9 89 c7 e8 93 82 ef e0 48 83 7b 30 00 74 2d 45
31 e4 80 7b=20
RIP  [] lis3lv02d_poweron+0x4e/0x94 [lis3lv02d]
 RSP 

>From my POV, it looks like the hardware is not working as expected
and returns a bogus data rate. The driver doesn't check the result
and directly uses it as some sort of divisor in some places:

msleep(lis3->pwron_delay / lis3lv02d_get_odr());

Under this circumstances, this could very well cause the
"divide by zero" exception from above.

For now, I fixed it the easiest and most obvious way:
Check if the result is sane and if it isn't use a sane default
instead. I went for "100" in the latter case, simply because
/sys/devices/platform/lis3lv02d/rate returns it on a successful
boot.

Signed-off-by: Christian Lamparter 
Signed-off-by: Éric Piel 
Cc: Matthew Garrett 
Cc: Witold Pilat 
Cc: Lyall Pearce 
Cc: Malte Starostik 
Cc: Ilkka Koskinen 
Cc: Thadeu Lima de Souza Cascardo 
Cc: Christian Lamparter 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

x86: fix up files really needing to include module.h

2011-10-31T23:30:36+00:00

These files aren't just exporting symbols -- they are also defining
a MODULE_LICENSE etc. so give them the full module.h file.

Signed-off-by: Paul Gortmaker

Merge branch 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86

2011-10-31T23:10:33+00:00

* 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86: (45 commits)
  acer-wmi: replaced the hard coded bitmap by the communication devices bitmap from SMBIOS
  acer-wmi: check the existence of internal wireless device when set capability
  acer-wmi: add ACER_WMID_v2 interface flag to represent new notebooks
  sony-laptop:irq: Remove IRQF_DISABLED
  asus-laptop: Add rfkill support for Pegatron Lucid tablet
  asus-laptop: pega_accel - Report accelerometer orientation change through udev
  asus-laptop: fix module description
  asus-laptop: hide leds on Pegatron Lucid
  asus-laptop: Pegatron Lucid accelerometer
  asus-laptop: allow boot time control of Pegatron ALS sensor
  Platform: samsung_laptop: add support for X520 machines.
  platform: samsung_laptop: add dmi information for Samsung R700 laptops
  hp_accel: Add axis-mapping for HP ProBook / EliteBook
  hp_accel: Add a new PNP id
  WMI: properly cleanup devices to avoid crashes
  ideapad: remove sysfs node for cfg
  ideapad: add debugfs support
  ideapad: add event for Novo key
  ideapad: change parameter of ideapad_sync_rfk_state
  ideapad: define vpc commands
  ...

acer-wmi: replaced the hard coded bitmap by the communication devices bitmap from SMBIOS

2011-10-24T14:52:42+00:00

Before set communication devices state, we need query out all devices state to set
the states bitmap. That will be better use the devices bitmap in SMBIOS type Aah
instead of hardcode in driver.

Tested on Acer Travelmate 8572.

Cc: Carlos Corbacho 
Cc: Matthew Garrett 
Cc: Dmitry Torokhov 
Cc: Corentin Chary 
Cc: Thomas Renninger 
Signed-off-by: Lee, Chun-Yi 
Signed-off-by: Matthew Garrett