linux.git/drivers/rtc, branch v3.3-rc1

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6

2012-01-14T04:43:32+00:00

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6: (59 commits)
  rtc: max8925: Add function to work as wakeup source
  mfd: Add pm ops to max8925
  mfd: Convert aat2870 to dev_pm_ops
  mfd: Still check other interrupts if we get a wm831x touchscreen IRQ
  mfd: Introduce missing kfree in 88pm860x probe routine
  mfd: Add S5M series configuration
  mfd: Add s5m series irq driver
  mfd: Add S5M core driver
  mfd: Improve mc13xxx dt binding document
  mfd: Fix stmpe section mismatch
  mfd: Fix stmpe build warning
  mfd: Fix STMPE I2c build failure
  mfd: Constify aat2870-core i2c_device_id table
  gpio: Add support for stmpe variant 801
  mfd: Add support for stmpe variant 801
  mfd: Add support for stmpe variant 610
  mfd: Add support for STMPE SPI interface
  mfd: Separate out STMPE controller and interface specific code
  misc: Remove max8997-muic sysfs attributes
  mfd: Remove unused wm831x_irq_data_to_mask_reg()
  ...

Fix up trivial conflict in drivers/leds/Kconfig due to addition of
LEDS_MAX8997 and LEDS_TCA6507 next to each other.

Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2012-01-12T03:13:40+00:00

* 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/intel config: Fix the APB_TIMER selection
  x86/mrst: Add additional debug prints for pb_keys
  x86/intel config: Revamp configuration to allow for Moorestown and Medfield
  x86/intel/scu/ipc: Match the changes in the x86 configuration
  x86/apb: Fix configuration constraints
  x86: Fix INTEL_MID silly
  x86/Kconfig: Cyclone-timer depends on x86-summit
  x86: Reduce clock calibration time during slave cpu startup
  x86/config: Revamp configuration for MID devices
  x86/sfi: Kill the IRQ as id hack

Merge branch 'unicore32' of git://github.com/gxt/linux

2012-01-11T01:37:20+00:00

* 'unicore32' of git://github.com/gxt/linux:
  rtc-puv3: solve section mismatch in rtc-puv3.c
  rtc-puv3: using module_platform_driver()
  i2c-puv3: using module_platform_driver()
  rtc-puv3: irq: remove IRQF_DISABLED
  unicore32: Remove IRQF_DISABLED
  unicore32: Use set_current_blocked()
  unicore32: add ioremap_nocache definition
  unicore32: delete specified xlate_dev_mem_ptr
  of: add include asm/setup.h in drivers/of/fdt.c
  unicore32: standardize /proc/iomem "Kernel code" name

drivers/rtc/interface.c: fix alarm rollover when day or month is out-of-range

2012-01-11T00:30:53+00:00

Commit f44f7f96a20a ("RTC: Initialize kernel state from RTC") introduced a
potential infinite loop.  If an alarm time contains a wildcard month and
an invalid day (> 31), or a wildcard year and an invalid month (>= 12),
the loop searching for the next matching date will never terminate.  Treat
the invalid values as wildcards.

Fixes , 

Reported-by: leo weppelman 
Reported-by: "P. van Gaans" 
Signed-off-by: Ben Hutchings 
Signed-off-by: Jonathan Nieder 
Cc: Mark Brown 
Cc: Marcelo Roberto Jimenez 
Cc: Thomas Gleixner 
Cc: John Stultz 
Acked-by: Alessandro Zummo 
Cc: 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

drivers/rtc/rtc-twl.c: add DT support for RTC inside twl4030/twl6030

2012-01-11T00:30:53+00:00

Add the DT support for the TI rtc-twl present in the twl4030 and twl6030
devices.

Signed-off-by: Benoit Cousson 
Acked-by: Alessandro Zummo 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

drivers/rtc/: remove redundant spi driver bus initialization

2012-01-11T00:30:53+00:00

In ancient times it was necessary to manually initialize the bus field of
an spi_driver to spi_bus_type.  These days this is done in
spi_driver_register(), so we can drop the manual assignment.

The patch was generated using the following coccinelle semantic patch:
// 
@@
identifier _driver;
@@
struct spi_driver _driver = {
	.driver = {
-		.bus = &spi_bus_type,
	},
};
// 

Signed-off-by: Lars-Peter Clausen 
Cc: John Stultz 
Cc: Alessandro Zummo 
Cc: Grant Likely 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

drivers/rtc/rtc-jz4740.c: make jz4740_rtc_driver static

2012-01-11T00:30:53+00:00

Signed-off-by: Axel Lin 
Cc: Lars-Peter Clausen 
Cc: Alessandro Zummo 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

drivers/rtc/rtc-mc13xxx.c: make mc13xxx_rtc_idtable static

2012-01-11T00:30:53+00:00

Signed-off-by: Axel Lin 
Acked-by: Uwe Kleine-König 
Cc: Alessandro Zummo 
Acked-by: Jean-Christophe PLAGNIOL-VILLARD 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

rtc: convert drivers/rtc/* to use module_platform_driver()

2012-01-11T00:30:53+00:00

This patch converts the drivers in drivers/rtc/* to use the
module_platform_driver() macro which makes the code smaller and a bit
simpler.

Signed-off-by: Axel Lin 
Acked-by: Mark Brown 
Acked-by: Mike Frysinger 
Acked-by: Guan Xuetao 
Acked-by: Linus Walleij 
Acked-by: Haojian Zhuang 
Cc: Alessandro Zummo 
Cc: Srinidhi Kasagar 
Cc: Lars-Peter Clausen 
Cc: Ben Dooks 
Cc: John Stultz 
Acked-by: Jean-Christophe PLAGNIOL-VILLARD 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

drivers/rtc/rtc-wm831x.c: convert to devm_kzalloc()

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

Marginally less code and eliminate the possibility of memory leaks.

Signed-off-by: Mark Brown 
Acked-by: Jean-Christophe PLAGNIOL-VILLARD 
Cc: Alessandro Zummo 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds