12 years ago[Blackfin] arch: cplb-mpu code clean up
Mike Frysinger [Wed, 23 Apr 2008 21:44:32 +0000]
[Blackfin] arch: cplb-mpu code clean up

 - allow bootrom to be readable from supervisor mode
 - delete unused local variable "addr"
 - punt unused local defines of cplbinfo.c

Signed-off-by: Mike Frysinger <vapier.adi@gmail.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>

12 years ago[Blackfin] arch: Give the DMA base registers a more descriptive name
Bernd Schmidt [Wed, 23 Apr 2008 21:31:18 +0000]
[Blackfin] arch: Give the DMA base registers a more descriptive name

The DMA base registers are available in a global named "base_addr" for
every Blackfin variant. Give this a more descriptive name, and remove
duplicate tables from some drivers.

Signed-off-by: Bernd Schmidt <bernds_cb1@t-online.de>
Signed-off-by: Bryan Wu <cooloney@kernel.org>

12 years ago[Blackfin] arch: Consistently export base_addr for all Blackfin variants.
Bernd Schmidt [Wed, 23 Apr 2008 21:23:31 +0000]
[Blackfin] arch: Consistently export base_addr for all Blackfin variants.

Signed-off-by: Bernd Schmidt <bernds_cb1@t-online.de>
Signed-off-by: Bryan Wu <cooloney@kernel.org>

12 years ago[Blackfin] arch: Allow AD1836A board to be connected, either to SPORT2 or SPORT3.
Bernd Schmidt [Wed, 23 Apr 2008 21:19:02 +0000]
[Blackfin] arch: Allow AD1836A board to be connected, either to SPORT2 or SPORT3.

Signed-off-by: Bernd Schmidt <bernds_cb1@t-online.de>
Signed-off-by: Bryan Wu <cooloney@kernel.org>

12 years ago[Blackfin] arch: actually implement get_cycles function
Mike Frysinger [Wed, 23 Apr 2008 21:07:29 +0000]
[Blackfin] arch: actually implement get_cycles function

Signed-off-by: Mike Frysinger <vapier.adi@gmail.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>

12 years ago[Blackfin] arch: add boot messages to quickly distinguish between MPU/NOMPU settings
Mike Frysinger [Wed, 23 Apr 2008 21:13:10 +0000]
[Blackfin] arch: add boot messages to quickly distinguish between MPU/NOMPU settings

Signed-off-by: Mike Frysinger <vapier.adi@gmail.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>

12 years ago[Blackfin] arch: theres no need to declare ram{end,start,base} in the head.S files
Mike Frysinger [Wed, 23 Apr 2008 21:12:09 +0000]
[Blackfin] arch: theres no need to declare ram{end,start,base} in the head.S files

theres no need to declare ram{end,start,base} in the head.S files
when declaring them with the other memory related variables in setup.c
is so much simpler/nicer

Signed-off-by: Mike Frysinger <vapier.adi@gmail.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>

12 years ago[Blackfin] arch: remove duplicated prototypes for internal cplb structures from the...
Mike Frysinger [Wed, 23 Apr 2008 21:09:06 +0000]
[Blackfin] arch: remove duplicated prototypes for internal cplb structures from the global blackfin header

remove duplicated prototypes for internal cplb structures from
the global blackfin header as nothing else should be accessing these

Signed-off-by: Mike Frysinger <vapier.adi@gmail.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>

12 years ago[Blackfin] arch: declare list of peripherals as const since we dont modify the incomi...
Mike Frysinger [Wed, 23 Apr 2008 21:04:24 +0000]
[Blackfin] arch: declare list of peripherals as const since we dont modify the incoming array

Signed-off-by: Mike Frysinger <vapier.adi@gmail.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>

12 years ago[Blackfin] arch: merge ip0x-specific board changes
Mike Frysinger [Wed, 23 Apr 2008 21:03:26 +0000]
[Blackfin] arch: merge ip0x-specific board changes

Signed-off-by: Mike Frysinger <vapier.adi@gmail.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>

12 years ago[Blackfin] arch: USB header files are now located under linux/usb/.
Peter Korsgaard [Wed, 23 Apr 2008 19:34:13 +0000]
[Blackfin] arch: USB header files are now located under linux/usb/.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Signed-off-by: Bryan Wu <cooloney@kernel.org>

12 years ago[Blackfin] arch: Resolve the clash issue of UART defines between blackfin headers...
Graf Yang [Wed, 23 Apr 2008 20:43:14 +0000]
[Blackfin] arch: Resolve the clash issue of UART defines between blackfin headers and include/linux/serial_reg.

Signed-off-by: Graf Yang <graf.yang@analog.com>
Cc: Robin Getz <rgetz@blackfin.uclinux.org>
Signed-off-by: Bryan Wu <cooloney@kernel.org>

12 years ago[Blackfin] arch: Apply Bluetechnix vendor patch
Michael Hennerich [Wed, 23 Apr 2008 19:18:59 +0000]
[Blackfin] arch: Apply Bluetechnix vendor patch

Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>

12 years ago[Blackfin] arch: This allows XIP to work with FD-PIC.
Bernd Schmidt [Wed, 23 Apr 2008 19:06:15 +0000]
[Blackfin] arch: This allows XIP to work with FD-PIC.

Previously, init failed to do anything meaningful;
it turns out that the reason is that FD-PIC has a readonly data
section which can be located in the XIP filesystem, and various address checks
in the kernel reject such addresses for syscall arguments.  Hence, init's
  execve ("/bin/sh", ...)
failed with error code EFAULT.

There's room for improvement here: in case people want to have filesystems
on flash rather than in main memory, _access_ok should be modified to
allow this.

This bug fix is also dedicated to Michael Hennerich.

Signed-off-by: Bernd Schmidt <bernds_cb1@t-online.de>
Signed-off-by: Bryan Wu <cooloney@kernel.org>

12 years ago[Blackfin] arch: support the reserved memory region in the MPU code
Bernd Schmidt [Wed, 23 Apr 2008 18:58:26 +0000]
[Blackfin] arch: support the reserved memory region in the MPU code

Pointed-out-by: Mike Frysinger <vapier.adi@gmail.com>
Signed-off-by: Bernd Schmidt <bernds_cb1@t-online.de>
Signed-off-by: Bryan Wu <cooloney@kernel.org>

12 years ago[Blackfin] arch: fix bug - a crash on bootup with CONFIG_MPU on the BF548
Bernd Schmidt [Wed, 23 Apr 2008 18:56:36 +0000]
[Blackfin] arch: fix bug - a crash on bootup with CONFIG_MPU on the BF548

The function flush_switched_dcplbs was clearing the CPLB entries covering
the process permission bitmasks.  This means that the sequence

flush_switched_dcplbs ();
        set_mask_dcplbs(mm->context.page_rwx_mask);

has a problem: if kernel code (such as an interrupt) causes a CPLB miss before
set_mask_dcplbs completes, the CPLB handler function causes a double fault,
with an instantaneous reboot.

This bug fix is dedicated to Michael Hennerich, the only person in the world
capable of providing working JTAG hardware.

Signed-off-by: Bernd Schmidt <bernds_cb1@t-online.de>
Signed-off-by: Bryan Wu <cooloney@kernel.org>

12 years ago[Blackfin] arch: a rather old performance improvement for the signal handling code
Bernd Schmidt [Wed, 23 Apr 2008 18:51:36 +0000]
[Blackfin] arch: a rather old performance improvement for the signal handling code

This is a rather old performance improvement for the signal handling
code, which was originally only committed on the 2007R1 branch as a
workaround for what we suspected to be a hardware bug.

There's no point in constructing a sigreturn stub on the stack and
flushing caches; we can just make signal handlers return to a known
location in the fixed code area.

Signed-off-by: Bernd Schmidt <bernds_cb1@t-online.de>
Signed-off-by: Bryan Wu <cooloney@kernel.org>

12 years ago[Blackfin] arch: finish removing remnants of old BF537_PORT_H option of Blackfin...
Mike Frysinger [Wed, 23 Apr 2008 18:37:27 +0000]
[Blackfin] arch: finish removing remnants of old BF537_PORT_H option of Blackfin EMAC driver

Signed-off-by: Mike Frysinger <vapier.adi@gmail.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>
Acked-by: Jeff Garzik <jeff@garzik.org>

12 years ago[Blackfin] arch: LARGE_ALLOCS was dropped along the way ... bring Blackfin in line
Mike Frysinger [Wed, 23 Apr 2008 02:19:59 +0000]
[Blackfin] arch: LARGE_ALLOCS was dropped along the way ... bring Blackfin in line

Signed-off-by: Mike Frysinger <vapier.adi@gmail.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>

12 years ago[Blackfin] arch: we no longer use BFIN_{SINGLE,DUAL}_CORE in our source
Mike Frysinger [Wed, 23 Apr 2008 02:14:14 +0000]
[Blackfin] arch: we no longer use BFIN_{SINGLE,DUAL}_CORE in our source

Signed-off-by: Bryan Wu <cooloney@kernel.org>

12 years ago[Blackfin] arch: boards and machines defconfig updates
Bryan Wu [Wed, 23 Apr 2008 21:02:04 +0000]
[Blackfin] arch: boards and machines defconfig updates

Signed-off-by: Bryan Wu <cooloney@kernel.org>

12 years ago[Blackfin] arch: __FUNCTION__ is gcc-specific, use __func__
Harvey Harrison [Wed, 23 Apr 2008 01:39:01 +0000]
[Blackfin] arch: __FUNCTION__ is gcc-specific, use __func__

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Cc: Mike Frysinger <vapier.adi@gmail.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

Signed-off-by: Bryan Wu <cooloney@kernel.org>

12 years ago[Blackfin] arch: remove unused/incorrect definition
Meihui Fan [Wed, 23 Apr 2008 01:07:25 +0000]
[Blackfin] arch: remove unused/incorrect definition

Signed-off-by: Meihui Fan <mhfan@hhcn.com>
Signed-off-by: Mike Frysinger <vapier.adi@gmail.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>

12 years ago[Blackfin] arch: fix bug - make sure we check the right L1 length
Meihui Fan [Wed, 23 Apr 2008 00:55:26 +0000]
[Blackfin] arch: fix bug - make sure we check the right L1 length

Signed-off-by: Meihui Fan <mhfan@hhcn.com>
Signed-off-by: Mike Frysinger <vapier.adi@gmail.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>

12 years ago[Blackfin] arch: add support for the rest of the gptimers on the BF54x
Meihui Fan [Wed, 23 Apr 2008 00:53:15 +0000]
[Blackfin] arch: add support for the rest of the gptimers on the BF54x

Signed-off-by: Meihui Fan <mhfan@hhcn.com>
Signed-off-by: Mike Frysinger <vapier.adi@gmail.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>

12 years ago[Blackfin] arch: fix obvious bfin_write typos
Meihui Fan [Wed, 23 Apr 2008 00:50:53 +0000]
[Blackfin] arch: fix obvious bfin_write typos

Signed-off-by: Meihui Fan <mhfan@hhcn.com>
Signed-off-by: Mike Frysinger <vapier.adi@gmail.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>

12 years ago[Blackfin] arch: Fix bug - Properly calculate DDR clock.
Sonic Zhang [Thu, 24 Apr 2008 19:06:10 +0000]
[Blackfin] arch: Fix bug - Properly calculate DDR clock.

Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>

12 years ago[Blackfin] arch: fix some obvious typos -- some of which prevent SDH building for...
Mike Frysinger [Wed, 23 Apr 2008 00:27:06 +0000]
[Blackfin] arch: fix some obvious typos -- some of which prevent SDH building for the BF542

Signed-off-by: Mike Frysinger <vapier.adi@gmail.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>

12 years ago[Blackfin] arch: relocate MAX_SWITCH_{D,I}_CPLBS from the header to the file where...
Mike Frysinger [Wed, 23 Apr 2008 00:23:51 +0000]
[Blackfin] arch: relocate MAX_SWITCH_{D,I}_CPLBS from the header to the file where it actually gets used.

relocate MAX_SWITCH_{D,I}_CPLBS from the header to the file
where it actually gets used.  this way when we change
CONFIG_MEM_SIZE in our kconfig, we only rebuild one or two files
rather than a whole bunch that implicitly include cplb.h.

this will also remove the ability to clear the swapcount on
the fly, but i really dont think that functionality is important.

ultimate goal is for CONFIG_MEM_SIZE to go away and calculate
this value on the fly based on what u-boot programmed for us.

Signed-off-by: Mike Frysinger <vapier.adi@gmail.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>

12 years ago[Blackfin] arch: replace implied numbers with real values
Mike Frysinger [Wed, 23 Apr 2008 00:09:45 +0000]
[Blackfin] arch: replace implied numbers with real values

replace implied numbers with real values so that strace is able to
calculate things automatically ... the numbers are frozen in our ABI,
so having them based off other __NR_xxx values really doesnt matter
-- no functional changes

Signed-off-by: Mike Frysinger <vapier.adi@gmail.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>

12 years ago[Blackfin] arch: MEM_ADD_WIDTH only gets used when reprogramming clocks, so dont...
Mike Frysinger [Wed, 23 Apr 2008 00:07:05 +0000]
[Blackfin] arch: MEM_ADD_WIDTH only gets used when reprogramming clocks, so dont bother exposing it in the menu normally

Signed-off-by: Mike Frysinger <vapier.adi@gmail.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>

12 years ago[Blackfin] arch: update reboot code to match latest info (really just copy from u...
Mike Frysinger [Wed, 23 Apr 2008 00:01:31 +0000]
[Blackfin] arch: update reboot code to match latest info (really just copy from u-boot)

Signed-off-by: Mike Frysinger <vapier.adi@gmail.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>

12 years ago[Blackfin] arch: Add dma_map_page and dma_unmap_page stub for MMC SPI compiling
Bryan Wu [Tue, 22 Apr 2008 23:41:52 +0000]
[Blackfin] arch: Add dma_map_page and dma_unmap_page stub for MMC SPI compiling

Signed-off-by: Bryan Wu <cooloney@kernel.org>

12 years ago[Blackfin] arch: fix bug - Make the MPU code aware of the async banks and the uncache...
Bernd Schmidt [Tue, 22 Apr 2008 23:26:23 +0000]
[Blackfin] arch: fix bug - Make the MPU code aware of the async banks and the uncached DMA area.

Bug: CONFIG_MPU doesn't seem to handle access to ASYNC/IO Memory well
http://blackfin.uclinux.org/gf/project/uclinux-dist/tracker/?action=TrackerItemEdit&tracker_item_id=3912

Signed-off-by: Bernd Schmidt <bernds_cb1@t-online.de>
Signed-off-by: Bryan Wu <cooloney@kernel.org>

12 years ago[Blackfin] arch: fix bug - when using trace buffer with CONFIG_MPU enabled.
Bernd Schmidt [Tue, 22 Apr 2008 23:17:34 +0000]
[Blackfin] arch: fix bug - when using trace buffer with CONFIG_MPU enabled.

There were a couple of problems with the way the trace buffer state
is saved/restored in assembly.  The DEBUG_HWTRACE_SAVE/RESTORE macros
save a value to the stack, which is not immediately obvious; the CPLB
exception code needed changes to load the correct value of the stack
pointer.  The other problem is that the SAVE/RESTORE macros weren't
pushing and popping the value downwards on the stack, but rather moving
it _upwards_, which is of course completely broken.

We also need to make sure there's a matching DEBUG_HWTRACE_RESTORE in
the error case of the CPLB handler.

Signed-off-by: Bernd Schmidt <bernds_cb1@t-online.de>
Signed-off-by: Bryan Wu <cooloney@kernel.org>

12 years ago[Blackfin] arch: fix up - CONFIG_BLKFIN_WT was renamed CONFIG_BFIN_WT while the MPU...
Bernd Schmidt [Tue, 22 Apr 2008 23:11:55 +0000]
[Blackfin] arch: fix up - CONFIG_BLKFIN_WT was renamed CONFIG_BFIN_WT while the MPU code was out-of-tree.

Signed-off-by: Bernd Schmidt <bernds_cb1@t-online.de>
Signed-off-by: Bryan Wu <cooloney@kernel.org>

12 years ago[Blackfin] arch: remove TWI I2C register accessing helper macros, because we moved...
Bryan Wu [Wed, 26 Mar 2008 23:25:21 +0000]
[Blackfin] arch: remove TWI I2C register accessing helper macros, because we moved to use i2c new-style interface

Signed-off-by: Bryan Wu <cooloney@kernel.org>

12 years ago[Blackfin] arch: fix bug - grab locks when not atomic
Robin Getz [Wed, 26 Mar 2008 01:17:43 +0000]
[Blackfin] arch: fix bug - grab locks when not atomic

grab locks when not atomic - this fixes the issues
sometimes seen when using magic sysrq.

Signed-off-by: Robin Getz <rgetz@blackfin.uclinux.org>
Signed-off-by: Bryan Wu <cooloney@kernel.org>

12 years ago[Blackfin] arch: fix bug - when we crash, current is not valid
Robin Getz [Wed, 26 Mar 2008 01:15:58 +0000]
[Blackfin] arch: fix bug - when we crash, current is not valid

Sometimes when we crash, current is not valid, (has been written
over), so the existing code causes a invalid read during exception
context - which is a unrecoverable double fault. This fixes this.

Signed-off-by: Robin Getz <rgetz@blackfin.uclinux.org>
Signed-off-by: Bryan Wu <cooloney@kernel.org>

12 years ago[Blackfin] arch: add i2c board info struct and move to new-style i2c interface
Bryan Wu [Wed, 26 Mar 2008 02:02:13 +0000]
[Blackfin] arch: add i2c board info struct and move to new-style i2c interface

Signed-off-by: Bryan Wu <cooloney@kernel.org>

12 years ago[Blackfin] arch: fix up gpio code style -- no functional changes
Mike Frysinger [Wed, 26 Mar 2008 00:35:46 +0000]
[Blackfin] arch: fix up gpio code style -- no functional changes

Signed-off-by: Mike Frysinger <vapier.adi@gmail.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>

12 years ago[Blackfin] arch: dump the stack before printing out an error otherwise the stack...
Mike Frysinger [Wed, 26 Mar 2008 00:34:23 +0000]
[Blackfin] arch: dump the stack before printing out an error otherwise the stack dump is useless as it shows us tracing through printk

Signed-off-by: Mike Frysinger <vapier.adi@gmail.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>

12 years ago[Blackfin] arch: conditionally enable flash resources since it requests the async...
Mike Frysinger [Wed, 26 Mar 2008 00:09:12 +0000]
[Blackfin] arch: conditionally enable flash resources since it requests the async memory bank

Signed-off-by: Mike Frysinger <vapier.adi@gmail.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>

12 years ago[Blackfin] arch: add code to initialize globals declared in linux/bootmem.h: max_pfn...
Yi Li [Tue, 25 Mar 2008 23:08:12 +0000]
[Blackfin] arch: add code to initialize globals declared in linux/bootmem.h: max_pfn, max_low_pfn, min_low_pfn.

Signed-off-by: Yi Li <yi.li@analog.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>

12 years ago[Blackfin] arch: remove NOTES from linker script
Bernd Schmidt [Tue, 25 Mar 2008 22:39:15 +0000]
[Blackfin] arch: remove NOTES from linker script

Since
  r3658 | vapier | 2007-09-12 16:26:11 +0200 (Wed, 12 Sep 2007) | 1 line

  add more common defines for output sections

we've had a new line, NOTES, in our linker script, which causes upstream
binutils to complain about "missing phdr".  Currently the only other arch
that uses NOTES is i386, and the patch which added it also added
PHDRS {
text PT_LOAD FLAGS(5); /* R_E */
data PT_LOAD FLAGS(7); /* RWE */
note PT_NOTE FLAGS(0); /* ___ */
}
and a few other modifications to use ":text" and ":data" to the linker
script.

It seems that we don't need NOTES at all, so just remove it.

Signed-off-by: Bernd Schmidt <bernds_cb1@t-online.de>
Signed-off-by: Bryan Wu <cooloney@kernel.org>

12 years ago[Blackfin] arch: add twi resources to CM_BF537 board as reported by Servaes Joordens
Mike Frysinger [Tue, 25 Mar 2008 22:00:18 +0000]
[Blackfin] arch: add twi resources to CM_BF537 board as reported by Servaes Joordens

Signed-off-by: Bryan Wu <cooloney@kernel.org>

12 years ago[Blackfin] arch: declare CHECKFLAGS to make sparse output more readable
Mike Frysinger [Thu, 6 Mar 2008 18:43:48 +0000]
[Blackfin] arch: declare CHECKFLAGS to make sparse output more readable

Signed-off-by: Mike Frysinger <vapier.adi@gmail.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>

12 years ago[Blackfin] arch: add missing __user marking to ss_sp member of signalstack and a...
Mike Frysinger [Thu, 6 Mar 2008 18:37:41 +0000]
[Blackfin] arch: add missing __user marking to ss_sp member of signalstack and a few userspace system functions

Signed-off-by: Mike Frysinger <vapier.adi@gmail.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>

12 years ago[Blackfin] arch: turn generic time on by default
Mike Frysinger [Fri, 29 Feb 2008 04:26:41 +0000]
[Blackfin] arch: turn generic time on by default

Signed-off-by: Mike Frysinger <vapier.adi@gmail.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>

12 years ago[Blackfin] arch: add board bluetechnix kernel defconfigs to kernel
Mike Frysinger [Fri, 29 Feb 2008 04:14:25 +0000]
[Blackfin] arch: add board bluetechnix kernel defconfigs to kernel

Signed-off-by: Mike Frysinger <vapier.adi@gmail.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>

12 years ago[Blackfin] arch: initial generic time and clock sources
Vitja Makarov [Fri, 29 Feb 2008 04:24:23 +0000]
[Blackfin] arch: initial generic time and clock sources

This patch enables Hight-Res Timers and tickless kernel

Signed-off-by: Vitja Makarov <vitja.makarov@gmail.com>
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>

12 years agoslab_err: Pass parameters correctly to slab_bug
Christoph Lameter [Wed, 23 Apr 2008 19:28:01 +0000]
slab_err: Pass parameters correctly to slab_bug

Signed-off-by: Christoph Lameter <clameter@sgi.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

12 years agoMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
Linus Torvalds [Wed, 23 Apr 2008 19:24:19 +0000]
Merge branch 'for-linus' of git://git./linux/kernel/git/viro/vfs-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
  [patch 7/7] vfs: mountinfo: show dominating group id
  [patch 6/7] vfs: mountinfo: add /proc/<pid>/mountinfo
  [patch 5/7] vfs: mountinfo: allow using process root
  [patch 4/7] vfs: mountinfo: add mount peer group ID
  [patch 3/7] vfs: mountinfo: add mount ID
  [patch 2/7] vfs: mountinfo: add seq_file_root()
  [patch 1/7] vfs: mountinfo: add dentry_path()
  [PATCH] remove unused label in xattr.c (noise from ro-bind)

12 years agoMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Linus Torvalds [Wed, 23 Apr 2008 19:23:45 +0000]
Merge git://git./linux/kernel/git/davem/net-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
  iwlwifi: Fix built-in compilation of iwlcore
  net: Unexport move_addr_to_{kernel,user}
  rt2x00: Select LEDS_CLASS.
  iwlwifi: Select LEDS_CLASS.
  leds: Do not guard NEW_LEDS with HAS_IOMEM
  [IPSEC]: Fix catch-22 with algorithm IDs above 31
  time: Export set_normalized_timespec.
  tcp: Make use of before macro in tcp_input.c
  hamradio: Remove unneeded and deprecated cli()/sti() calls in dmascc.c
  [NETNS]: Remove empty ->init callback.
  [DCCP]: Convert do_gettimeofday() to getnstimeofday().
  [NETNS]: Don't initialize err variable twice.
  [NETNS]: The ip6_fib_timer can work with garbage on net namespace stop.
  [IPV4]: Convert do_gettimeofday() to getnstimeofday().
  [IPV4]: Make icmp_sk_init() static.
  [IPV6]: Make struct ip6_prohibit_entry_template static.
  tcp: Trivial fix to correct function name in a comment in net/ipv4/tcp.c
  [NET]: Expose netdevice dev_id through sysfs
  skbuff: fix missing kernel-doc notation
  [ROSE]: Fix soft lockup wrt. rose_node_list_lock

12 years agopnpacpi: fix potential corruption on "pnpacpi: exceeded the max number of IRQ resourc...
Len Brown [Wed, 23 Apr 2008 04:09:13 +0000]
pnpacpi: fix potential corruption on "pnpacpi: exceeded the max number of IRQ resources 2"

PNP_MAX_IRQ is 2
If a device invokes pnpacpi_parse_allocated_irqresource() 0, 1, or 2 times, we are happy.
The 3rd time, we will fail and print "pnpacpi: exceeded the max number of IRQ resources: 2"
The 4th and subsequent calls (if this ever happened) would silently scribble on
irq_resource[2], which doesn't actualy exist.

Found-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

12 years agoiwlwifi: Fix built-in compilation of iwlcore
Tomas Winkler [Wed, 23 Apr 2008 10:48:57 +0000]
iwlwifi: Fix built-in compilation of iwlcore

This patch fixes problem in Makefile that prevented
built-in compilation of iwlcore

Commit that caused this problem: eadd3c4b ("iwlwifi: make Makefile
more concise")

Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Yi Zhu <yi.zhu@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

12 years agonet: Unexport move_addr_to_{kernel,user}
Adrian Bunk [Wed, 23 Apr 2008 10:37:49 +0000]
net: Unexport move_addr_to_{kernel,user}

After the removal of the Solaris binary emulation the exports of
move_addr_to_{kernel,user} are no longer used.

Signed-off-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

12 years agort2x00: Select LEDS_CLASS.
David S. Miller [Wed, 23 Apr 2008 10:34:50 +0000]
rt2x00: Select LEDS_CLASS.

Signed-off-by: David S. Miller <davem@davemloft.net>

12 years agoiwlwifi: Select LEDS_CLASS.
David S. Miller [Wed, 23 Apr 2008 10:34:31 +0000]
iwlwifi: Select LEDS_CLASS.

Signed-off-by: David S. Miller <davem@davemloft.net>

12 years agoleds: Do not guard NEW_LEDS with HAS_IOMEM
David S. Miller [Wed, 23 Apr 2008 10:33:32 +0000]
leds: Do not guard NEW_LEDS with HAS_IOMEM

The LEDS infrastructure itself does not require anything
that a platform dependant upon HAS_IOMEM.

The individual drivers do, but they are properly guarded
with the necessary platform dependencies.

One can even imagine a hypervisor based LED driver that
a platform without HAS_IOMEM might have.

Signed-off-by: David S. Miller <davem@davemloft.net>

12 years ago[patch 7/7] vfs: mountinfo: show dominating group id
Miklos Szeredi [Thu, 27 Mar 2008 12:06:26 +0000]
[patch 7/7] vfs: mountinfo: show dominating group id

Show peer group ID of nearest dominating group that has intersection
with the mount's namespace.

Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

12 years ago[patch 6/7] vfs: mountinfo: add /proc/<pid>/mountinfo
Ram Pai [Thu, 27 Mar 2008 12:06:25 +0000]
[patch 6/7] vfs: mountinfo: add /proc/<pid>/mountinfo

[mszeredi@suse.cz] rewrite and split big patch into managable chunks

/proc/mounts in its current form lacks important information:

 - propagation state
 - root of mount for bind mounts
 - the st_dev value used within the filesystem
 - identifier for each mount and it's parent

It also suffers from the following problems:

 - not easily extendable
 - ambiguity of mountpoints within a chrooted environment
 - doesn't distinguish between filesystem dependent and independent options
 - doesn't distinguish between per mount and per super block options

This patch introduces /proc/<pid>/mountinfo which attempts to address
all these deficiencies.

Code shared between /proc/<pid>/mounts and /proc/<pid>/mountinfo is
extracted into separate functions.

Thanks to Al Viro for the help in getting the design right.

Signed-off-by: Ram Pai <linuxram@us.ibm.com>
Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

12 years ago[patch 5/7] vfs: mountinfo: allow using process root
Miklos Szeredi [Thu, 27 Mar 2008 12:06:24 +0000]
[patch 5/7] vfs: mountinfo: allow using process root

Allow /proc/<pid>/mountinfo to use the root of <pid> to calculate
mountpoints.

 - move definition of 'struct proc_mounts' to <linux/mnt_namespace.h>
 - add the process's namespace and root to this structure
 - pass a pointer to 'struct proc_mounts' into seq_operations

In addition the following cleanups are made:

 - use a common open function for /proc/<pid>/{mounts,mountstat}
 - surround namespace.c part of these proc files with #ifdef CONFIG_PROC_FS
 - make the seq_operations structures const

Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

12 years ago[patch 4/7] vfs: mountinfo: add mount peer group ID
Miklos Szeredi [Thu, 27 Mar 2008 12:06:23 +0000]
[patch 4/7] vfs: mountinfo: add mount peer group ID

Add a unique ID to each peer group using the IDR infrastructure.  The
identifiers are reused after the peer group dissolves.

The IDR structures are protected by holding namepspace_sem for write
while allocating or deallocating IDs.

IDs are allocated when a previously unshared vfsmount becomes the
first member of a peer group.  When a new member is added to an
existing group, the ID is copied from one of the old members.

IDs are freed when the last member of a peer group is unshared.

Setting the MNT_SHARED flag on members of a subtree is done as a
separate step, after all the IDs have been allocated.  This way an
allocation failure can be cleaned up easilty, without affecting the
propagation state.

Based on design sketch by Al Viro.

Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

12 years ago[patch 3/7] vfs: mountinfo: add mount ID
Miklos Szeredi [Wed, 26 Mar 2008 21:11:34 +0000]
[patch 3/7] vfs: mountinfo: add mount ID

Add a unique ID to each vfsmount using the IDR infrastructure.  The
identifiers are reused after the vfsmount is freed.

Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

12 years ago[patch 2/7] vfs: mountinfo: add seq_file_root()
Miklos Szeredi [Thu, 27 Mar 2008 12:06:21 +0000]
[patch 2/7] vfs: mountinfo: add seq_file_root()

Add a new function:

  seq_file_root()

This is similar to seq_path(), but calculates the path relative to the
given root, instead of current->fs->root.  If the path was unreachable
from root, then modify the root parameter to reflect this.

Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

12 years ago[patch 1/7] vfs: mountinfo: add dentry_path()
Ram Pai [Thu, 27 Mar 2008 12:06:20 +0000]
[patch 1/7] vfs: mountinfo: add dentry_path()

[mszeredi@suse.cz] split big patch into managable chunks

Add the following functions:

  dentry_path()
  seq_dentry()

These are similar to d_path() and seq_path().  But instead of
calculating the path within a mount namespace, they calculate the path
from the root of the filesystem to a given dentry, ignoring mounts
completely.

Signed-off-by: Ram Pai <linuxram@us.ibm.com>
Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

12 years ago[PATCH] remove unused label in xattr.c (noise from ro-bind)
Al Viro [Wed, 23 Apr 2008 04:04:04 +0000]
[PATCH] remove unused label in xattr.c (noise from ro-bind)

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

12 years agoMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
Linus Torvalds [Wed, 23 Apr 2008 01:27:56 +0000]
Merge branch 'for-linus' of git://git./linux/kernel/git/viro/vfs-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
  [PATCH] get rid of __exit_files(), __exit_fs() and __put_fs_struct()
  [PATCH] proc_readfd_common() race fix
  [PATCH] double-free of inode on alloc_file() failure exit in create_write_pipe()
  [PATCH] teach seq_file to discard entries
  [PATCH] umount_tree() will unhash everything itself
  [PATCH] get rid of more nameidata passing in namespace.c
  [PATCH] switch a bunch of LSM hooks from nameidata to path
  [PATCH] lock exclusively in collect_mounts() and drop_collected_mounts()
  [PATCH] move a bunch of declarations to fs/internal.h

12 years agoFix cardbus resource allocation
Linus Torvalds [Wed, 23 Apr 2008 01:16:30 +0000]
Fix cardbus resource allocation

Commit 884525655d07fdee9245716b998ecdc45cdd8007 ("PCI: clean up resource
alignment management") didn't set the alignment information for the
cardbus window resources, causing their subsequent allocations to fail
miserably with a message like

  yenta_cardbus 0000:15:00.0: device not available because of BAR 7 [100:1ff] collisions
  yenta_cardbus: probe of 0000:15:00.0 failed with error -16

or similar.

This fixes it and clarifies the code a bit too (we used to have to use
the insane PCI bridge alignment logic that put the alignment in the
"start" field, this makes it use the slightly easier-to-understand
size-based alignment, and allows us to set the resource start to zero
until it gets allocated).

Reported-and-tested-by: Jeff Chua <jeff.chua.linux@gmail.com>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

12 years agobus_remove_device: be more careful about incomplete initialization
Rafael J. Wysocki [Tue, 22 Apr 2008 20:57:50 +0000]
bus_remove_device: be more careful about incomplete initialization

Prevent bus_remove_device() from crashing if dev->knode_bus has not been
initialized before it's called.

This can happen if the device_add() ended up breaking out early due to
an error, for example.

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

12 years agoRelax check on adding children of suspended devices
Rafael J. Wysocki [Tue, 22 Apr 2008 22:48:23 +0000]
Relax check on adding children of suspended devices

Do not refuse to actually register children of suspended devices,
but still warn about attempts to do that.

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

12 years ago[PATCH] get rid of __exit_files(), __exit_fs() and __put_fs_struct()
Al Viro [Tue, 22 Apr 2008 09:35:42 +0000]
[PATCH] get rid of __exit_files(), __exit_fs() and __put_fs_struct()

The only reason to have separated __...() for those was to keep them inlined
for local users in exit.c.  Since Alexey removed the inline on those, there's
no reason whatsoever to keep them around; just collapse with normal variants.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

12 years ago[PATCH] proc_readfd_common() race fix
Al Viro [Tue, 22 Apr 2008 05:32:44 +0000]
[PATCH] proc_readfd_common() race fix

Since we drop the rcu_read_lock inside the loop, we can't assume
that files->fdt will remain unchanged (and not freed) between
iterations.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

12 years ago[PATCH] double-free of inode on alloc_file() failure exit in create_write_pipe()
Al Viro [Tue, 22 Apr 2008 23:51:27 +0000]
[PATCH] double-free of inode on alloc_file() failure exit in create_write_pipe()

Duh...  Fortunately, the bug is quite recent (post-2.6.25) and, embarrassingly,
mine ;-/

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

12 years agoMerge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
Linus Torvalds [Tue, 22 Apr 2008 23:47:54 +0000]
Merge branch 'release' of git://git./linux/kernel/git/aegl/linux-2.6

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
  [IA64] run drivers/misc/sgi-xp through scripts/checkpatch.pl
  [IA64] run rest drivers/misc/sgi-xp through scripts/Lindent
  [IA64] run some drivers/misc/sgi-xp through scripts/Lindent
  [IA64] move XP and XPC to drivers/misc/sgi-xp
  [IA64] minor irq handler cleanups
  [IA64] simplify notify hooks in mca.c
  [IA64] do notify DIE_MCA_MONARCH_PROCESS for each monarchs
  [IA64] disable interrupts on exit of ia64_trace_syscall

12 years agofs: use loff_t type instead of long long
David Sterba [Tue, 22 Apr 2008 13:09:22 +0000]
fs: use loff_t type instead of long long

Use offset type consistently.

Signed-off-by: David Sterba <dsterba@suse.cz>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

12 years agoMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
Linus Torvalds [Tue, 22 Apr 2008 22:15:48 +0000]
Merge branch 'for-linus' of git://git./linux/kernel/git/jmorris/selinux-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6:
  SELinux fixups needed for preemptable RCU from -rt
  SELinux: no BUG_ON(!ss_initialized) in selinux_clone_mnt_opts

12 years ago[IA64] run drivers/misc/sgi-xp through scripts/checkpatch.pl
Dean Nelson [Tue, 22 Apr 2008 19:50:17 +0000]
[IA64] run drivers/misc/sgi-xp through scripts/checkpatch.pl

Addressed issues raised by scripts/checkpatch.pl. Removed unnecessary curly
braces. Eliminated uses of volatiles and use of kernel_thread() and daemonize().

Signed-off-by: Dean Nelson <dcn@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>

12 years ago[IA64] run rest drivers/misc/sgi-xp through scripts/Lindent
Dean Nelson [Tue, 22 Apr 2008 19:48:55 +0000]
[IA64] run rest drivers/misc/sgi-xp through scripts/Lindent

Ran patches through scripts/Lindent (part 2).

Signed-off-by: Dean Nelson <dcn@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>

12 years ago[IA64] run some drivers/misc/sgi-xp through scripts/Lindent
Dean Nelson [Tue, 22 Apr 2008 19:48:01 +0000]
[IA64] run some drivers/misc/sgi-xp through scripts/Lindent

Ran patches through scripts/Lindent (part 1).

Signed-off-by: Dean Nelson <dcn@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>

12 years ago[IA64] move XP and XPC to drivers/misc/sgi-xp
Dean Nelson [Tue, 22 Apr 2008 19:46:56 +0000]
[IA64] move XP and XPC to drivers/misc/sgi-xp

Move XPC and XPNET from arch/ia64/sn/kernel to drivers/misc/sgi-xp.

Signed-off-by: Dean Nelson <dcn@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>

12 years agoMerge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6
Linus Torvalds [Tue, 22 Apr 2008 20:59:30 +0000]
Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6

* 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
  i2c: Fix platform driver hotplug/coldplug
  i2c: New driver for the SuperH Mobile I2C bus controller
  i2c/scx200_acb: Don't use 0 as NULL pointer
  i2c-bfin-twi: Fix mismatch in add timer and delete timer
  i2c-bfin-twi: Just let i2c-bfin-twi driver depends on BLACKFIN
  i2c-bfin-twi: Use simpler comment headers and strip out information that is maintained in the scm's log
  i2c-bfin-twi: Cleanup driver descriptions, versions and some module useful information
  i2c-bfin-twi: Add missing pin mux operation
  i2c-bfin-twi: Add platform_resource interface to support multi-port TWI controllers
  i2c-bfin-twi: Add repeat start feature to avoid break of a bundle of i2c master xfer operation
  i2c: Remove trailing whitespaces in busses/Kconfig
  i2c: Replace remaining __FUNCTION__ occurrences
  i2c: Renesas SH7760 I2C master driver
  i2c-dev: Split i2cdev_ioctl
  i2c-ibm_iic: Support building as an of_platform driver
  i2c-ibm_iic: Change the log levels
  i2c: Add platform driver on top of the new pca-algorithm
  i2c-algo-pca: Extend for future drivers
  i2c-algo-pca: Remove trailing whitespaces and unnecessary UTF
  i2c: Remove the algorithm drivers from the config menu

12 years agokernel-doc: fix sched.c missing parameter
Randy Dunlap [Tue, 22 Apr 2008 17:07:22 +0000]
kernel-doc: fix sched.c missing parameter

Add missing kernel-doc in kernel/sched.c:

Warning(linux-2.6.25-git3//kernel/sched.c:7044): No description found for parameter 'span'

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

12 years agoMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm
Linus Torvalds [Tue, 22 Apr 2008 20:44:23 +0000]
Merge branch 'for-linus' of git://git./linux/kernel/git/teigland/dlm

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm:
  dlm: linux/{dlm,dlm_device}.h: cleanup for userspace
  dlm: common max length definitions
  dlm: move plock code from gfs2
  dlm: recover nodes that are removed and re-added
  dlm: save master info after failed no-queue request
  dlm: make dlm_print_rsb() static
  dlm: match signedness between dlm_config_info and cluster_set

12 years agoMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
Linus Torvalds [Tue, 22 Apr 2008 20:43:46 +0000]
Merge branch 'for-linus' of git://git./linux/kernel/git/jikos/hid

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
  HID: Suppress hidinput for Samsung IR control
  HID: remove 60x GTCO devices from blacklist
  HID: export headers properly
  HID: WiseGroup 866 Dual Joypad needs output reports quirk
  HID: ThrustMaster FF driver is no longer experimental
  HID: Logitech diNovo Mini pad support
  HID: fix race between open() and disconnect() in usbhid
  HID: make hid_input_field and usbhid_modify_dquirk static
  HID: pass numbered reports properly to hidraw
  HID: fix misplaced rdesc quirk
  HID: force feedback driver for Logitech Rumblepad 2
  HID: move wait from hid to usbhid
  HID: make function from dbg_hid
  HID: fix sparse warnings
  HID: only dump report traffic with debug level 2
  HID: patch to add NOGET for DMI/Acomdata
  HID: Sunplus Wireless Desktop needs report descriptor fixup
  HID: quirk for MS Wireless Desktop Receiver (model 1028)
  HID: fixup fullspeed interval on highspeed Afatech DVB-T IR kbd
  HID: fix build failure in hiddev_ioctl with gcc 3.2

12 years agoMerge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux...
Linus Torvalds [Tue, 22 Apr 2008 20:40:47 +0000]
Merge branch 'for_linus' of git://git./linux/kernel/git/jack/linux-udf-2.6

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6: (41 commits)
  udf: use crc_itu_t from lib instead of udf_crc
  udf: Fix compilation warnings when UDF debug is on
  udf: Fix bug in VAT mapping code
  udf: Add read-only support for 2.50 UDF media
  udf: Fix handling of multisession media
  udf: Mount filesystem read-only if it has pseudooverwrite partition
  udf: Handle VAT packed inside inode properly
  udf: Allow loading of VAT inode
  udf: Fix detection of VAT version
  udf: Silence warning about accesses beyond end of device
  udf: Improve anchor block detection
  udf: Cleanup anchor block detection.
  udf: Move processing of virtual partitions
  udf: Move filling of partition descriptor info into a separate function
  udf: Improve error recovery on mount
  udf: Cleanup volume descriptor sequence processing
  udf: fix anchor point detection
  udf: Remove declarations of arrays of size UDF_NAME_LEN (256 bytes)
  udf: Remove checking of existence of filename in udf_add_entry()
  udf: Mark udf_process_sequence() as noinline
  ...

12 years agofix brd allocation flags
Petr Tesarik [Tue, 22 Apr 2008 03:36:52 +0000]
fix brd allocation flags

While looking at the implementation of the Ram backed block device
driver, I stumbled across a write-only local variable, which makes
little sense, so I assume it should actually work like this:

Signed-off-by: Petr Tesarik <ptesarik@suse.cz>
Signed-off-by: Nick Piggin <npiggin@suse.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

12 years agoi2c: Fix platform driver hotplug/coldplug
Kay Sievers [Tue, 22 Apr 2008 20:16:49 +0000]
i2c: Fix platform driver hotplug/coldplug

Since 43cc71eed1250755986da4c0f9898f9a635cb3bf, the platform
modalias is prefixed with "platform:". Add MODULE_ALIAS() to the
hotpluggable I2C platform drivers, to allow module auto loading.

[ db: add some more drivers ]

Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Jean Delvare <khali@linux-fr.org>

12 years agoi2c: New driver for the SuperH Mobile I2C bus controller
Magnus Damm [Tue, 22 Apr 2008 20:16:49 +0000]
i2c: New driver for the SuperH Mobile I2C bus controller

This is V5 of the SuperH Mobile I2C Controller Driver. A simple Master
only driver for the I2C block included in processors such as sh7343,
sh7722 and sh7723. Tested on a sh7722 MigoR using a rs5c732b rtc.

Signed-off-by: Magnus Damm <damm@igel.co.jp>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Signed-off-by: Jean Delvare <khali@linux-fr.org>

12 years agoi2c/scx200_acb: Don't use 0 as NULL pointer
Adrian Bunk [Tue, 22 Apr 2008 20:16:48 +0000]
i2c/scx200_acb: Don't use 0 as NULL pointer

Don't use 0 as NULL pointer.

Spotted by sparse.

Signed-off-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: Jean Delvare <khali@linux-fr.org>

12 years agoi2c-bfin-twi: Fix mismatch in add timer and delete timer
Hans Schillstrom [Tue, 22 Apr 2008 20:16:48 +0000]
i2c-bfin-twi: Fix mismatch in add timer and delete timer

Move init_completion to just before i2c transfer.
http://blackfin.uclinux.org/gf/project/uclinux-dist/tracker/?action=TrackerItemEdit&tracker_item_id=3385

Signed-off-by: Hans Schillstrom <hans.schillstrom@shlsys.com>
Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>
Signed-off-by: Jean Delvare <khali@linux-fr.org>

12 years agoi2c-bfin-twi: Just let i2c-bfin-twi driver depends on BLACKFIN
Bryan Wu [Tue, 22 Apr 2008 20:16:48 +0000]
i2c-bfin-twi: Just let i2c-bfin-twi driver depends on BLACKFIN

Simply use "depends on BLACKFIN" (which is technically correct) and just
document which machines have the device.

Signed-off-by: Bryan Wu <cooloney@kernel.org>
Signed-off-by: Jean Delvare <khali@linux-fr.org>

12 years agoi2c-bfin-twi: Use simpler comment headers and strip out information that is maintaine...
Mike Frysinger [Tue, 22 Apr 2008 20:16:48 +0000]
i2c-bfin-twi: Use simpler comment headers and strip out information that is maintained in the scm's log

Signed-off-by: Mike Frysinger <vapier.adi@gmail.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>
Signed-off-by: Jean Delvare <khali@linux-fr.org>

12 years agoi2c-bfin-twi: Cleanup driver descriptions, versions and some module useful information
Bryan Wu [Tue, 22 Apr 2008 20:16:48 +0000]
i2c-bfin-twi: Cleanup driver descriptions, versions and some module useful information

Signed-off-by: Bryan Wu <cooloney@kernel.org>
Signed-off-by: Jean Delvare <khali@linux-fr.org>

12 years agoi2c-bfin-twi: Add missing pin mux operation
Bryan Wu [Tue, 22 Apr 2008 20:16:48 +0000]
i2c-bfin-twi: Add missing pin mux operation

Blackfin TWI controller hardware pin should be requested from GPIO port controller
Before BF54x, there is no need to do this. But as long as BF54x and BF52x
are supported by this generic driver, the missing pin mux operation should be
added.

Signed-off-by: Bryan Wu <cooloney@kernel.org>
Signed-off-by: Jean Delvare <khali@linux-fr.org>

12 years agoi2c-bfin-twi: Add platform_resource interface to support multi-port TWI controllers
Bryan Wu [Tue, 22 Apr 2008 20:16:48 +0000]
i2c-bfin-twi: Add platform_resource interface to support multi-port TWI controllers

 - Dynamic alloc the resource of TWI driver data according to board information
 - TWI register read/write accessor based on dynamic regs_base
 - Support TWI0/TWI1 for BF54x

Signed-off-by: Bryan Wu <cooloney@kernel.org>
Signed-off-by: Jean Delvare <khali@linux-fr.org>

12 years agoi2c-bfin-twi: Add repeat start feature to avoid break of a bundle of i2c master xfer...
Sonic Zhang [Tue, 22 Apr 2008 20:16:47 +0000]
i2c-bfin-twi: Add repeat start feature to avoid break of a bundle of i2c master xfer operation

 - Create a new mode TWI_I2C_MODE_REPEAT.
 - No change to smbus operation.

Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>
Signed-off-by: Jean Delvare <khali@linux-fr.org>

12 years agoi2c: Remove trailing whitespaces in busses/Kconfig
Wolfram Sang [Tue, 22 Apr 2008 20:16:47 +0000]
i2c: Remove trailing whitespaces in busses/Kconfig

Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Signed-off-by: Jean Delvare <khali@linux-fr.org>

12 years agoi2c: Replace remaining __FUNCTION__ occurrences
Harvey Harrison [Tue, 22 Apr 2008 20:16:47 +0000]
i2c: Replace remaining __FUNCTION__ occurrences

__FUNCTION__ is gcc-specific, use __func__.

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Jean Delvare <khali@linux-fr.org>