aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/sbus
Commit message (Collapse)AuthorAgeFilesLines
...
* riowatchdog: Move under drivers/watchdogDavid S. Miller2008-08-292-260/+0
| | | | | | The config stuff was already in drivers/watchdog/Kconfig Signed-off-by: David S. Miller <davem@davemloft.net>
* riowatchdog: Convert to pure OF driver.David S. Miller2008-08-291-135/+99
| | | | | | | | | | | | | | This also cleans up a lot of crud in this driver: 1) Don't touch the BBC regs, just leave the watchdog trigger behavior whatever the firmware programmed it to. 2) Use WATCHDOG_MINOR instead of hardcoded and not properly allocated RIOWD_MINOR. Hey, I haven't touched it since I wrote it years ago :-) Signed-off-by: David S. Miller <davem@davemloft.net>
* sparc: Remove generic SBUS probing layer.David S. Miller2008-08-292-174/+0
| | | | | | | The individual SBUS IOMMU arch code now sets the IOMMU information directly into the OF device objects. Signed-off-by: David S. Miller <davem@davemloft.net>
* sparc: Kill sbus_arch_preinit().David S. Miller2008-08-291-3/+0
| | | | | | | 32-bit sparc just needed it to register the ioport procfs bits, do this via an arch_initcall() instead. Signed-off-by: David S. Miller <davem@davemloft.net>
* sparc: Kill OBP property members of sbus_dev and sbus_busDavid S. Miller2008-08-291-17/+1
| | | | | | Unused. Signed-off-by: David S. Miller <davem@davemloft.net>
* sparc: Remove dinky old-style SBUS probing facilities.David S. Miller2008-08-291-14/+0
| | | | | | | No drivers or code uses this stuff any more, every driver has been converted over to OF device probing. Signed-off-by: David S. Miller <davem@davemloft.net>
* sparc: Remove SBUS layer resource and irq handling.David S. Miller2008-08-291-123/+1
| | | | | | | All the drivers use OF device objects now for this information. Signed-off-by: David S. Miller <davem@davemloft.net>
* sparc: Kill SBUS layer IRQ hooks.David S. Miller2008-08-291-4/+0
| | | | | | IRQs are obtained by drivers from the of_device struct. Signed-off-by: David S. Miller <davem@davemloft.net>
* sparc: Convert uctrl driver to OF driver.David S. Miller2008-08-292-97/+121
| | | | Signed-off-by: David S. Miller <davem@davemloft.net>
* sparc: Convert flash driver to OF device probing.David S. Miller2008-08-291-80/+50
| | | | Signed-off-by: David S. Miller <davem@davemloft.net>
* sparc: Propagate SBUS iommu archdata into real of_device objects.David S. Miller2008-08-291-4/+20
| | | | Signed-off-by: David S. Miller <davem@davemloft.net>
* sparc: Kill SBUS DVMA layer.David S. Miller2008-08-293-139/+1
| | | | | | | | | | | | | This thing was completely pointless. Just find the OF device in the parent of drivers that want to program this device, and map the DMA regs inside such drivers too. This also moves the dummy claim_dma_lock() and release_dma_lock() implementation to floppy_32.h, which makes it handle this issue just like floppy_64.h does. Signed-off-by: David S. Miller <davem@davemloft.net>
* sparc: Kill videopix SBUS driver.David S. Miller2008-08-296-1297/+0
| | | | | | | This has been marked BROKEN for a long time and it's more likely to get rewritten from scratch than to be fixed up and made usable. Signed-off-by: David S. Miller <davem@davemloft.net>
* sparc: Delete bare sbus char bpp driver, obsoleted by parport_sunbppDavid S. Miller2008-08-294-1065/+0
| | | | Signed-off-by: David S. Miller <davem@davemloft.net>
* sparc/drivers: use linux/of_device.h instead of asm/of_device.hStephen Rothwell2008-08-111-1/+1
| | | | | Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
* sparc64: fix up bus_id changes in sparc core codeGreg Kroah-Hartman2008-07-211-3/+3
| | | | | | | | | | | | | This converts all instances of bus_id in the sparc core kernel to use either dev_set_name(), or dev_name() depending on the need. This is done in anticipation of removing the bus_id field from struct driver. Cc: Kay Sievers <kay.sievers@vrfy.org> Acked-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* drivers/sbus/: cleanupsAdrian Bunk2008-07-175-40/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch contains the following cleanups: - make the following needlessly global code static: - char/uctrl.c: uctrl_get_event_status() - char/uctrl.c: uctrl_get_external_status() - char/vfc_dev.c: struct vfc_dev_lst - char/vfc_dev.c: vfc_lock_device() - char/vfc_dev.c: vfc_unlock_device() - char/vfc_dev.c: vfc_captstat_reset() - char/vfc_dev.c: vfc_memptr_reset() - char/vfc_dev.c: vfc_csr_init() - char/vfc_dev.c: vfc_saa9051_init() - char/vfc_dev.c: init_vfc_hw() - char/vfc_dev.c: init_vfc_devstruct() - char/vfc_dev.c: init_vfc_device() - char/vfc_dev.c: vfc_get_dev_ptr() - char/vfc_dev.c: vfc_capture_start() - char/vfc_dev.c: vfc_capture_poll() - char/vfc_dev.c: vfc_port_change_ioctl() - char/vfc_dev.c: vfc_set_video_ioctl() - char/vfc_dev.c: vfc_get_video_ioctl() - char/vfc_i2c.c: vfc_i2c_wait_for_bus() - char/vfc_i2c.c: vfc_i2c_wait_for_pin() - char/vfc_i2c.c: vfc_i2c_xmit_addr() - char/vfc_i2c.c: vfc_i2c_xmit_byte() - char/vfc_i2c.c: vfc_i2c_recv_byte() - dvma.c: init_one_dvma() - remove an unused variable from a function: - char/uctrl.c: ts102_uctrl_init() - remove the following unused and empty function: - char/uctrl.c: uctrl_set_video() Signed-off-by: Adrian Bunk <bunk@kernel.org> Signed-off-by: David S. Miller <davem@davemloft.net>
* Merge commit 'v2.6.26' into bkl-removalJonathan Corbet2008-07-141-3/+3
|\
| * sbus bpp: instances missed in s/dev_name/bpp_dev_name/Al Viro2008-05-211-3/+3
| | | | | | | | | | Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* | uctrl: BKL pushdownArnd Bergmann2008-07-021-0/+3
| | | | | | | | Signed-off-by: Arnd Bergmann <arnd@arndb.de>
* | sbus-rtc: BKL pushdownArnd Bergmann2008-07-021-0/+3
| | | | | | | | Signed-off-by: Arnd Bergmann <arnd@arndb.de>
* | riowatchdog: BKL pushdownArnd Bergmann2008-07-021-0/+2
| | | | | | | | Signed-off-by: Arnd Bergmann <arnd@arndb.de>
* | openprom: BKL pushdownArnd Bergmann2008-07-021-0/+3
| | | | | | | | Signed-off-by: Arnd Bergmann <arnd@arndb.de>
* | jsflash: BKL pushdownArnd Bergmann2008-06-201-3/+10
| | | | | | | | Signed-off-by: Arnd Bergmann <arnd@arndb.de>
* | flash: BKL pushdownArnd Bergmann2008-06-201-1/+5
| | | | | | | | Signed-off-by: Arnd Bergmann <arnd@arndb.de>
* | envctrl: BKL pushdownArnd Bergmann2008-06-201-0/+2
| | | | | | | | Signed-off-by: Arnd Bergmann <arnd@arndb.de>
* | display7seg: BKL pushdownArnd Bergmann2008-06-201-0/+1
| | | | | | | | Signed-off-by: Arnd Bergmann <arnd@arndb.de>
* | cpwatchdog: BKL pushdownArnd Bergmann2008-06-201-0/+4
| | | | | | | | Signed-off-by: Arnd Bergmann <arnd@arndb.de>
* | videopix: BKL pushdownJonathan Corbet2008-06-201-0/+5
| | | | | | | | | | | | Add explicit lock_kernel() calls to vfc_open(). Signed-off-by: Jonathan Corbet <corbet@lwn.net>
* | bpp: bkl pushdownJonathan Corbet2008-06-201-0/+3
|/ | | | | | | Put explicit lock_kernel() calls into bpp_open(). It has locking, but I'm not convinced it won't race with ioctl(). Signed-off-by: Jonathan Corbet <corbet@lwn.net>
* sbus: Fix bpp driver build.David S. Miller2008-05-051-1/+1
| | | | | | | | | Using the variable name 'dev_name' in the top-level namespace is a bad idea. This conflicts with linux/device.h's inline function of the same name. Signed-off-by: David S. Miller <davem@davemloft.net>
* drivers: replace remaining __FUNCTION__ occurrencesHarvey Harrison2008-04-302-3/+3
| | | | | | | | | __FUNCTION__ is gcc-specific, use __func__ Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com> Cc: Ben Dooks <ben-linux@fluff.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* [WATCHDOG] Sbus: cpwatchdog, remove SPIN_LOCK_UNLOCKEDJiri Slaby2007-11-191-1/+1
| | | | | | | | | | | | | cpwatchdog, remove SPIN_LOCK_UNLOCKED SPIN_LOCK_UNLOCKED is deprecated, use __SPIN_LOCK_UNLOCKED with an unique name instead Signed-off-by: Jiri Slaby <jirislaby@gmail.com> Cc: "David S. Miller" <davem@davemloft.net> Signed-off-by: Wim Van Sebroeck <wim@iguana.be> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
* vfc_dev conversion to mutex: falloutAl Viro2007-10-201-1/+1
| | | | | | | | Commit 7b96dc023a1b487bce59256fde14b8bb28b45aea ("[SPARC] Videopix Frame Grabber: Convert device_lock_sem to mutex") missed one place. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* [SPARC] Videopix Frame Grabber: Convert device_lock_sem to mutexMatthias Kaehlcke2007-10-172-3/+4
| | | | | | | | Videopix Frame Grabber: Convert the semaphore device_lock_sem to the mutex API Signed-off-by: Matthias Kaehlcke <matthias.kaehlcke@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* [BBC_I2C]: kmalloc + memset conversion to kzallocMariusz Kozlowski2007-07-311-2/+2
| | | | | Signed-off-by: Mariusz Kozlowski <m.kozlowski@tuxland.pl> Signed-off-by: David S. Miller <davem@davemloft.net>
* [BBC_ENVCTRL]: kmalloc + memset conversion to kzallocMariusz Kozlowski2007-07-311-4/+6
| | | | | Signed-off-by: Mariusz Kozlowski <m.kozlowski@tuxland.pl> Signed-off-by: David S. Miller <davem@davemloft.net>
* [SPARC] Videopix Frame Grabber: Fix unreleased lock in vfc_debug()Matthias Kaehlcke2007-07-311-0/+1
| | | | | | | | | Videopix Frame Grabber: vfc_debug() doesn't release the device lock when copy_from_user() fails Signed-off-by: Matthias Kaehlcke <matthias.kaehlcke@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: David S. Miller <davem@davemloft.net>
* [SPARC64]: Fix conflicts in SBUS/PCI/EBUS/ISA DMA handling.David S. Miller2007-07-301-0/+9
| | | | | | | | | | | | | | | | | | | Fully unify all of the DMA ops so that subordinate bus types to the DMA operation providers (such as ebus, isa, of_device) can work transparently. Basically, we just make sure that for every system device we create, the dev->archdata 'iommu' and 'stc' fields are filled in. Then we have two platform variants of the DMA ops, one for SUN4U which actually programs the real hardware, and one for SUN4V which makes hypervisor calls. This also fixes the crashes in parport_pc on sparc64, reported by Meelis Roos. Signed-off-by: David S. Miller <davem@davemloft.net>
* Merge branch 'master' of ↵Linus Torvalds2007-07-241-0/+1
|\ | | | | | | | | | | | | | | | | | | | | | | master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 * 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6: [SPARC64]: Mark most of initial bootup asm as .text.init.ref_ok [SPARC32]: Fix bug in sparc optimized memset. [SPARC64]: Update defconfig. [SPARC]: Add missing NOTES section. [SPARC32]: missing exports [SPARC32]: Deal with rtc/sun_mostek_rtc conflict.
| * [SPARC32]: Deal with rtc/sun_mostek_rtc conflict.Al Viro2007-07-241-0/+1
| | | | | | | | | | Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: David S. Miller <davem@davemloft.net>
* | [BLOCK] Get rid of request_queue_t typedefJens Axboe2007-07-241-1/+1
|/ | | | | | | | | Some of the code has been gradually transitioned to using the proper struct request_queue, but there's lots left. So do a full sweet of the kernel and get rid of this typedef and replace its uses with the proper type. Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
* [SPARC]: Make sure dev_archdata is filled in for all devices.David S. Miller2007-07-201-0/+5
| | | | Signed-off-by: David S. Miller <davem@davemloft.net>
* some kmalloc/memset ->kzalloc (tree wide)Yoann Padioleau2007-07-192-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Transform some calls to kmalloc/memset to a single kzalloc (or kcalloc). Here is a short excerpt of the semantic patch performing this transformation: @@ type T2; expression x; identifier f,fld; expression E; expression E1,E2; expression e1,e2,e3,y; statement S; @@ x = - kmalloc + kzalloc (E1,E2) ... when != \(x->fld=E;\|y=f(...,x,...);\|f(...,x,...);\|x=E;\|while(...) S\|for(e1;e2;e3) S\) - memset((T2)x,0,E1); @@ expression E1,E2,E3; @@ - kzalloc(E1 * E2,E3) + kcalloc(E1,E2,E3) [akpm@linux-foundation.org: get kcalloc args the right way around] Signed-off-by: Yoann Padioleau <padator@wanadoo.fr> Cc: Richard Henderson <rth@twiddle.net> Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru> Acked-by: Russell King <rmk@arm.linux.org.uk> Cc: Bryan Wu <bryan.wu@analog.com> Acked-by: Jiri Slaby <jirislaby@gmail.com> Cc: Dave Airlie <airlied@linux.ie> Acked-by: Roland Dreier <rolandd@cisco.com> Cc: Jiri Kosina <jkosina@suse.cz> Acked-by: Dmitry Torokhov <dtor@mail.ru> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Acked-by: Mauro Carvalho Chehab <mchehab@infradead.org> Acked-by: Pierre Ossman <drzeus-list@drzeus.cx> Cc: Jeff Garzik <jeff@garzik.org> Cc: "David S. Miller" <davem@davemloft.net> Acked-by: Greg KH <greg@kroah.com> Cc: James Bottomley <James.Bottomley@steeleye.com> Cc: "Antonino A. Daplas" <adaplas@pol.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* Add common orderly_poweroff()Jeremy Fitzhardinge2007-07-182-8/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | Various pieces of code around the kernel want to be able to trigger an orderly poweroff. This pulls them together into a single implementation. By default the poweroff command is /sbin/poweroff, but it can be set via sysctl: kernel/poweroff_cmd. This is split at whitespace, so it can include command-line arguments. This patch replaces four other instances of invoking either "poweroff" or "shutdown -h now": two sbus drivers, and acpi thermal management. sparc64 has its own "powerd"; still need to determine whether it should be replaced by orderly_poweroff(). Signed-off-by: Jeremy Fitzhardinge <jeremy@xensource.com> Acked-by: Len Brown <lenb@kernel.org> Signed-off-by: Chris Wright <chrisw@sous-sol.org> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Randy Dunlap <randy.dunlap@oracle.com> Cc: Andi Kleen <ak@suse.de> Cc: Al Viro <viro@zeniv.linux.org.uk> Cc: Arnd Bergmann <arnd@arndb.de> Cc: David S. Miller <davem@davemloft.net>
* unregister_blkdev() delete redundant messages in callersAkinobu Mita2007-07-171-2/+1
| | | | | | | | | No need to warn unregister_blkdev() failure by the callers. (The previous patch makes unregister_blkdev() print error message in error case) Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* cpwatchdog build fixAndrew Morton2007-07-161-0/+1
| | | | | | | | | | | | | | | | | | | | | sparc64: drivers/sbus/char/cpwatchdog.c: In function `wd_toggleintr': drivers/sbus/char/cpwatchdog.c:523: error: implicit declaration of function `readb' drivers/sbus/char/cpwatchdog.c:533: error: implicit declaration of function `writeb' drivers/sbus/char/cpwatchdog.c: In function `wd_pingtimer': drivers/sbus/char/cpwatchdog.c:545: error: implicit declaration of function `readw' drivers/sbus/char/cpwatchdog.c: In function `wd_starttimer': drivers/sbus/char/cpwatchdog.c:584: error: implicit declaration of function `writew' drivers/sbus/char/cpwatchdog.c: In function `wd_init': drivers/sbus/char/cpwatchdog.c:767: error: implicit declaration of function `ioremap' drivers/sbus/char/cpwatchdog.c:767: warning: assignment makes pointer from integer without a cast drivers/sbus/char/cpwatchdog.c: In function `wd_cleanup': drivers/sbus/char/cpwatchdog.c:849: error: implicit declaration of function `iounmap' Cc: "David S. Miller" <davem@davemloft.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* [SPARC]: Missing #include <linux/mm.h> in drivers/sbus/char/flash.cHorst H. von Brand2007-05-311-0/+1
| | | | | | | | | drivers/sbus/char/flash.c does use macros VM_READ and such, needs to include linux/mm.h. Signed-off-by: Horst H. von Brand <vonbrand@inf.utfsm.cl> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: David S. Miller <davem@davemloft.net>
* [SPARC] SBUS: display7seg.c needs asm/io.hDavid S. Miller2007-05-131-0/+1
| | | | Signed-off-by: David S. Miller <davem@davemloft.net>
* [SPARC] SBUS: bbc_i2c.c needs asm/io.hDavid S. Miller2007-05-131-0/+1
| | | | Signed-off-by: David S. Miller <davem@davemloft.net>