01 Mar, 2013
28 commits
-
The SP805 driver is only used by the Spear machines, and uses
writel_relaxed, which is not available on all architectures.The dependency from CONFIG_ARM avoids compilation problems under
randomconfig when CONFIG_ARM_AMBA is enabled for x86 builds.Signed-off-by: Alessandro Rubini
Acked-by: Giancarlo Asnaghi
Signed-off-by: Davide Ciminaghi
Acked-by: Linus Walleij
Acked-by: Viresh Kumar
Signed-off-by: H. Peter Anvin
Signed-off-by: Wim Van Sebroeck -
Update the code to use devm_* API so that driver
core will manage resources.Signed-off-by: Kumar, Anil
Signed-off-by: Wim Van Sebroeck -
Get the clock using devm_clk_get().
Signed-off-by: Mrugesh Katepallewar
Signed-off-by: Wim Van Sebroeck -
Add DT support for at91rm9200_wdt.
Signed-off-by: Joachim Eastwood
Signed-off-by: Wim Van Sebroeck -
this patchset add the timeout-sec property to the following drivers:
orion_wdt, pnx4008_wdt, s3c2410_wdt and at91sam9_wdt.The at91sam9_wdt is tested on evk-pr3,
the other drivers are compile tested only.Signed-off-by: Fabio Porcedda
Cc: Andrew Lunn
Cc: Jason Cooper
Cc: Wolfram Sang
Cc: Masanari Iida
Cc: Ben Dooks
Cc: Kukjin Kim
Cc: Andrew Victor
Cc: Jean-Christophe PLAGNIOL-VILLARD
Cc: Nicolas Ferre
Signed-off-by: Wim Van Sebroeck -
According to Documentation/watchdog/convert_drivers_to_kernel_api.txt,
remove the file_operations struct, miscdevice, and obsolete includesSince the at91sam watchdog inherent characteristics, add the watchdog
operations: at91wdt_start, at91wdt_stop and at91wdt_ping.Signed-off-by: Wenyou Yang
Signed-off-by: Wim Van Sebroeck
Cc: linux-watchdog@vger.kernel.org
Cc: linux-kernel@vger.kernel.org -
Like other watchdog drivers, this patch adds new option nowayout
which overwrite WATCHDOG_NOWAYOUT.Signed-off-by: Pali Rohar
Signed-off-by: Wim Van Sebroeck -
Add support for watchdog drivers to initialize/set the timeout field
of the watchdog_device structure. The timeout field is initialised
either with the module timeout parameter value (if valid) or with the
timeout-sec dt property (if valid). If both are invalid the initial
value is unchanged.Signed-off-by: Fabio Porcedda
Acked-by: Nicolas Ferre
Signed-off-by: Wim Van Sebroeck -
The more recent devices have a watchdog timer which could be configured
for over 2 hours and not just 2 seconds like the first generation
devices. For those devices do not use the extra software timer, but
directly program the time into the register. This will automatically be
used if the timer supports more than a minute.Signed-off-by: Hauke Mehrtens
Signed-off-by: Wim Van Sebroeck -
Rename wdt_time to timeout to name it like the other watchdog
driver do it.Signed-off-by: Hauke Mehrtens
Signed-off-by: Wim Van Sebroeck -
Rename the methods registered to struct watchdog_ops bcm47xx_wdt_ops in
order to add an other struct watchdog_ops using different ops in the
next patch.
Also rename WDT_MAX_TIME to WDT_SOFTTIMER_MAX.Signed-off-by: Hauke Mehrtens
Signed-off-by: Wim Van Sebroeck -
Instead of accessing the function to set the watchdog timer directly,
register a platform driver the platform could register to use this
watchdog driver.Signed-off-by: Hauke Mehrtens
Signed-off-by: Wim Van Sebroeck -
Convert the bcm47xx_wdt.c driver to the new watchdog core api.
The nowayout parameter is now added unconditionally to the module.
Signed-off-by: Hauke Mehrtens
Signed-off-by: Wim Van Sebroeck -
Signed-off-by: Guenter Roeck
Signed-off-by: Wim Van Sebroeck -
Use devm_* functions to make cleanup paths more simple.
Signed-off-by: Jingoo Han
Signed-off-by: Wim Van Sebroeck -
Now that the new driver is in place, we can remove the old one.
Signed-off-by: Wolfram Sang
Signed-off-by: Wim Van Sebroeck -
Replace the existing STMP3xxx driver because it has enough drawbacks
that a rewrite is apropriate. The new driver is designed to use the
watchdog framework which makes it a lot smaller and avoids open coding
the watchdog API again. It also uses now an explicitly exported function
from the RTC driver to set up its registers (the old driver silently
reused the hopefully(!) already remapped RTC registers). Also, this
driver is mach independent, while the old one depends on a mach replaced
by another one a year ago. Since the user interface is still the
standard watchdog API, users don't need to adapt.Signed-off-by: Wolfram Sang
Signed-off-by: Wim Van Sebroeck -
Introduce Retu watchdog driver.
Cc: linux-watchdog@vger.kernel.org
Acked-by: Felipe Balbi
Acked-by: Tony Lindgren
Signed-off-by: Aaro Koskinen
Signed-off-by: Wim Van Sebroeck -
Kernel symbol X86_MRST has been removed from the kernel.
INTEL_SCU_WATCHDOG driver can never be compiled due dependence of X86_MRST
which remained in the drivers/watchdog/Kconfig.Reported-by: Alexander Shiyan
Cc: Alan Cox
Signed-off-by: Wim Van Sebroeck -
...so that it's automatically picked up on relevant platforms.
Tested on Kirkwood-based GuruPlug.Signed-off-by: Lubomir Rintel
Signed-off-by: Wim Van Sebroeck -
Cc: Grant Likely
Cc: devicetree-discuss@lists.ozlabs.org
Signed-off-by: Gabor Juhos
Signed-off-by: Wim Van Sebroeck -
The ath79_wdt driver uses a fixed memory address
currently. Although this is working with each
currently supported SoCs, but this may change
in the future. Additionally, the driver includes
platform specific header files in order to be
able to get the memory base of the watchdog
device.The patch adds a memory resource to the platform
device, and converts the driver to get the base
address of the watchdog device from that.Signed-off-by: Gabor Juhos
Signed-off-by: Wim Van Sebroeck -
Use the managed version of clk_get. This allows to
simplify the probe/remove functions a bit.Signed-off-by: Gabor Juhos
Signed-off-by: Wim Van Sebroeck -
In case of SP5100 or SB7x0 chipsets, the sp5100_tco module writes zero to
reserved bits. The module, however, shouldn't depend on specific default
value, and should perform a read-merge-write operation for the reserved
bits.This patch makes the sp5100_tco module perform a read-merge-write operation
on all the chipset (sp5100, sb7x0, sb8x0 or later).Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=43176
Signed-off-by: Takahisa Tanaka
Tested-by: Paul Menzel
Signed-off-by: Wim Van Sebroeck
Cc: stable -
In case of SB800 or later chipset and re-programming MMIO address(*),
sp5100_tco module may read incorrect value of reserved bit, because the module
reads a value from an incorrect I/O address. However, this bug doesn't cause
a problem, because when re-programming MMIO address, by chance the module
writes zero (this is BIOS's default value) to the low three bits of register.
* In most cases, PC with SB8x0 or later chipset doesn't need to re-programming
MMIO address, because such PC can enable AcpiMmio and can use 0xfed80b00 for
watchdog register base address.This patch fixes this bug.
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=43176
Signed-off-by: Takahisa Tanaka
Tested-by: Paul Menzel
Signed-off-by: Wim Van Sebroeck
Cc: stable -
this module missed a remove callback in the platform ops.
Signed-off-by: Devendra Naga
Signed-off-by: Wim Van Sebroeck -
The device IDs are referenced by the driver and potentially
used beyond the init time, as kbuild correctly warns
about. Remove the __initconst annotation.Without this patch, building at91_dt_defconfig results in:
WARNING: drivers/watchdog/built-in.o(.data+0x28): Section mismatch in reference from the variable at91wdt_driver to the (unknown reference) .init.rodata:(unknown)
The variable at91wdt_driver references
the (unknown reference) __initconst (unknown)Signed-off-by: Arnd Bergmann
Acked-by: Nicolas Ferre
Tested-by: Fabio Porcedda
Signed-off-by: Wim Van Sebroeck
Cc: linux-watchdog@vger.kernel.org -
DA9055_WATCHDOG (introduced in v3.8) needs to select WATCHDOG_CORE so that it will
build cleanly. Fixes these build errors:da9055_wdt.c:(.text+0xe9bc7): undefined reference to `watchdog_unregister_device'
da9055_wdt.c:(.text+0xe9f4b): undefined reference to `watchdog_register_device'Signed-off-by: Randy Dunlap
Cc: David Dajun Chen
Signed-off-by: Wim Van Sebroeck
Cc: linux-watchdog@vger.kernel.org
Cc: stable
27 Feb, 2013
1 commit
-
Pull vfs pile (part one) from Al Viro:
"Assorted stuff - cleaning namei.c up a bit, fixing ->d_name/->d_parent
locking violations, etc.The most visible changes here are death of FS_REVAL_DOT (replaced with
"has ->d_weak_revalidate()") and a new helper getting from struct file
to inode. Some bits of preparation to xattr method interface changes.Misc patches by various people sent this cycle *and* ocfs2 fixes from
several cycles ago that should've been upstream right then.PS: the next vfs pile will be xattr stuff."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (46 commits)
saner proc_get_inode() calling conventions
proc: avoid extra pde_put() in proc_fill_super()
fs: change return values from -EACCES to -EPERM
fs/exec.c: make bprm_mm_init() static
ocfs2/dlm: use GFP_ATOMIC inside a spin_lock
ocfs2: fix possible use-after-free with AIO
ocfs2: Fix oops in ocfs2_fast_symlink_readpage() code path
get_empty_filp()/alloc_file() leave both ->f_pos and ->f_version zero
target: writev() on single-element vector is pointless
export kernel_write(), convert open-coded instances
fs: encode_fh: return FILEID_INVALID if invalid fid_type
kill f_vfsmnt
vfs: kill FS_REVAL_DOT by adding a d_weak_revalidate dentry op
nfsd: handle vfs_getattr errors in acl protocol
switch vfs_getattr() to struct path
default SET_PERSONALITY() in linux/elf.h
ceph: prepopulate inodes only when request is aborted
d_hash_and_lookup(): export, switch open-coded instances
9p: switch v9fs_set_create_acl() to inode+fid, do it before d_instantiate()
9p: split dropping the acls from v9fs_set_create_acl()
...
25 Feb, 2013
1 commit
-
Pull MFS updates from Samuel Ortiz:
"This is the MFD pull request for the 3.9 merge window.No new drivers this time, but a bunch of fairly big cleanups:
- Roger Quadros worked on a OMAP USBHS and TLL platform data
consolidation, OMAP5 support and clock management code cleanup.- The first step of a major sync for the ab8500 driver from Lee
Jones. In particular, the debugfs and the sysct interfaces got
extended and improved.- Peter Ujfalusi sent a nice patchset for cleaning and fixing the
twl-core driver, with a much needed module id lookup code
improvement.- The regular wm5102 and arizona cleanups and fixes from Mark Brown.
- Laxman Dewangan extended the palmas APIs in order to implement the
palmas GPIO and rt drivers.- Laxman also added DT support for the tps65090 driver.
- The Intel SCH and ICH drivers got a couple fixes from Aaron Sierra
and Darren Hart.- Linus Walleij patchset for the ab8500 driver allowed ab8500 and
ab9540 based devices to switch to the new abx500 pin-ctrl driver.- The max8925 now has device tree and irqdomain support thanks to
Qing Xu.- The recently added rtsx driver got a few cleanups and fixes for a
better card detection code path and now also supports the RTS5227
chipset, thanks to Wei Wang and Roger Tseng."* tag 'mfd-3.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6: (109 commits)
mfd: lpc_ich: Use devres API to allocate private data
mfd: lpc_ich: Add Device IDs for Intel Wellsburg PCH
mfd: lpc_sch: Accomodate partial population of the MFD devices
mfd: da9052-i2c: Staticize da9052_i2c_fix()
mfd: syscon: Fix sparse warning
mfd: twl-core: Fix kernel panic on boot
mfd: rtsx: Fix issue that booting OS with SD card inserted
mfd: ab8500: Fix compile error
mfd: Add missing GENERIC_HARDIRQS dependecies
Documentation: Add docs for max8925 dt
mfd: max8925: Add dts
mfd: max8925: Support dt for backlight
mfd: max8925: Fix onkey driver irq base
mfd: max8925: Fix mfd device register failure
mfd: max8925: Add irqdomain for dt
mfd: vexpress: Allow vexpress-sysreg to self-initialise
mfd: rtsx: Support RTS5227
mfd: rtsx: Implement driving adjustment to device-dependent callbacks
mfd: vexpress: Add pseudo-GPIO based LEDs
mfd: ab8500: Rename ab8500 to abx500 for hwmon driver
...
23 Feb, 2013
1 commit
-
Signed-off-by: Al Viro
14 Feb, 2013
1 commit
-
This patch adds support for the ux500_wdt watchdog that is found in
ST-Ericsson Ux500 platform. The driver is based on PRCMU APIs.Acked-by: Linus Walleij
Acked-by: Lee Jones
Acked-by: Wim Van Sebroeck
Signed-off-by: Fabio Baltieri
Signed-off-by: Samuel Ortiz
26 Jan, 2013
1 commit
-
Convert all uses of devm_request_and_ioremap() to the newly introduced
devm_ioremap_resource() which provides more consistent error handling.devm_ioremap_resource() provides its own error messages so all explicit
error messages can be removed from the failure code paths.Signed-off-by: Thierry Reding
Cc: Wim Van Sebroeck
Signed-off-by: Greg Kroah-Hartman
18 Jan, 2013
1 commit
-
This makes the code a bit smaller by getting rid of
some boilerplate code.Signed-off-by: Fabio Porcedda
Cc: Wim Van Sebroeck
Cc: Linus Walleij
Signed-off-by: Greg Kroah-Hartman
02 Jan, 2013
4 commits
-
Add DT support for twl4030_wdt. This is needed to get twl4030_wdt to
probe when booting with DT.Signed-off-by: Aaro Koskinen
Signed-off-by: Wim Van Sebroeck -
We forgot to delete this in the commit 4f4753d9 (watchdog: omap_wdt:
convert to devm_ functions), and as a result the following compilation
warning was introduced:drivers/watchdog/omap_wdt.c: In function 'omap_wdt_remove':
drivers/watchdog/omap_wdt.c:299:19: warning: unused variable 'res' [-Wunused-variable]Signed-off-by: Aaro Koskinen
Reviewed-by: Paul Walmsley
Signed-off-by: Wim Van Sebroeck -
Otherwise, WDIOC_GETTIMEOUT returns wrong value if set_timeout fails.
This patch also removes unnecessary ret variable in da9055_wdt_ping function.Signed-off-by: Axel Lin
Signed-off-by: Wim Van Sebroeck -
It is not required to free devm_ allocated data. Since kref_put
needs a valid release function, da9055_wdt_release_resources()
is not deleted.Signed-off-by: Axel Lin
Signed-off-by: Wim Van Sebroeck
20 Dec, 2012
2 commits
-
If the DT does not include a regs parameter then the null res
would be dereferenced.Signed-off-by: Jason Gunthorpe
Signed-off-by: Wim Van Sebroeck -
The current sp5100_tco driver only supports SP5100/SB7x0 chipset, doesn't
support SB8x0 chipset, because current sp5100_tco driver doesn't know that the
offset address for watchdog timer was changed from SB8x0 chipset.The offset address of SP5100 and SB7x0 chipsets are as follows, quote from the
AMD SB700/710/750 Register Reference Guide (Page 164) and the AMD SP5100
Register Reference Guide (Page 166).WatchDogTimerControl 69h
WatchDogTimerBase0 6Ch
WatchDogTimerBase1 6Dh
WatchDogTimerBase2 6Eh
WatchDogTimerBase3 6FhIn contrast, the offset address of SB8x0 chipset is as follows, quote from
AMD SB800-Series Southbridges Register Reference Guide (Page 147).WatchDogTimerEn 48h
WatchDogTimerConfig 4ChSo, In the case of SB8x0 chipset, sp5100_tco reads meaningless MMIO
address (for example, 0xbafe00) from wrong offset address, and the following
message is logged.SP5100 TCO timer: mmio address 0xbafe00 already in use
With this patch, sp5100_tco driver supports SB8x0 chipset, and can avoid
iomem resource conflict. The processing of this patch is as follows.Step 1) Attempt to get the watchdog base address from indirect I/O (0xCD6
and 0xCD7).
- Go to the step 7 if obtained address hasn't conflicted with other
resource. But, currently, the address (0xfec000f0) conflicts with the
IOAPIC MMIO address, and the following message is logged.SP5100 TCO timer: mmio address 0xfec000f0 already in use
0xfec000f0 is recommended by AMD BIOS Developer's Guide. So, go to the
next step.Step 2) Attempt to get the SBResource_MMIO base address from AcpiMmioEN (for
SB8x0, PM_Reg:24h) or SBResource_MMIO (SP5100/SB7x0, PCI_Reg:9Ch)
register.
- Go to the step 7 if these register has enabled by BIOS, and obtained
address hasn't conflicted with other resource.
- If above condition isn't true, go to the next step.Step 3) Attempt to get the free MMIO address from allocate_resource().
- Go to the step 7 if these register has enabled by BIOS, and obtained
address hasn't conflicted with other resource.
- Driver initialization has failed if obtained address has conflicted
with other resource, and no 'force_addr' parameter is specified.Step 4) Use the specified address If 'force_addr' parameter is specified.
- allocate_resource() function may fail, when the PCI bridge device occupies
iomem resource from 0xf0000000 to 0xffffffff. To handle such a case,
I added 'force_addr' parameter to sp5100_tco driver. With 'force_addr'
parameter, sp5100_tco driver directly can assign MMIO address for watchdog
timer from free iomem region. Note that It's dangerous to specify wrong
address in the 'force_addr' parameter.Example of force_addr parameter use
# cat /proc/iomem
...snip...
fec00000-fec003ff : IOAPIC 0
Tested-by: Paul Menzel
Signed-off-by: Takahisa Tanaka
Signed-off-by: Wim Van Sebroeck
