29 Mar, 2009
2 commits
-
* 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (422 commits)
[ARM] 5435/1: fix compile warning in sanity_check_meminfo()
[ARM] 5434/1: ARM: OMAP: Fix mailbox compile for 24xx
[ARM] pxa: fix the bad assumption that PCMCIA sockets always start with 0
[ARM] pxa: fix Colibri PXA300 and PXA320 LCD backlight pins
imxfb: Fix TFT mode
i.MX21/27: remove ifdef CONFIG_FB_IMX
imxfb: add clock support
mxc: add arch_reset() function
clkdev: add possibility to get a clock based on the device name
i.MX1: remove fb support from mach-imx
[ARM] pxa: build arch/arm/plat-pxa/mfp.c only when PXA3xx or ARCH_MMP defined
Gemini: Add support for Teltonika RUT100
Gemini: gpiolib based GPIO support v2
MAINTAINERS: add myself as Gemini architecture maintainer
ARM: Add Gemini architecture v3
[ARM] OMAP: Fix compile for omap2_init_common_hw()
MAINTAINERS: Add myself as Faraday ARM core variant maintainer
ARM: Add support for FA526 v2
[ARM] acorn,ebsa110,footbridge,integrator,sa1100: Convert asm/io.h to linux/io.h
[ARM] collie: fix two minor formatting nits
... -
Conflicts:
sound/soc/pxa/pxa2xx-i2s.c
28 Mar, 2009
1 commit
-
Conflicts:
arch/parisc/kernel/irq.c
arch/x86/include/asm/fixmap_64.h
arch/x86/include/asm/setup.h
kernel/irq/handle.cSemantic merge:
arch/x86/include/asm/fixmap.hSigned-off-by: Ingo Molnar
27 Mar, 2009
1 commit
-
* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
[WATCHDOG] i6300esb.c: start locking
[WATCHDOG] i6300esb.c: convert to platform device driver
[WATCHDOG] wdt.c: remove #ifdef CONFIG_WDT_501
[WATCHDOG] Fix io.h & uaccess.h includes.
[WATCHDOG] More coding-style and trivial clean-up
[WATCHDOG] struct file_operations should be const
[WATCHDOG] cpwd.c: Coding style - Clean-up
[WATCHDOG] hpwdt.c: Add new HP BMC controller.
[PATCH 13/13] drivers/watchdog: use USB API functions rather than constants
[WATCHDOG] orion5x_wdt: fix compile issue by providing tclk as platform data
[WATCHDOG] rc32434_wdt: make sure watchdog is not running at startup
[WATCHDOG] rc32434_wdt: add spin_locking
[WATCHDOG] rc32434_wdt: add shutdown method
[WATCHDOG] rc32434_wdt: add timeout module parameter
[WATCHDOG] rc32434_wdt: clean-up driver
[WATCHDOG] davinci: convert to ioremap() + io[read|write]
[WATCHDOG] w83697ug: add error checking
[WATCHDOG] cpwd.c & riowd.c - unlocked_ioctl
25 Mar, 2009
19 commits
-
Change the start function in preparation of the generic watchdog code.
Also make sure that locking of the start function is OK.Signed-off-by: Wim Van Sebroeck
-
Convert the Intel 6300ESB watchdog timer to a platform device driver.
Signed-off-by: Wim Van Sebroeck
-
Change the wdt.c watchdog driver so that the code is the same for
both the WDT500 as the WDT501-P card. The selection of the card
is now being done via the module parameter: 'type' instead of the
config option CONFIG_WDT_501.Signed-off-by: Alan Cox
Signed-off-by: Wim Van Sebroeck -
Fix following includes:
* #include should be #include
* #include should be #includeSigned-off-by: Wim Van Sebroeck
-
Some more cleaning-up of the watchdog drivers.
Signed-off-by: Wim Van Sebroeck
-
Fix following warnings:
WARNING: struct file_operations should normally be constSigned-off-by: Wim Van Sebroeck
-
This brings the cpwd.c watchdog driver in line with the kernel's coding style.
Signed-off-by: Wim Van Sebroeck
-
Add the PCI-ID for the upcoming new BMC controller for HP hardware.
Signed-off-by: Thomas Mingarelli
Signed-off-by: Wim Van Sebroeck -
This set of patches introduces calls to the following set of functions:
usb_endpoint_dir_in(epd)
usb_endpoint_dir_out(epd)
usb_endpoint_is_bulk_in(epd)
usb_endpoint_is_bulk_out(epd)
usb_endpoint_is_int_in(epd)
usb_endpoint_is_int_out(epd)
usb_endpoint_num(epd)
usb_endpoint_type(epd)
usb_endpoint_xfer_bulk(epd)
usb_endpoint_xfer_control(epd)
usb_endpoint_xfer_int(epd)
usb_endpoint_xfer_isoc(epd)In some cases, introducing one of these functions is not possible, and it
just replaces an explicit integer value by one of the following constants:USB_ENDPOINT_XFER_BULK
USB_ENDPOINT_XFER_CONTROL
USB_ENDPOINT_XFER_INT
USB_ENDPOINT_XFER_ISOCAn extract of the semantic patch that makes these changes is as follows:
(http://www.emn.fr/x-info/coccinelle/)//
@r1@ struct usb_endpoint_descriptor *epd; @@- ((epd->bmAttributes & \(USB_ENDPOINT_XFERTYPE_MASK\|3\)) ==
- \(USB_ENDPOINT_XFER_CONTROL\|0\))
+ usb_endpoint_xfer_control(epd)@r5@ struct usb_endpoint_descriptor *epd; @@
- ((epd->bEndpointAddress & \(USB_ENDPOINT_DIR_MASK\|0x80\)) ==
- \(USB_DIR_IN\|0x80\))
+ usb_endpoint_dir_in(epd)@inc@
@@#include
@depends on !inc && (r1||r5)@
@@+ #include
#include
//Signed-off-by: Julia Lawall
Signed-off-by: Wim Van Sebroeck -
The orion5x-wdt driver is now registered as a platform device and
receives the tclk value as platform data. This fixes a compile issue
cause by a previously removed define "ORION5X_TCLK".Signed-off-by: Thomas Reitmayr
Acked-by: Nicolas Pitre
Signed-off-by: Kristof Provost
Cc: Lennert Buytenhek
Cc: Wim Van Sebroeck
Cc: Russell King
Cc: Martin Michlmayr
Cc: Sylver Bruneau
Cc: Kunihiko IMAI
Signed-off-by: Andrew Morton -
Make sure that the watchdog is not running after loading
and before it is started by opening /dev/watchdog.Signed-off-by: Wim Van Sebroeck
-
Add spin_locks to prevent races.
Signed-off-by: Wim Van Sebroeck
-
Add shutdown method to the platform driver.
Signed-off-by: Wim Van Sebroeck
-
The WDT timer ticks quite fast (half of the CPU clock speed, which may
be between 198MHz and 330MHz (or 400MHz on newer boards)). Given it's
size of 32Bit, the maximum timeout value ranges from about 21s to 43s,
depending on the configured CPU clock speed.This patch add's the timeout module parameter and checks that it's not
bigger then the maximum timeout for the given clock speed.Signed-off-by: Phil Sutter
Signed-off-by: Wim Van Sebroeck -
Clean-up the rc32434 driver code:
- name the platform driver rc32434_wdt_driver
- Replace KBUILD_MODNAME ": " with PFX define.
- Cleanup include files
- Order the ioctl'sSigned-off-by: Phil Sutter
Signed-off-by: Wim Van Sebroeck -
Remove davinci platform-specific IO accessor macros in favor
of standard ioremap + io[read|write]* functions.Also, convert printk(KERN_ERR ....) into dev_err(...)
Signed-off-by: Kevin Hilman
Signed-off-by: Wim Van Sebroeck -
I noticed the W83697UG driver tries to register a watchdog even though
it already noticed the chip isn't there.WDT driver for the Winbond(TM) W83697UG/UF Super I/O chip initialising.
w83697ug/uf WDT: No W83697UG/UF could be found
w83697ug/uf WDT: Watchdog already running. Resetting timeout to 60 sec
w83697ug/uf WDT: cannot register miscdev on minor=130 (err=-16)Patch propagates the error back to wdt_init().
Signed-off-by: Eric Lammerts
Signed-off-by: Wim Van Sebroeck -
Switch to unlocked_ioctl
Signed-off-by: Wim Van Sebroeck
-
This patch fixes the bug reported in
http://bugzilla.kernel.org/show_bug.cgi?id=11681."Lots of device drivers register a 'struct device_driver' with
the '.bus' member set to '&platform_bus_type'. This is wrong,
since the platform_bus functions expect the 'struct device_driver'
to be wrapped up in a 'struct platform_driver' which provides
some additional callbacks (like suspend_late, resume_early).
The effect may be that platform_suspend_late() uses bogus data
outside the device_driver struct as a pointer pointer to the
device driver's suspend_late() function or other hard to
reproduce failures."(Lothar Wassmann)Signed-off-by: Ming Lei
Acked-by: Henrique de Moraes Holschuh
Acked-by: David Brownell
Signed-off-by: Greg Kroah-Hartman
19 Mar, 2009
1 commit
-
Conflicts:
arch/arm/mach-omap2/clock.c
14 Mar, 2009
1 commit
-
Conflicts:
arch/arm/mach-at91/gpio.c
09 Mar, 2009
1 commit
-
The remaining registers are separated into:
-
-
-and then we can remove pxa-regs.h completely. Instead of #include this
file, let's:1. include the specific with care (if that's absolutely
necessary)2. define the registers in the driver, make cleanly defined API to expose
the register access to external with sufficient reasonSigned-off-by: Eric Miao
06 Mar, 2009
1 commit
-
orion5x_wdt no longer compiled after the changes in commit
ebe35aff883496c07248df82c8576c3b6e84bbbe ("Orion: prepare for
runtime-determined timer tick rate").The tick rate define (ORION5X_TCLK) was removed in favor of a runtime
detection. The quick fix is to add the define in the watchdog driver.
The fix is not correct for all supported orion5x platforms, but since
the supported platforms right now are 133 Mhz and 166 Mhz, it won't
be _that_ far off. ;-) A fix that uses the runtime-determined timer
tick rate will be applied later.Signed-off-by: Wim Van Sebroeck
Cc: Kristof Provost
Acked-by: Lennert Buytenhek
Cc: Nicolas Pitre
Cc: Russell King
Cc: Andrew Morton
05 Mar, 2009
2 commits
-
fsl_get_sys_freq() may return -1 when 'soc' isn't found, but in
gef_wdt_probe() 'freq' is unsigned, so the test doesn't catch that.Signed-off-by: Roel Kluin
Signed-off-by: Wim Van Sebroeck
Signed-off-by: Andrew Morton -
On arm-acs5k_tiny:
drivers/watchdog/ks8695_wdt.c:68: error: 'CLOCK_TICK_RATE' undeclared
(first use in this function)Signed-off-by: Alexey Dobriyan
Signed-off-by: Wim Van Sebroeck
Cc: stable
24 Feb, 2009
2 commits
-
Fix init and exit sections.
Signed-off-by: Phil Sutter
Signed-off-by: Wim Van Sebroeck
Cc: stable -
The existing driver code wasn't working. Neither the timeout was set
correctly, nor system reset was being triggered, as the driver seemed
to keep the WDT alive himself. There was also some unnecessary code.Signed-off-by: Phil Sutter
Signed-off-by: Wim Van Sebroeck
Cc: stable
23 Feb, 2009
1 commit
-
Conflicts:
arch/x86/mach-default/setup.cSemantic conflict resolution:
arch/x86/kernel/setup.cSigned-off-by: Ingo Molnar
20 Feb, 2009
1 commit
-
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] 5405/1: ep93xx: remove unused gesbc9312.h header
[ARM] 5404/1: Fix condition in arm_elf_read_implies_exec() to set READ_IMPLIES_EXEC
[ARM] omap: fix clock reparenting in omap2_clk_set_parent()
[ARM] 5403/1: pxa25x_ep_fifo_flush() *ep->reg_udccs always set to 0
[ARM] 5402/1: fix a case of wrap-around in sanity_check_meminfo()
[ARM] 5401/1: Orion: fix edge triggered GPIO interrupt support
[ARM] 5400/1: Add support for inverted rdy_busy pin for Atmel nand device controller
[ARM] 5391/1: AT91: Enable GPIO clocks earlier
[ARM] 5390/1: AT91: Watchdog fixes
[ARM] 5398/1: Add Wan ZongShun to MAINTAINERS for W90P910
[ARM] omap: fix _omap2_clksel_get_src_field()
[ARM] omap: fix omap2_divisor_to_clksel() error return value
15 Feb, 2009
1 commit
-
The recently merged AT91SAM9 watchdog driver uses the
AT91SAM9X_WATCHDOG config variable, whereas the original version of
the driver (and the platform support code) used AT91SAM9_WATCHDOG.
This causes the watchdog platform_device to never be registered, and
therefore the driver not to be initialized.This patch:
- updates the platform support code to use AT91SAM9X_WATCHDOG.
- includes to fix compile error (same fix as was applied
to at91rm9200_wdt.c)
- fixes comment regarding watchdog clock-rates in at91rm9200.Signed-off-by: Andrew Victor
Signed-off-by: Russell King
14 Feb, 2009
1 commit
-
bugzilla: #12363
commit 7cd5b08be3c489df11b559fef210b81133764ad4 added a second regression:
some Dell's and Compaq's lockup on boot. So we revert most of the code.
The ICH9 reboot issue remains in place and will need some more fixing... :-(Signed-off-by: Wim Van Sebroeck
09 Feb, 2009
2 commits
-
Eliminate the OMAP1 vs OMAP2 clock knowledge in the watchdog driver.
Signed-off-by: Russell King
-
This eliminates the need for separate OMAP24xx and OMAP34xx clock
requesting code sections.Signed-off-by: Russell King
29 Jan, 2009
1 commit
-
…', 'x86/header-fixes', 'x86/mm', 'x86/paravirt', 'x86/pat', 'x86/setup-v2', 'x86/subarch', 'x86/uaccess' and 'x86/urgent' into x86/core
25 Jan, 2009
1 commit
-
The driver was updated for OMAP34xx, but the Kconfig file was missed.
So this adds the missing parts from d99241c in Tony Lindgren's tree:Add watchdog timer support for TI OMAP3430.
Signed-off-by: Madhusudhan Chikkature
Signed-off-by: Tony LindgrenSigned-off-by: Russell King
24 Jan, 2009
1 commit
-
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD
Signed-off-by: Russell King
