summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6Linus Torvalds2006-12-1268-1590/+1730
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6: i2c: Fix OMAP clock prescaler to match the comment i2c: Refactor a kfree in i2c-dev i2c: Fix return value check in i2c-dev i2c: Enable PEC on more i2c-i801 devices i2c: Discard the i2c algo del_bus wrappers i2c: New ARM Versatile/Realview bus driver i2c: fix broken ds1337 initialization i2c: i2c-i801 documentation update i2c: Use the __ATTR macro where possible i2c: Whitespace cleanups i2c: Use put_user instead of copy_to_user where possible i2c: New Atmel AT91 bus driver i2c: Add support for nested i2c bus locking i2c: Cleanups to the i2c-nforce2 bus driver i2c: Add request/release_mem_region to i2c-ibm_iic bus driver i2c: New Philips PNX bus driver i2c: Delete the broken i2c-ite bus driver i2c: Update the list of driver IDs i2c: Fix documentation typos
| * i2c: Fix OMAP clock prescaler to match the commentJean Delvare2006-12-101-2/+2
| | | | | | | | | | Signed-off-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * i2c: Refactor a kfree in i2c-devJean Delvare2006-12-101-2/+1
| | | | | | | | | | | | | | | | | | Refactor kfree(i2c_dev) into return_i2c_dev(). This saves some code and makes more sense, as the memory is allocated in get_free_i2c_dev(). Signed-off-by: Jean Delvare <khali@linux-fr.org> Cc: Greg Kroah-Hartman <gregkh@suse.de>
| * i2c: Fix return value check in i2c-devAkinobu Mita2006-12-101-2/+2
| | | | | | | | | | | | | | | | | | device_create() returns error code as pointer on failures. This patch checks the return value of device_create() by using IS_ERR(). Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com> Cc: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Jean Delvare <khali@linux-fr.org>
| * i2c: Enable PEC on more i2c-i801 devicesJean Delvare2006-12-101-4/+12
| | | | | | | | | | | | | | | | Enable PEC on recent Intel SMBus controllers (ICH6, ICH7, ICH8, ICH9 and ESB2.) Signed-off-by: Jean Delvare <khali@linux-fr.org> Acked-by: Jason Gaston <jason.d.gaston@intel.com>
| * i2c: Discard the i2c algo del_bus wrappersJean Delvare2006-12-1036-84/+45
| | | | | | | | | | | | | | They are all only calling i2c_del_adapter, so we may as well do it directly. Signed-off-by: Jean Delvare <khali@linux-fr.org>
| * i2c: New ARM Versatile/Realview bus driverRussell King2006-12-107-0/+194
| | | | | | | | | | | | | | | | Add support for the I2C bus found on the ARM Versatile and Realview platforms. The I2C bus has a RTC and optionally some EEPROMs attached. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by: Jean Delvare <khali@linux-fr.org>
| * i2c: fix broken ds1337 initializationDirk Eibach2006-12-101-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On a custom board with ds1337 RTC I found that upgrade from 2.6.15 to 2.6.18 broke RTC support. The main problem are changes to ds1337_init_client(). When a ds1337 recognizes a problem (e.g. power or clock failure) bit 7 in status register is set. This has to be reset by writing 0 to status register. But since there are only 16 byte written to the chip and the first byte is interpreted as an address, the status register (which is the 16th) is never written. The other problem is, that initializing all registers to zero is not valid for day, date and month register. Funny enough this is checked by ds1337_detect(), which depends on this values not being zero. So then treated by ds1337_init_client() the ds1337 is not detected anymore, whereas the failure bit in the status register is still set. Signed-off-by: Dirk Stieler <stieler@gdsys.de> Signed-off-by: Dirk Eibach <eibach@gdsys.de> Signed-off-by: Jean Delvare <khali@linux-fr.org>
| * i2c: i2c-i801 documentation updateJason Gaston2006-12-101-1/+4
| | | | | | | | | | | | | | | | Add the Intel ICH9/ICH8/ESB2 SMBus Controller text to i2c-i801 documentation. Signed-off-by: Jason Gaston <jason.d.gaston@intel.com> Signed-off-by: Jean Delvare <khali@linux-fr.org>
| * i2c: Use the __ATTR macro where possibleJean Delvare2006-12-101-7/+4
| | | | | | | | Signed-off-by: Jean Delvare <khali@linux-fr.org>
| * i2c: Whitespace cleanupsDavid Brownell2006-12-106-89/+89
| | | | | | | | | | | | | | | | Remove extraneous whitespace from various i2c headers and core files, like space-before-tab and whitespace at end of line. Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Jean Delvare <khali@linux-fr.org>
| * i2c: Use put_user instead of copy_to_user where possibleJean Delvare2006-12-101-2/+1
| | | | | | | | | | | | | | This speeds up the I2C_FUNCS ioctl by 5 to 8% in my tests. Signed-off-by: Jean Delvare <khali@linux-fr.org> Laughed-at-by: Mark M. Hoffman <mhoffman@lightlink.com>
| * i2c: New Atmel AT91 bus driverAndrew Victor2006-12-103-0/+333
| | | | | | | | | | | | | | | | | | | | Add support for the I2C (Two-wire interface) controller integrated in the Atmel AT91RM9200 processor. This driver should also be usable on the Atmel AT91SAM9261 and AT91SAM9260 processors. Signed-off-by: Andrew Victor <andrew@sanpeople.com> Signed-off-by: Mark M. Hoffman <mhoffman@lightlink.com> Signed-off-by: Jean Delvare <khali@linux-fr.org>
| * i2c: Add support for nested i2c bus lockingJiri Kosina2006-12-102-1/+2
| | | | | | | | | | | | | | | | | | | | This patch adds the 'level' field into the i2c_adapter structure, which is used to represent the 'logical' level of nesting for the purposes of lockdep. This field is then used in the i2c_transfer() function, to acquire the per-adapter bus_lock with correct nesting level. Signed-off-by: Jiri Kosina <jikos@jikos.cz> Signed-off-by: Jean Delvare <khali@linux-fr.org>
| * i2c: Cleanups to the i2c-nforce2 bus driverHans-Frieder Vogt2006-12-102-76/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Summary of changes: - fixes: o legacy I/O region size is 64 bytes, not 8 bytes - general cleanup: o removed code for the unsupported I2C block data, block data, proc call and block proc call transfer modes o removed detail warnings about unsupported modes that are covered in a general warning (unsupported transaction...) anyway o removed necessity of a definition of struct i2c_adapter o moved definition of struct i2c_algorithm, making forward declarations of nforce2_access and nforce2_func unnecessary - minor changes: o in the description mention the nForce 5xx chipsets o changes my e-mail address in MODULE_AUTHOR Theses cleanups shrink the driver binary size from 4.0 kB to 2.7 kB on i386. Signed-off-by: Hans-Frieder Vogt <hfvogt@gmx.net> Signed-off-by: Jean Delvare <khali@linux-fr.org>
| * i2c: Add request/release_mem_region to i2c-ibm_iic bus driverJean-Baptiste Maneyrol2006-12-101-0/+9
| | | | | | | | | | | | | | | | | | Reserving I/O memory for a driver with request_mem_region is necessary to avoid memory access conflicts. Even if it's never going to happen, it is cleaner and it allows to monitor I/O memory used in /proc/iomem. Signed-off-by: Jean-Baptiste Maneyrol <jean-baptiste.maneyrol@teamlog.com> Signed-off-by: Jean Delvare <khali@linux-fr.org>
| * i2c: New Philips PNX bus driverVitaly Wool2006-12-107-1/+1006
| | | | | | | | | | | | | | | | | | New I2C bus driver for Philips ARM boards (Philips IP3204 I2C IP block). This I2C controller can be found on (at least) PNX010x, PNX52xx and PNX4008 Philips boards. Signed-off-by: Vitaly Wool <vitalywool@gmail.com> Signed-off-by: Jean Delvare <khali@linux-fr.org>
| * i2c: Delete the broken i2c-ite bus driverJean Delvare2006-12-1010-1312/+0
| | | | | | | | | | | | | | | | The rest of the ITE8172 support was already removed from MIPS tree. Signed-off-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp> Acked-by: Ralf Baechle <ralf@linux-mips.org>
| * i2c: Update the list of driver IDsJean Delvare2006-12-101-3/+1
| | | | | | | | | | | | | | | | | | * A chip driver ID was assigned to the Radeon, while it is an adapter so it needs an i2c adapter ID. * The SAA7191 is a video decoder, not encoder. * The icspll driver is dead, and will never be ported to Linux 2.6. Signed-off-by: Jean Delvare <khali@linux-fr.org>
| * i2c: Fix documentation typosJean Delvare2006-12-102-3/+3
| | | | | | | | | | | | Fix typos in i2c bus drivers documentation. Signed-off-by: Jean Delvare <khali@linux-fr.org>
* | [PATCH] netpoll: fix netpoll lockupIngo Molnar2006-12-121-2/+7
| | | | | | | | | | | | | | | | | | | | | | current -git doesnt boot on my laptop due to netpoll not unlocking the tx lock in the else branch. booted this up on my laptop with lockdep enabled and there are no locking complaints and it works fine. Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6Linus Torvalds2006-12-1263-557/+2038
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6: (29 commits) sh: Fixup SH-2 BUG() trap handling. sh: Use early_param() for earlyprintk parsing. sh: Fix .empty_zero_page alignment for PAGE_SIZE > 4096. sh: Fixup .data.page_aligned. sh: Hook up SH7722 scif ipr interrupts. sh: Fixup sh_bios() trap handling. sh: SH-MobileR SH7722 CPU support. sh: Fixup dma_cache_sync() callers. sh: Convert remaining remap_area_pages() users to ioremap_page_range(). sh: Fixup kernel_execve() for syscall cleanups. sh: Fix get_wchan(). sh: BUG() handling through trapa vector. rtc: rtc-sh: alarm support. rtc: rtc-sh: fix rtc for out-by-one for the month. sh: Kill off unused SE7619 I/O ops. serial: sh-sci: Shut up various sci_rxd_in() gcc4 warnings. sh: Split out atomic ops logically. sh: Fix Solution Engine 7619 build. sh: Trivial build fixes for SH-2 support. sh: IPR IRQ updates for SH7619/SH7206. ...
| * | sh: Fixup SH-2 BUG() trap handling.Yoshinori Sato2006-12-121-18/+14
| | | | | | | | | | | | | | | | | | | | | This adds in support for the BUG() trap on SH-2. Signed-off-by: Yoshinori Sato <ysato@users.sourceforge.jp> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | sh: Use early_param() for earlyprintk parsing.Paul Mundt2006-12-122-31/+16
| | | | | | | | | | | | Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | sh: Fix .empty_zero_page alignment for PAGE_SIZE > 4096.Paul Mundt2006-12-123-3/+6
| | | | | | | | | | | | Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | sh: Fixup .data.page_aligned.Paul Mundt2006-12-121-1/+1
| | | | | | | | | | | | | | | | | | This had a bogus .data.idt reference, fix it up.. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | sh: Hook up SH7722 scif ipr interrupts.Paul Mundt2006-12-121-0/+4
| | | | | | | | | | | | | | | | | | Add the SCIF IRQs to the IPR table for SH7722. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | sh: Fixup sh_bios() trap handling.Paul Mundt2006-12-121-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | This was inadvertently broken when the entry.S code split up, restore the missing branch and get subsequent traps working under debug again. This manifested itself as a lockup when attempting to reload the VBR base. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | sh: SH-MobileR SH7722 CPU support.Paul Mundt2006-12-1222-20/+284
| | | | | | | | | | | | | | | | | | This adds CPU support for the SH7722. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | sh: Fixup dma_cache_sync() callers.Paul Mundt2006-12-121-5/+5
| | | | | | | | | | | | | | | | | | This now takes a struct device, update all of the callers. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | sh: Convert remaining remap_area_pages() users to ioremap_page_range().Paul Mundt2006-12-122-4/+5
| | | | | | | | | | | | | | | | | | A couple of these were missed. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | sh: Fixup kernel_execve() for syscall cleanups.Paul Mundt2006-12-121-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | SH-2 and SH-2A need to use a different syscall base for the trapa vector than the other parts, so fixup the logic in the kernel_execve() case. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | sh: Fix get_wchan().Paul Mundt2006-12-121-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | Some time ago the schedule frame size changed and we failed to reflect this in get_wchan() at the time. This first popped up as a problem on SH7751R where schedule_frame ended up being unaligned and generating an unaligned trap. This fixes it up again.. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | sh: BUG() handling through trapa vector.Paul Mundt2006-12-123-9/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously we haven't been doing anything with verbose BUG() reporting, and we've been relying on the oops path for handling BUG()'s, which is rather sub-optimal. This switches BUG handling to use a fixed trapa vector (#0x3e) where we construct a small bug frame post trapa instruction to get the context right. This also makes it trivial to wire up a DIE_BUG for the atomic die chain, which we couldn't really do before. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | rtc: rtc-sh: alarm support.Jamie Lenehan2006-12-121-25/+201
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds alarm support for the RTC_ALM_SET, RTC_ALM_READ, RTC_WKALM_SET and RTC_WKALM_RD operations to rtc-sh. The only unusual part is the handling of the alarm interrupt. If you clear the alarm flag (AF) while the time in the RTC still matches the time in the alarm registers than AF is immediately re-set, and if the alarm interrupt (AIE) is still enabled then it re-triggers. I was originally getting around 20k+ interrupts generated during the second when the RTC and alarm registers matches. The solution I've used is to clear AIE when the alarm goes off and then use the carry interrupt to re-enabled it. The carry interrupt will check AF and re-enabled AIE if it's clear. If AF is not clear it'll clear it and then the check will be repeated next carry interrupt. This a bit in rtc structure that indicates that it's waiting to have AIE re-enabled so it doesn't turn it on when it wasn't enabled anyway. Signed-off-by: Jamie Lenehan <lenehan@twibble.org> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | rtc: rtc-sh: fix rtc for out-by-one for the month.Jamie Lenehan2006-12-121-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The RMONCNT register, which holds the month in the RTC, takes a value between 1 and 12 while the tm_mon field in the time structures takes a value between 0 and 11. This wasn't being taken into account in rtc-sh resulting in the month being out by one. eg, on my board during boot the RTC is set to: RTC is set to Thu Jul 01 09:00:00 1999 but "hwclock -r" immediately after logging in was showing: Sun Aug 1 09:01:43 1999 0.000000 seconds Signed-off-by: Jamie Lenehan <lenehan@twibble.org> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | sh: Kill off unused SE7619 I/O ops.Yoshinori Sato2006-12-123-124/+1
| | | | | | | | | | | | | | | | | | | | | This can use the generic routines, so kill off the board-specific ones. Signed-off-by: Yoshinori Sato <ysato@users.sourceforge.jp> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | serial: sh-sci: Shut up various sci_rxd_in() gcc4 warnings.Paul Mundt2006-12-121-0/+5
| | | | | | | | | | | | Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | sh: Split out atomic ops logically.Paul Mundt2006-12-123-151/+180
| | | | | | | | | | | | | | | | | | | | | | | | We have a few different ways to do the atomic operations, so split them out in to different headers rather than bloating atomic.h. Kernelspace gUSA will take this up to a third implementation. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | sh: Fix Solution Engine 7619 build.Yoshinori Sato2006-12-122-33/+33
| | | | | | | | | | | | | | | Signed-off-by: Yoshinori Sato <ysato@users.sourceforge.jp> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | sh: Trivial build fixes for SH-2 support.Yoshinori Sato2006-12-125-16/+7
| | | | | | | | | | | | | | | Signed-off-by: Yoshinori Sato <ysato@users.sourceforge.jp> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | sh: IPR IRQ updates for SH7619/SH7206.Yoshinori Sato2006-12-123-8/+111
| | | | | | | | | | | | | | | | | | | | | This updates the SH7619 and SH7206 code for the IPR IRQ changes. Signed-off-by: Yoshinori Sato <ysato@users.sourceforge.jp> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | sh: gcc4 symbol export fixups.Stuart Menefy2006-12-121-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | gcc 4 for sh changes the names of some compiler intrinsic functions and adds some additional ones. This patch adds the new ones, and fixes up various module symbol resolution issues. Signed-off-by: Stuart Menefy <stuart.menefy@st.com> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | sh: landisk board build fixes.Paul Mundt2006-12-123-34/+57
| | | | | | | | | | | | | | | | | | Get the landisk board building again.. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | rtc: rtc-sh: fix for period rtc interrupts.Jamie Lenehan2006-12-121-21/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | When testing the per second interrupt support (RTC_UIE_ON/RTC_UIE_OFF) of the new RTC system it would die in sh_rtc_interrupt due to a null ptr dereference. The following gets it working correctly. Signed-off-by: Jamie Lenehan <lenehan@twibble.org> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | sh: register rtc resources for sh775x.Jamie Lenehan2006-12-121-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | Register the RTC resources for the sh775x subtype so that the new generic RTC support in drivers/rtc/rtc-sh.c will work. Signed-off-by: Jamie Lenehan <lenehan@twibble.org> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | sh: SH-2 defconfig updates.Yoshinori Sato2006-12-122-39/+847
| | | | | | | | | | | | | | | | | | | | | This adds a new defconfig for SE7619 and updates SE7206. Signed-off-by: Yoshinori Sato <ysato@users.sourceforge.jp> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | sh: Add uImage and S-rec generation support.Paul Mundt2006-12-123-10/+43
| | | | | | | | | | | | | | | | | | Add a couple of new targets, both for uImage and S-rec generation. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | sh: push-switch fixups for work_struct API damage.Paul Mundt2006-12-122-5/+11
| | | | | | | | | | | | | | | | | | | | | INIT_WORK() dropped the data arg, so now we have to stash an extra pointer and backpedal instead. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | sh: Shut up csum_ipv6_magic() warnings.Paul Mundt2006-12-121-35/+34
| | | | | | | | | | | | Signed-off-by: Paul Mundt <lethal@linux-sh.org>
OpenPOWER on IntegriCloud