aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2014-12-10drivers/rtc/rtc-isl12057.c: report error code upon failure in dev_err() callsArnaud Ebalard1-8/+14
As pointed out by Mark, it is generally useful to log the error code when reporting a failure. This patch improves existing calls to dev_err() in ISL12057 driver to also report error code. Signed-off-by: Arnaud Ebalard <[email protected]> Suggested-by: Mark Brown <[email protected]> Cc: Mark Rutland <[email protected]> Cc: Alessandro Zummo <[email protected]> Cc: Peter Huewe <[email protected]> Cc: Linus Walleij <[email protected]> Cc: Thierry Reding <[email protected]> Cc: Grant Likely <[email protected]> Acked-by: Uwe Kleine-König <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2014-12-10drivers/rtc/rtc-isl12057.c: add proper handling of oscillator failure bitArnaud Ebalard1-14/+33
As suggested by Uwe, instead of clearing oscillator failure bit unconditionally at driver load, this patch adds proper handling of the flag. The driver now returns -ENODATA when reading time from the device and oscillator failure bit is set. The flag is now cleared only when the a new time value is pushed to the device. Signed-off-by: Arnaud Ebalard <[email protected]> Reported-by: Uwe Kleine-König <[email protected]> Acked-by: Uwe Kleine-König <[email protected]> Cc: Mark Rutland <[email protected]> Cc: Alessandro Zummo <[email protected]> Cc: Peter Huewe <[email protected]> Cc: Linus Walleij <[email protected]> Cc: Thierry Reding <[email protected]> Cc: Mark Brown <[email protected]> Cc: Grant Likely <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2014-12-10drivers/rtc/rtc-isl12057.c: add support for century bitArnaud Ebalard1-4/+16
The month register of ISL12057 RTC chip includes a century bit which reports overflow of year register from 99 to 0. This bit can also be written, which allows using it to extend the time interval the chip can support from 99 to 199 years. This patch adds support for century overflow bit in tm to regs and regs to tm helpers in ISL12057 driver. This was tested by putting a device 100 years in the future (using a specific kernel due to the inability of userland tools such as date or hwclock to pass year 2038), rebooting on a kernel w/ this patch applied and verifying the device was still 100 years in the future. Signed-off-by: Arnaud Ebalard <[email protected]> Suggested-by: Uwe Kleine-König <[email protected]> Acked-by: Uwe Kleine-König <[email protected]> Cc: Mark Rutland <[email protected]> Cc: Alessandro Zummo <[email protected]> Cc: Peter Huewe <[email protected]> Cc: Linus Walleij <[email protected]> Cc: Thierry Reding <[email protected]> Cc: Mark Brown <[email protected]> Cc: Grant Likely <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2014-12-10drivers/rtc/rtc-isl12057.c: fix masking of register valuesArnaud Ebalard1-2/+2
When Intersil ISL12057 support was added by commit 70e123373c05 ("rtc: Add support for Intersil ISL12057 I2C RTC chip"), two masks for time registers values imported from the device were either wrong or omitted, leading to additional bits from those registers to impact read values: - mask for hour register value when reading it in AM/PM mode. As AM/PM mode is not the usual mode used by the driver, this error would only have an impact on an externally configured RTC hour later read by the driver. - mask for month value. The lack of masking would provide an erroneous value if century bit is set. This patch fixes those two masks. Fixes: 70e123373c05 ("rtc: Add support for Intersil ISL12057 I2C RTC chip") Signed-off-by: Arnaud Ebalard <[email protected]> Cc: Mark Rutland <[email protected]> Cc: Alessandro Zummo <[email protected]> Cc: Peter Huewe <[email protected]> Cc: Linus Walleij <[email protected]> Cc: Thierry Reding <[email protected]> Cc: Mark Brown <[email protected]> Cc: Grant Likely <[email protected]> Acked-by: Uwe Kleine-König <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2014-12-10of: add vendor prefix for Pericom TechnologyTomas Novotny1-0/+1
Signed-off-by: Tomas Novotny <[email protected]> Cc: Alessandro Zummo <[email protected]> Cc: Grant Likely <[email protected]> Cc: Rob Herring <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2014-12-10rtc: ds1307: add support for mcp7940x chipsTomas Novotny1-63/+64
MCP7940x is same RTC as MCP7941x. The difference is that MCP7941x chips contain additional EEPROM on a different i2c address. DS1307 driver already supports MCP7941x, so just add a new i2c device id and rename functions and defines accordingly. Signed-off-by: Tomas Novotny <[email protected]> Cc: Alessandro Zummo <[email protected]> Cc: Grant Likely <[email protected]> Cc: Rob Herring <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2014-12-10drivers/rtc/rtc-ds1374.c: add watchdog supportSøren Andersen2-0/+293
Add support for the watchdog functionality of the DS1374 rtc. Based on the m41t80 watchdog functionality Note: watchdog uses the same registers as alarm. [[email protected]: don't forget mutex_unlock() in ds1374_wdt_open() error path] [[email protected]: coding-style fixes] Signed-off-by: Soeren Andersen <[email protected]> Cc: Alessandro Zummo <[email protected]> Cc: Dan Carpenter <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2014-12-10drivers/rtc/rtc-sirfsoc.c: replace local_irq_disable by spin_lock_irq for ↵Barry Song1-8/+19
SMP safety Signed-off-by: Barry Song <[email protected]> Cc: hao liu <[email protected]> Cc: Alessandro Zummo <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2014-12-10drivers/rtc/rtc-sirfsoc.c: add alarm_irq_enable supporthao liu1-1/+26
Add missed alarm_irq_enable() callback for CSR SiRFSoC RTCs. [[email protected]: remove unneeded cast] Signed-off-by: hao liu <[email protected]> Signed-off-by: Barry Song <[email protected]> Cc: Alessandro Zummo <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2014-12-10rtc: pcf8563: clear expired alarm at boot timeJan Kardell1-0/+10
In case the card is woken up of the rtc alarm, the devm_rtc_device_register function detects it as a pending alarm about a month in the future. Fix this by clearing the alarm in module probe. Signed-off-by: Jan Kardell <[email protected]> Cc: Alessandro Zummo <[email protected]> Cc: Grant Likely <[email protected]> Cc: Rob Herring <[email protected]> Cc: Vincent Donnefort <[email protected]> Cc: Dan Carpenter <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2014-12-10rtc: pcf8563: save battery powerJan Kardell1-0/+16
According to Haoyu hym8563 datasheet this saves som power. Might be importat to battery life. And maybe it works for the NXP part as well. Signed-off-by: Jan Kardell <[email protected]> Cc: Alessandro Zummo <[email protected]> Cc: Grant Likely <[email protected]> Cc: Rob Herring <[email protected]> Cc: Vincent Donnefort <[email protected]> Cc: Dan Carpenter <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2014-12-10rtc: pcf8563: handle consequeces of lacking second alarm regJan Kardell1-0/+11
To guarantee that a set alarm occurs in the future, the set alarm time is rounded up to the nearest minute. Also we cannot handle UIE as it requires second precision. Signed-off-by: Jan Kardell <[email protected]> Cc: Alessandro Zummo <[email protected]> Cc: Grant Likely <[email protected]> Cc: Rob Herring <[email protected]> Cc: Vincent Donnefort <[email protected]> Cc: Dan Carpenter <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2014-12-10rtc: pcf8563: fix wrong time from read_alarmJan Kardell1-2/+2
Incorrect mask was used for hour and monthday fields. Signed-off-by: Jan Kardell <[email protected]> Cc: Alessandro Zummo <[email protected]> Cc: Grant Likely <[email protected]> Cc: Rob Herring <[email protected]> Cc: Vincent Donnefort <[email protected]> Cc: Dan Carpenter <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2014-12-10rtc: pcf8563: fix write of invalid bits to ST2 regJan Kardell1-1/+2
The NXP datasheet says: "Bits labeled as N should always be written with logic 0." At least one of those bits is sometime read as a 1, therfore violating this rule. To fix this we mask away those bits. Signed-off-by: Jan Kardell <[email protected]> Cc: Alessandro Zummo <[email protected]> Cc: Grant Likely <[email protected]> Cc: Rob Herring <[email protected]> Cc: Vincent Donnefort <[email protected]> Cc: Dan Carpenter <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2014-12-10rtc: pcf8563: remove leftover codeJan Kardell1-7/+6
Remove some code that was left from before block read/write was used. Signed-off-by: Jan Kardell <[email protected]> Cc: Alessandro Zummo <[email protected]> Cc: Grant Likely <[email protected]> Cc: Rob Herring <[email protected]> Cc: Vincent Donnefort <[email protected]> Cc: Dan Carpenter <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2014-12-10ARM: dts: am335x-boneblack: enable power off and rtc wake upJohan Hovold1-0/+4
Configure the RTC as system-power controller, which allows the system to be powered off as well as woken up again on subsequent RTC alarms. Note that the PMIC needs to be put in SLEEP (rather than OFF) mode to maintain RTC power. Specifically, this means that the PMIC ti,pmic-shutdown-controller property must be left unset in order to be able to wake up on RTC alarms. Tested on BeagleBone Black (rev A5). Signed-off-by: Johan Hovold <[email protected]> Reviewed-by: Felipe Balbi <[email protected]> Tested-by: Felipe Balbi <[email protected]> Cc: Alessandro Zummo <[email protected]> Cc: Tony Lindgren <[email protected]> Cc: Benot Cousson <[email protected]> Cc: Lokesh Vutla <[email protected]> Cc: Guenter Roeck <[email protected]> Cc: Sekhar Nori <[email protected]> Cc: Tero Kristo <[email protected]> Cc: Keerthy J <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2014-12-10ARM: dts: am33xx: update rtc-node compatible propertyJohan Hovold1-1/+1
Enable am33xx specific RTC features (e.g. PMIC control) by adding "ti,am3352-rtc" to the compatible property of the rtc node. Signed-off-by: Johan Hovold <[email protected]> Reviewed-by: Felipe Balbi <[email protected]> Tested-by: Felipe Balbi <[email protected]> Cc: Alessandro Zummo <[email protected]> Cc: Tony Lindgren <[email protected]> Cc: Benot Cousson <[email protected]> Cc: Lokesh Vutla <[email protected]> Cc: Guenter Roeck <[email protected]> Cc: Sekhar Nori <[email protected]> Cc: Tero Kristo <[email protected]> Cc: Keerthy J <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2014-12-10rtc: omap: add copyright entryJohan Hovold1-0/+1
Add myself to the list of copyright holders. Signed-off-by: Johan Hovold <[email protected]> Cc: Alessandro Zummo <[email protected]> Cc: Tony Lindgren <[email protected]> Cc: Benot Cousson <[email protected]> Cc: Lokesh Vutla <[email protected]> Cc: Guenter Roeck <[email protected]> Cc: Sekhar Nori <[email protected]> Cc: Tero Kristo <[email protected]> Cc: Keerthy J <[email protected]> Tested-by: Felipe Balbi <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2014-12-10rtc: omap: fix minor coding style issuesJohan Hovold1-19/+27
Fix minor coding style issues like comment style, indentation and remove a few unnecessary casts. Also drop the 1 from OMAP1 in the driver description. Signed-off-by: Johan Hovold <[email protected]> Cc: Alessandro Zummo <[email protected]> Cc: Tony Lindgren <[email protected]> Cc: Benot Cousson <[email protected]> Cc: Lokesh Vutla <[email protected]> Cc: Guenter Roeck <[email protected]> Cc: Sekhar Nori <[email protected]> Cc: Tero Kristo <[email protected]> Cc: Keerthy J <[email protected]> Tested-by: Felipe Balbi <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2014-12-10rtc: omap: enable wake-up from power offJohan Hovold1-1/+8
The ALARM interrupt must not be disabled during shutdown in order to be able to power up the system using an RTC alarm. Signed-off-by: Johan Hovold <[email protected]> Cc: Alessandro Zummo <[email protected]> Cc: Tony Lindgren <[email protected]> Cc: Benot Cousson <[email protected]> Cc: Lokesh Vutla <[email protected]> Cc: Guenter Roeck <[email protected]> Cc: Sekhar Nori <[email protected]> Cc: Tero Kristo <[email protected]> Cc: Keerthy J <[email protected]> Tested-by: Felipe Balbi <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2014-12-10rtc: omap: add support for pmic_power_enJohan Hovold2-1/+108
Add new property "ti,system-power-controller" to register the RTC as a power-off handler. Some RTC IP revisions can control an external PMIC via the pmic_power_en pin, which can be configured to transition to OFF on ALARM2 events and back to ON on subsequent ALARM (wakealarm) events. This is based on earlier work by Colin Foe-Parker and AnilKumar Ch. [1] [1] https://www.mail-archive.com/[email protected]/msg82127.html [[email protected]: add comment] Signed-off-by: Johan Hovold <[email protected]> Cc: Colin Foe-Parker <[email protected]> Cc: AnilKumar Ch <[email protected]> Cc: Alessandro Zummo <[email protected]> Cc: Tony Lindgren <[email protected]> Cc: Benot Cousson <[email protected]> Cc: Lokesh Vutla <[email protected]> Cc: Guenter Roeck <[email protected]> Cc: Sekhar Nori <[email protected]> Cc: Tero Kristo <[email protected]> Cc: Keerthy J <[email protected]> Tested-by: Felipe Balbi <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2014-12-10rtc: omap: add helper to read 32-bit registersJohan Hovold1-0/+5
Add helper to read full register width. Signed-off-by: Johan Hovold <[email protected]> Cc: Alessandro Zummo <[email protected]> Cc: Tony Lindgren <[email protected]> Cc: Benot Cousson <[email protected]> Cc: Lokesh Vutla <[email protected]> Cc: Guenter Roeck <[email protected]> Cc: Sekhar Nori <[email protected]> Cc: Tero Kristo <[email protected]> Cc: Keerthy J <[email protected]> Tested-by: Felipe Balbi <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2014-12-10rtc: omap: add helper to read raw bcd timeJohan Hovold1-8/+10
Add helper to read raw BCD time that can be used in interrupt context. Signed-off-by: Johan Hovold <[email protected]> Cc: Alessandro Zummo <[email protected]> Cc: Tony Lindgren <[email protected]> Cc: Benot Cousson <[email protected]> Cc: Lokesh Vutla <[email protected]> Cc: Guenter Roeck <[email protected]> Cc: Sekhar Nori <[email protected]> Cc: Tero Kristo <[email protected]> Cc: Keerthy J <[email protected]> Tested-by: Felipe Balbi <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2014-12-10rtc: omap: silence bogus power-up reset message at probeJohan Hovold1-6/+13
Some legacy RTC IP revisions has a power-up reset flag in the status register that later revisions lack. As this flag is always read back as set on later revisions (or is overloaded with a different flag), make sure to only clear the flag and print the info message on legacy platforms. Signed-off-by: Johan Hovold <[email protected]> Cc: Alessandro Zummo <[email protected]> Cc: Tony Lindgren <[email protected]> Cc: Benot Cousson <[email protected]> Cc: Lokesh Vutla <[email protected]> Cc: Guenter Roeck <[email protected]> Cc: Sekhar Nori <[email protected]> Cc: Tero Kristo <[email protected]> Cc: Keerthy J <[email protected]> Tested-by: Felipe Balbi <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2014-12-10rtc: omap: add structured device-type infoJohan Hovold1-52/+51
Add structured device-type info to encode IP-block revision differences. Signed-off-by: Johan Hovold <[email protected]> Cc: Alessandro Zummo <[email protected]> Cc: Tony Lindgren <[email protected]> Cc: Benot Cousson <[email protected]> Cc: Lokesh Vutla <[email protected]> Cc: Guenter Roeck <[email protected]> Cc: Sekhar Nori <[email protected]> Cc: Tero Kristo <[email protected]> Cc: Keerthy J <[email protected]> Tested-by: Felipe Balbi <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2014-12-10rtc: omap: remove DRIVER_NAME macroJohan Hovold1-5/+3
Remove DRIVER_NAME macro which was used for unrelated strings (e.g. id-table entry and module name), but not for related ones (e.g. module name and alias). Also move the module alias to the other module-info entries. Signed-off-by: Johan Hovold <[email protected]> Cc: Alessandro Zummo <[email protected]> Cc: Tony Lindgren <[email protected]> Cc: Benot Cousson <[email protected]> Cc: Lokesh Vutla <[email protected]> Cc: Guenter Roeck <[email protected]> Cc: Sekhar Nori <[email protected]> Cc: Tero Kristo <[email protected]> Tested-by: Felipe Balbi <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2014-12-10rtc: omap: add device abstractionJohan Hovold1-106/+133
Add struct omap_rtc to hold previously global data as well as the IP-block feature flags. Also convert the register-access macros to proper inline helper functions. Signed-off-by: Johan Hovold <[email protected]> Cc: Alessandro Zummo <[email protected]> Cc: Tony Lindgren <[email protected]> Cc: Benot Cousson <[email protected]> Cc: Lokesh Vutla <[email protected]> Cc: Guenter Roeck <[email protected]> Cc: Sekhar Nori <[email protected]> Cc: Tero Kristo <[email protected]> Cc: Keerthy J <[email protected]> Tested-by: Felipe Balbi <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2014-12-10rtc: omap: make platform-device id table constJohan Hovold1-1/+1
Make platform-device id table const. Signed-off-by: Johan Hovold <[email protected]> Cc: Alessandro Zummo <[email protected]> Cc: Tony Lindgren <[email protected]> Cc: Benot Cousson <[email protected]> Cc: Lokesh Vutla <[email protected]> Cc: Guenter Roeck <[email protected]> Cc: Sekhar Nori <[email protected]> Cc: Tero Kristo <[email protected]> Cc: Keerthy J <[email protected]> Tested-by: Felipe Balbi <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2014-12-10rtc: omap: use dev_infoJohan Hovold1-4/+3
Use dev_info rather than pr_info. Signed-off-by: Johan Hovold <[email protected]> Cc: Alessandro Zummo <[email protected]> Cc: Tony Lindgren <[email protected]> Cc: Benot Cousson <[email protected]> Cc: Lokesh Vutla <[email protected]> Cc: Guenter Roeck <[email protected]> Cc: Sekhar Nori <[email protected]> Cc: Tero Kristo <[email protected]> Cc: Keerthy J <[email protected]> Tested-by: Felipe Balbi <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2014-12-10rtc: omap: remove unused register-base defineJohan Hovold1-2/+0
Remove register-base define, which is no longer used. Signed-off-by: Johan Hovold <[email protected]> Cc: Alessandro Zummo <[email protected]> Cc: Tony Lindgren <[email protected]> Cc: Benot Cousson <[email protected]> Cc: Lokesh Vutla <[email protected]> Cc: Guenter Roeck <[email protected]> Cc: Sekhar Nori <[email protected]> Cc: Tero Kristo <[email protected]> Cc: Keerthy J <[email protected]> Tested-by: Felipe Balbi <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2014-12-10rtc: omap: fix class-device registrationJohan Hovold1-23/+23
Make sure not to register the class device until after the device has been configured. Currently, the device is not fully configured (e.g. 24-hour mode) when the class device is registered, something which involves driver callbacks for example to read the current time. Signed-off-by: Johan Hovold <[email protected]> Cc: Alessandro Zummo <[email protected]> Cc: Tony Lindgren <[email protected]> Cc: Benot Cousson <[email protected]> Cc: Lokesh Vutla <[email protected]> Cc: Guenter Roeck <[email protected]> Cc: Sekhar Nori <[email protected]> Cc: Tero Kristo <[email protected]> Cc: Keerthy J <[email protected]> Tested-by: Felipe Balbi <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2014-12-10rtc: omap: clean up probe error handlingJohan Hovold1-23/+18
Remove some debug messages and return errors from subsystems rather than always fail with -EIO. Note that the class-registration error has already been logged by rtc core. Signed-off-by: Johan Hovold <[email protected]> Cc: Alessandro Zummo <[email protected]> Cc: Tony Lindgren <[email protected]> Cc: Benot Cousson <[email protected]> Cc: Lokesh Vutla <[email protected]> Cc: Guenter Roeck <[email protected]> Cc: Sekhar Nori <[email protected]> Cc: Tero Kristo <[email protected]> Cc: Keerthy J <[email protected]> Tested-by: Felipe Balbi <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2014-12-10rtc: omap: fix interrupt disable at probeJohan Hovold1-3/+5
Use writel instead of writeb when disabling interrupts at probe as ALARM2 is not cleared otherwise on some IP-block revisions (e.g. AM3352). Note that the driver currently never enables the ALARM2 interrupt. Signed-off-by: Johan Hovold <[email protected]> Cc: Alessandro Zummo <[email protected]> Cc: Tony Lindgren <[email protected]> Cc: Benot Cousson <[email protected]> Cc: Lokesh Vutla <[email protected]> Cc: Guenter Roeck <[email protected]> Cc: Sekhar Nori <[email protected]> Cc: Tero Kristo <[email protected]> Cc: Keerthy J <[email protected]> Tested-by: Felipe Balbi <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2014-12-10rtc: omap: fix missing wakealarm attributeJohan Hovold1-2/+3
The platform device must be registered as wakeup capable before registering the class device, or the wakealarm attribute will not be created. Also make sure to unregister the wakeup source on probe errors. Fixes: 1d2e2b65d098 ("rtc: omap: restore back (hard-code) wakeup support") Signed-off-by: Johan Hovold <[email protected]> Reviewed-by: Felipe Balbi <[email protected]> Tested-by: Felipe Balbi <[email protected]> Cc: Alessandro Zummo <[email protected]> Cc: Tony Lindgren <[email protected]> Cc: Benot Cousson <[email protected]> Cc: Lokesh Vutla <[email protected]> Cc: Guenter Roeck <[email protected]> Cc: Sekhar Nori <[email protected]> Cc: Tero Kristo <[email protected]> Cc: Keerthy J <[email protected]> Cc: <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2014-12-10rtc: omap: fix clock-source configurationJohan Hovold1-2/+4
This series fixes a few issues with the omap rtc-driver, cleans up a bit, adds device abstraction, and finally adds support for the PMIC control feature found in some revisions of this RTC IP block. Ultimately, this allows for powering off the Beaglebone and waking it up again on RTC alarms. This patch (of 20): Make sure not to reset the clock-source configuration when enabling the 32kHz clock mux. Until the clock source can be configured through device tree we must not overwrite settings made by the bootloader (e.g. clock-source selection). Fixes: cd914bba03d8 ("drivers/rtc/rtc-omap.c: add support for enabling 32khz clock") Signed-off-by: Johan Hovold <[email protected]> Reviewed-by: Felipe Balbi <[email protected]> Tested-by: Felipe Balbi <[email protected]> Cc: Alessandro Zummo <[email protected]> Cc: Tony Lindgren <[email protected]> Cc: Benot Cousson <[email protected]> Cc: Lokesh Vutla <[email protected]> Cc: Guenter Roeck <[email protected]> Cc: Sekhar Nori <[email protected]> Cc: Tero Kristo <[email protected]> Cc: Keerthy J <[email protected]> Cc: <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2014-12-10drivers/rtc/interface.c: check the validation of rtc_time in __rtc_read_timeHyogi Gim1-0/+8
Some rtc devices always return '0' when rtc_class_ops.read_time is called. So if rtc_time isn't verified in callback, rtc interface cannot know whether rtc_time is valid. Check rtc_time by using 'rtc_valid_tm' in '__rtc_read_time'. And add the message for debugging. Signed-off-by: Hyogi Gim <[email protected]> Cc: Alessandro Zummo <[email protected]> Cc: John Stultz <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2014-12-10drivers/rtc/rtc-sirfsoc.c: move hardware initilization earlier in probeGuo Zeng1-8/+8
Move rtc register to be later than hardware initialization. The reason is that devm_rtc_device_register() will do read_time() which is a callback accessing hardware. This sometimes causes a hang in the hardware related callback. Signed-off-by: Guo Zeng <[email protected]> Signed-off-by: Barry Song <[email protected]> Cc: Alessandro Zummo <[email protected]> Cc: <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2014-12-10ncpfs: return proper error from NCP_IOC_SETROOT ioctlJan Kara1-1/+0
If some error happens in NCP_IOC_SETROOT ioctl, the appropriate error return value is then (in most cases) just overwritten before we return. This can result in reporting success to userspace although error happened. This bug was introduced by commit 2e54eb96e2c8 ("BKL: Remove BKL from ncpfs"). Propagate the errors correctly. Coverity id: 1226925. Fixes: 2e54eb96e2c80 ("BKL: Remove BKL from ncpfs") Signed-off-by: Jan Kara <[email protected]> Cc: Petr Vandrovec <[email protected]> Cc: <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2014-12-10init: allow CONFIG_INIT_FALLBACK=n to disable defaults if init= failsAndy Lutomirski2-1/+22
If a user puts init=/whatever on the command line and /whatever can't be run, then the kernel will try a few default options before giving up. If init=/whatever came from a bootloader prompt, then this is unexpected but probably harmless. On the other hand, if it comes from a script (e.g. a tool like virtme or perhaps a future kselftest script), then the fallbacks are likely to exist, but they'll do the wrong thing. For example, they might unexpectedly invoke systemd. This adds a config option CONFIG_INIT_FALLBACK. If unset, then a failure to run the specified init= process be fatal. The tentative plan is to remove CONFIG_INIT_FALLBACK for 3.20. [[email protected]: coding-style fixes] Signed-off-by: Andy Lutomirski <[email protected]> Cc: Rob Landley <[email protected]> Cc: Chuck Ebbert <[email protected]> Cc: Randy Dunlap <[email protected]> Cc: Shuah Khan <[email protected]> Cc: Frank Rowand <[email protected]> Cc: Josh Triplett <[email protected]> Acked-by: Rusty Russell <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2014-12-10fs/binfmt_elf.c: fix internal inconsistency relating to vma dump sizeJungseung Lee1-18/+22
vma_dump_size() has been used several times on actual dumper and it is supposed to return the same value for the same vma. But vma_dump_size() could return different values for same vma. The known problem case is concurrent shared memory removal. If a vma is used for a shared memory and that shared memory is removed between writing program header and dumping vma memory, this will result in a dump file which is internally consistent. To fix the problem, we set baseline to get dump size and store the size into vma_filesz and always use the same vma dump size which is stored in vma_filsz. The consistnecy with reality is not actually guranteed, but it's tolerable since that is fully consistent with base line. Signed-off-by: Jungseung Lee <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2014-12-10fs/binfmt_misc.c: use GFP_KERNEL instead of GFP_USERAndrew Morton1-2/+2
GFP_USER means "honour cpuset nodes-allowed beancounting". These are regular old kernel objects and there seems no reason to give them this treatment. Acked-by: Mike Frysinger <[email protected]> Cc: Joe Perches <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2014-12-10binfmt_misc: clean up code style a bitMike Frysinger1-148/+145
Clean up various coding style issues that checkpatch complains about. No functional changes here. Signed-off-by: Mike Frysinger <[email protected]> Cc: Al Viro <[email protected]> Cc: Joe Perches <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2014-12-10binfmt_misc: add comments & debug logsMike Frysinger1-15/+121
When trying to develop a custom format handler, the errors returned all effectively get bucketed as EINVAL with no kernel messages. The other errors (ENOMEM/EFAULT) are internal/obvious and basic. Thus any time a bad handler is rejected, the developer has to walk the dense code and try to guess where it went wrong. Needing to dive into kernel code is itself a fairly high barrier for a lot of people. To improve this situation, let's deploy extensive pr_debug markers at logical parse points, and add comments to the dense parsing logic. It let's you see exactly where the parsing aborts, the string the kernel received (useful when dealing with shell code), how it translated the buffers to binary data, and how it will apply the mask at runtime. Some example output: $ echo ':qemu-foo:M::\x7fELF\xAD\xAD\x01\x00:\xff\xff\xff\xff\xff\x00\xff\x00:/usr/bin/qemu-foo:POC' > register $ dmesg binfmt_misc: register: received 92 bytes binfmt_misc: register: delim: 0x3a {:} binfmt_misc: register: name: {qemu-foo} binfmt_misc: register: type: M (magic) binfmt_misc: register: offset: 0x0 binfmt_misc: register: magic[raw]: 5c 78 37 66 45 4c 46 5c 78 41 44 5c 78 41 44 5c \x7fELF\xAD\xAD\ binfmt_misc: register: magic[raw]: 78 30 31 5c 78 30 30 00 x01\x00. binfmt_misc: register: mask[raw]: 5c 78 66 66 5c 78 66 66 5c 78 66 66 5c 78 66 66 \xff\xff\xff\xff binfmt_misc: register: mask[raw]: 5c 78 66 66 5c 78 30 30 5c 78 66 66 5c 78 30 30 \xff\x00\xff\x00 binfmt_misc: register: mask[raw]: 00 . binfmt_misc: register: magic/mask length: 8 binfmt_misc: register: magic[decoded]: 7f 45 4c 46 ad ad 01 00 .ELF.... binfmt_misc: register: mask[decoded]: ff ff ff ff ff 00 ff 00 ........ binfmt_misc: register: magic[masked]: 7f 45 4c 46 ad 00 01 00 .ELF.... binfmt_misc: register: interpreter: {/usr/bin/qemu-foo} binfmt_misc: register: flag: P (preserve argv0) binfmt_misc: register: flag: O (open binary) binfmt_misc: register: flag: C (preserve creds) The [raw] lines show us exactly what was received from userspace. The lines after that show us how the kernel has decoded things. Signed-off-by: Mike Frysinger <[email protected]> Cc: Al Viro <[email protected]> Cc: Joe Perches <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2014-12-10checkpatch: add ability to --fix (coalesce) string fragments on multiple linesJoe Perches1-46/+69
Add --fix option to coalesce string fragments. This does not coalesce string fragments that have newline terminations or are otherwise exempted. Other miscellanea: o move all the string tests together. o fix get_quoted_string function for tab characters o fix concatination typo Signed-off-by: Joe Perches <[email protected]> Cc: Andy Whitcroft <[email protected]> Cc: Dan Carpenter <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2014-12-10checkpatch: add --strict "pointer comparison to NULL" testJoe Perches1-0/+14
It seems there are more and more uses of "if (!ptr)" in preference to "if (ptr == NULL)" so add a --strict test to emit a message when using the latter form. This also finds (ptr != NULL). Fix it too if desired. Signed-off-by: Joe Perches <[email protected]> Cc: Dan Carpenter <[email protected]> Cc: Greg KH <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2014-12-10checkpatch: add test for consecutive string fragmentsJoe Perches1-0/+6
Emit a warning when single line string coalescing occurs. Code that uses compiler string concatenation on a single line like: printk("foo" "bar"); is generally better to read concatenated like: printk("foobar"); Signed-off-by: Joe Perches <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2014-12-10checkpatch: add --strict preference for #defines using BIT(foo)Joe Perches1-0/+11
Using BIT(foo) and BIT_ULL(bar) is more common now. Suggest using these macros over #defines with 1<<value. Add a --fix option too. Signed-off-by: Joe Perches <[email protected]> Cc: David Miller <[email protected]> Cc: Jiri Pirko <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2014-12-10checkpatch: allow certain SI units with three charactersJulius Werner1-1/+3
Checkpatch flags CamelCase identifiers in strict mode, but it has a feature to ignore parts with only two characters to allow for SI units like mV or uA. Unfortunately, not all SI units fit in two characters, and not all are lower case followed by upper case. This patch adds hardcoded detection for frequency and 1024-based size units (Hz/KHz/MHz/GHz/THz and KiB/MiB/GiB/TiB), since allowing any three character combinations might be too lenient. The list can later be expanded as needed. Signed-off-by: Julius Werner <[email protected]> Acked-by: Joe Perches <[email protected]> Cc: Andy Whitcroft <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2014-12-10checkpatch: Add --strict test for function pointer calling styleJoe Perches1-3/+21
Peter Hurley wrote: The use of older function ptr calling style, (*fn)(), makes static analysis more error-prone; replace with modern fn() style. So make checkpatch emit a --strict test for that condition. Update the unnecessary parentheses test for dereferencing objects at the same time and create a $fix mechanism too. Signed-off-by: Joe Perches <[email protected]> Cc: Peter Hurley <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2014-12-10checkpatch: reduce MAINTAINERS update message frequencyJoe Perches1-0/+6
When files are being added/moved/deleted and a patch contains an update to the MAINTAINERS file, assume it's to update the MAINTAINERS file correctly and do not emit the "does MAINTAINERS need updating?" message. Reported by many people. Signed-off-by: Joe Perches <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>