]> Git Repo - linux.git/log
linux.git
13 years agoARM: 6932/1: SPEAr3xx: Replace defconfigs with single unified defconfig
Ryan Mallon [Fri, 20 May 2011 07:34:25 +0000 (08:34 +0100)]
ARM: 6932/1: SPEAr3xx: Replace defconfigs with single unified defconfig

We only need one defconfig for SPEAr3xx now since we can build all
three boards into one kernel.

Reviewed-by: Stanley Miao <[email protected]>
Signed-off-by: Ryan Mallon <[email protected]>
Signed-off-by: Viresh Kumar <[email protected]>
Signed-off-by: Russell King <[email protected]>
13 years agoARM: 6931/1: SPEAr3xx: Rework KConfig to allow all boards to be compiled in
Ryan Mallon [Fri, 20 May 2011 07:34:24 +0000 (08:34 +0100)]
ARM: 6931/1: SPEAr3xx: Rework KConfig to allow all boards to be compiled in

Now that all three SPEAr3xx platforms can be built into one kernel,
rework KConfig to allow this. Move everything into one KConfig file
while we are here.

Reviewed-by: Stanley Miao <[email protected]>
Signed-off-by: Ryan Mallon <[email protected]>
Signed-off-by: Viresh Kumar <[email protected]>
Signed-off-by: Russell King <[email protected]>
13 years agoARM: 6929/1: SPEAr3xx: Append spear3** with global device structures
viresh kumar [Fri, 20 May 2011 07:34:23 +0000 (08:34 +0100)]
ARM: 6929/1: SPEAr3xx: Append spear3** with global device structures

Reviewed-by: Stanley Miao <[email protected]>
Signed-off-by: Viresh Kumar <[email protected]>
Signed-off-by: Russell King <[email protected]>
13 years agoARM: 6930/1: SPEAr3xx: Rework pmx_dev code to remove conflicts
Ryan Mallon [Fri, 20 May 2011 07:34:22 +0000 (08:34 +0100)]
ARM: 6930/1: SPEAr3xx: Rework pmx_dev code to remove conflicts

Prefix the pmx_devs to remove naming conflicts between the three
SPEAr3xx platforms. Also make pmx_driver static to each platform and
rework the init code to pass the devices rather than export the
pmx_driver structure.

Reviewed-by: Stanley Miao <[email protected]>
Signed-off-by: Ryan Mallon <[email protected]>
Signed-off-by: Viresh Kumar <[email protected]>
Signed-off-by: Russell King <[email protected]>
13 years agoARM: 6935/1: SPEAR3xx: Rename register/irq defines to remove naming conflicts
Ryan Mallon [Fri, 20 May 2011 07:34:21 +0000 (08:34 +0100)]
ARM: 6935/1: SPEAR3xx: Rename register/irq defines to remove naming conflicts

Prefix register and irq defintions to remove naming conflicts between
the three SPEAr3xx platforms.

Reviewed-by: Stanley Miao <[email protected]>
Signed-off-by: Ryan Mallon <[email protected]>
Signed-off-by: Viresh Kumar <[email protected]>
Signed-off-by: Russell King <[email protected]>
13 years agoARM: 6928/1: SPEAr3xx: Make local shirq structures static
Ryan Mallon [Fri, 20 May 2011 07:34:20 +0000 (08:34 +0100)]
ARM: 6928/1: SPEAr3xx: Make local shirq structures static

Several structures in arch/arm/mach-spear3xx are not marked static
like they should be. Fix this.

Reviewed-by: Stanley Miao <[email protected]>
Signed-off-by: Ryan Mallon <[email protected]>
Signed-off-by: Viresh Kumar <[email protected]>
Signed-off-by: Russell King <[email protected]>
13 years agoARM: 6927/1: SPEAr Clock: Update for single image solution
viresh kumar [Fri, 20 May 2011 07:34:19 +0000 (08:34 +0100)]
ARM: 6927/1: SPEAr Clock: Update for single image solution

This patch creates different clk_lookup arrays for individual machines.
These lookup arrays will be registered only if that specific machine is
current machine.

Reviewed-by: Stanley Miao <[email protected]>
Signed-off-by: Viresh Kumar <[email protected]>
Signed-off-by: Russell King <[email protected]>
13 years agoARM: 6926/1: SPEAr clock: Define common clk_init routine in plat/clock.c
viresh kumar [Fri, 20 May 2011 07:34:18 +0000 (08:34 +0100)]
ARM: 6926/1: SPEAr clock: Define common clk_init routine in plat/clock.c

Define common clk_init routine in plat/clock.c for calling recalc_root_clocks.
This routine will be used for any common code across all machine families.
Whereas family specific spear*xx_clk_init routines will be used for family
specific code.

Signed-off-by: Viresh Kumar <[email protected]>
Signed-off-by: Russell King <[email protected]>
13 years agoMerge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...
Linus Torvalds [Fri, 20 May 2011 21:31:27 +0000 (14:31 -0700)]
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  libata: Power off empty ports
  libata-pmp: add support for Thermaltake BlackX Duet esata drive dock
  ATA: Don't powerdown Compaq Triflex IDE device on suspend
  libata: Use Maximum Write Same Length to report discard size limit
  drivers/ata/acard-ahci.c: fix enum warning
  pata_at91: SMC settings calculation bugfixes, support for t6z and IORDY
  libata-sff: prevent irq descriptions for dummy ports
  pata_cm64x: fix boot crash on parisc

13 years agoARM: 6910/1: MTD: physmap: let set_vpp() pass a platform_device instead of a map_info
Marc Zyngier [Wed, 18 May 2011 09:51:55 +0000 (10:51 +0100)]
ARM: 6910/1: MTD: physmap: let set_vpp() pass a platform_device instead of a map_info

The set_vpp() method provided by physmap passes a map_info back to
the platform code, which has little relevance as far as the platform
is concerned (this parameter is completely unused).

Instead, pass the platform_device, which can be used in the pismo
driver to retrieve some important information in a nicer way, instead
of the hack that was in place.

The empty set_vpp function in board-at572d940hf_ek.c is left untouched,
as the board/SoC is scheduled for removal.

Cc: Andrew Victor <[email protected]>
Cc: Nicolas Ferre <[email protected]>
Acked-by: Jean-Christophe PLAGNIOL-VILLARD <[email protected]>
Cc: Philipp Zabel <[email protected]>
Cc: Eric Miao <[email protected]>
Cc: Ben Dooks <[email protected]>
Acked-by: Artem Bityutskiy <[email protected]>
Acked-by: David Woodhouse <[email protected]>
Signed-off-by: Marc Zyngier <[email protected]>
Signed-off-by: Russell King <[email protected]>
13 years agoARM: 6906/1: MTD: Remove integrator-flash
Marc Zyngier [Wed, 18 May 2011 09:51:54 +0000 (10:51 +0100)]
ARM: 6906/1: MTD: Remove integrator-flash

As there is now no in-tree user of integrator-flash, remove
it completely.

Signed-off-by: Marc Zyngier <[email protected]>
Acked-by: Catalin Marinas <[email protected]>
Acked-by: Artem Bityutskiy <[email protected]>
Acked-by: David Woodhouse <[email protected]>
Signed-off-by: Russell King <[email protected]>
13 years agoARM: 6905/1: Integrator/CP: Use physmap driver instead of integrator-flash
Marc Zyngier [Wed, 18 May 2011 09:51:53 +0000 (10:51 +0100)]
ARM: 6905/1: Integrator/CP: Use physmap driver instead of integrator-flash

Tested with an ARM-1136 core tile.

Signed-off-by: Marc Zyngier <[email protected]>
Acked-by: Catalin Marinas <[email protected]>
Acked-by: David Woodhouse <[email protected]>
Signed-off-by: Russell King <[email protected]>
13 years agoARM: 6908/1: Integrator/AP: Use physmap driver instead of integrator-flash
Marc Zyngier [Wed, 18 May 2011 09:51:52 +0000 (10:51 +0100)]
ARM: 6908/1: Integrator/AP: Use physmap driver instead of integrator-flash

Signed-off-by: Marc Zyngier <[email protected]>
Acked-by: Catalin Marinas <[email protected]>
Acked-by: David Woodhouse <[email protected]>
Signed-off-by: Russell King <[email protected]>
13 years agoARM: 6909/1: VExpress: Use physmap driver instead of integrator-flash
Marc Zyngier [Wed, 18 May 2011 09:51:51 +0000 (10:51 +0100)]
ARM: 6909/1: VExpress: Use physmap driver instead of integrator-flash

Signed-off-by: Marc Zyngier <[email protected]>
Acked-by: Catalin Marinas <[email protected]>
Acked-by: David Woodhouse <[email protected]>
Signed-off-by: Russell King <[email protected]>
13 years agoARM: 6907/1: Versatile: Use physmap driver instead of integrator-flash
Marc Zyngier [Wed, 18 May 2011 09:51:50 +0000 (10:51 +0100)]
ARM: 6907/1: Versatile: Use physmap driver instead of integrator-flash

Signed-off-by: Marc Zyngier <[email protected]>
Acked-by: Catalin Marinas <[email protected]>
Acked-by: David Woodhouse <[email protected]>
Signed-off-by: Russell King <[email protected]>
13 years agoARM: 6903/1: Realview: Use physmap driver instead of integrator-flash
Marc Zyngier [Wed, 18 May 2011 09:51:49 +0000 (10:51 +0100)]
ARM: 6903/1: Realview: Use physmap driver instead of integrator-flash

Tested on a PB11-MPCore.

Signed-off-by: Marc Zyngier <[email protected]>
Acked-by: Catalin Marinas <[email protected]>
Acked-by: David Woodhouse <[email protected]>
Signed-off-by: Russell King <[email protected]>
13 years agoARM: 6904/1: MTD: Add integrator-flash feature to physmap
Marc Zyngier [Wed, 18 May 2011 09:51:48 +0000 (10:51 +0100)]
ARM: 6904/1: MTD: Add integrator-flash feature to physmap

In the process of moving platforms away from integrator-flash
(aka armflash), add to physmap the few features that make
armflash unique:

- optionnal probing for the AFS partition type
- init() and exit() methods, used by Integrator to control
  write access to the various onboard programmable components

Signed-off-by: Marc Zyngier <[email protected]>
Acked-by: Catalin Marinas <[email protected]>
Acked-by: Artem Bityutskiy <[email protected]>
Acked-by: David Woodhouse <[email protected]>
Signed-off-by: Russell King <[email protected]>
13 years agoipc: Add missing sys_ni entries for ipc/compat.c functions
Kevin Cernekee [Tue, 17 May 2011 17:39:58 +0000 (10:39 -0700)]
ipc: Add missing sys_ni entries for ipc/compat.c functions

When building with:

  CONFIG_64BIT=y
  CONFIG_MIPS32_COMPAT=y
  CONFIG_COMPAT=y
  CONFIG_MIPS32_O32=y
  CONFIG_MIPS32_N32=y
  CONFIG_SYSVIPC is not set
  (and implicitly: CONFIG_SYSVIPC_COMPAT is not set)

the final link fails with unresolved symbols for:

  compat_sys_semctl, compat_sys_msgsnd, compat_sys_msgrcv,
  compat_sys_shmctl, compat_sys_msgctl, compat_sys_semtimedop

The fix is to add cond_syscall declarations for all syscalls in
ipc/compat.c

Signed-off-by: Kevin Cernekee <[email protected]>
Acked-by: Ralf Baechle <[email protected]>
Acked-by: Arnd Bergmann <[email protected]>
Cc: Andrew Morton <[email protected]>
Cc: Al Viro <[email protected]>
Cc: Stephen Rothwell <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
13 years agoMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
Linus Torvalds [Fri, 20 May 2011 20:43:21 +0000 (13:43 -0700)]
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1446 commits)
  macvlan: fix panic if lowerdev in a bond
  tg3: Add braces around 5906 workaround.
  tg3: Fix NETIF_F_LOOPBACK error
  macvlan: remove one synchronize_rcu() call
  networking: NET_CLS_ROUTE4 depends on INET
  irda: Fix error propagation in ircomm_lmp_connect_response()
  irda: Kill set but unused variable 'bytes' in irlan_check_command_param()
  irda: Kill set but unused variable 'clen' in ircomm_connect_indication()
  rxrpc: Fix set but unused variable 'usage' in rxrpc_get_transport()
  be2net: Kill set but unused variable 'req' in lancer_fw_download()
  irda: Kill set but unused vars 'saddr' and 'daddr' in irlan_provider_connect_indication()
  atl1c: atl1c_resume() is only used when CONFIG_PM_SLEEP is defined.
  rxrpc: Fix set but unused variable 'usage' in rxrpc_get_peer().
  rxrpc: Kill set but unused variable 'local' in rxrpc_UDP_error_handler()
  rxrpc: Kill set but unused variable 'sp' in rxrpc_process_connection()
  rxrpc: Kill set but unused variable 'sp' in rxrpc_rotate_tx_window()
  pkt_sched: Kill set but unused variable 'protocol' in tc_classify()
  isdn: capi: Use pr_debug() instead of ifdefs.
  tg3: Update version to 3.119
  tg3: Apply rx_discards fix to 5719/5720
  ...

Fix up trivial conflicts in arch/x86/Kconfig and net/mac80211/agg-tx.c
as per Davem.

13 years agoMerge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
Linus Torvalds [Fri, 20 May 2011 20:39:00 +0000 (13:39 -0700)]
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
  [IA64] define "_sdata" symbol
  pstore: Fix Kconfig dependencies for apei->pstore
  pstore: fix potential logic issue in pstore read interface
  pstore: fix pstore filesystem mount/remount issue
  pstore: fix one type of return value in pstore
  [IA64] fix build warning in arch/ia64/oprofile/backtrace.c

13 years agoMerge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
Linus Torvalds [Fri, 20 May 2011 20:38:28 +0000 (13:38 -0700)]
Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  MAINTAINERS: Add drivers/clocksource to TIMEKEEPING
  clockevents/source: Use u64 to make 32bit happy

13 years agoMerge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
Linus Torvalds [Fri, 20 May 2011 20:37:49 +0000 (13:37 -0700)]
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6: (32 commits)
  [CIFS] Fix to problem with getattr caused by invalidate simplification patch
  [CIFS] Remove sparse warning
  [CIFS] Update cifs to version 1.72
  cifs: Change key name to cifs.idmap, misc. clean-up
  cifs: Unconditionally copy mount options to superblock info
  cifs: Use kstrndup for cifs_sb->mountdata
  cifs: Simplify handling of submount options in cifs_mount.
  cifs: cifs_parse_mount_options: do not tokenize mount options in-place
  cifs: Add support for mounting Windows 2008 DFS shares
  cifs: Extract DFS referral expansion logic to separate function
  cifs: turn BCC into a static inlined function
  cifs: keep BCC in little-endian format
  cifs: fix some unused variable warnings in id_rb_search
  CIFS: Simplify invalidate part (try #5)
  CIFS: directio read/write cleanups
  consistently use smb_buf_length as be32 for cifs (try 3)
  cifs: Invoke id mapping functions (try #17 repost)
  cifs: Add idmap key and related data structures and functions (try #17 repost)
  CIFS: Add launder_page operation (try #3)
  Introduce smb2 mounts as vers=2
  ...

13 years agoMerge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
Linus Torvalds [Fri, 20 May 2011 20:37:22 +0000 (13:37 -0700)]
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  extable, core_kernel_data(): Make sure all archs define _sdata
  core_kernel_data(): Fix architectures that do not define _sdata

13 years agoMerge branch 'ptrace' of git://git.kernel.org/pub/scm/linux/kernel/git/oleg/misc
Linus Torvalds [Fri, 20 May 2011 20:33:21 +0000 (13:33 -0700)]
Merge branch 'ptrace' of git://git.kernel.org/pub/scm/linux/kernel/git/oleg/misc

* 'ptrace' of git://git.kernel.org/pub/scm/linux/kernel/git/oleg/misc: (41 commits)
  signal: trivial, fix the "timespec declared inside parameter list" warning
  job control: reorganize wait_task_stopped()
  ptrace: fix signal->wait_chldexit usage in task_clear_group_stop_trapping()
  signal: sys_sigprocmask() needs retarget_shared_pending()
  signal: cleanup sys_sigprocmask()
  signal: rename signandsets() to sigandnsets()
  signal: do_sigtimedwait() needs retarget_shared_pending()
  signal: introduce do_sigtimedwait() to factor out compat/native code
  signal: sys_rt_sigtimedwait: simplify the timeout logic
  signal: cleanup sys_rt_sigprocmask()
  x86: signal: sys_rt_sigreturn() should use set_current_blocked()
  x86: signal: handle_signal() should use set_current_blocked()
  signal: sigprocmask() should do retarget_shared_pending()
  signal: sigprocmask: narrow the scope of ->siglock
  signal: retarget_shared_pending: optimize while_each_thread() loop
  signal: retarget_shared_pending: consider shared/unblocked signals only
  signal: introduce retarget_shared_pending()
  ptrace: ptrace_check_attach() should not do s/STOPPED/TRACED/
  signal: Turn SIGNAL_STOP_DEQUEUED into GROUP_STOP_DEQUEUED
  signal: do_signal_stop: Remove the unneeded task_clear_group_stop_pending()
  ...

13 years agoMerge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
Linus Torvalds [Fri, 20 May 2011 20:29:52 +0000 (13:29 -0700)]
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (110 commits)
  [SCSI] qla2xxx: Refactor call to qla2xxx_read_sfp for thermal temperature.
  [SCSI] qla2xxx: Unify the read/write sfp mailbox command routines.
  [SCSI] qla2xxx: Clear complete initialization control block.
  [SCSI] qla2xxx: Allow an override of the registered maximum LUN.
  [SCSI] qla2xxx: Add host number in reset and quiescent message logs.
  [SCSI] qla2xxx: Correctly read sfp single byte mailbox register.
  [SCSI] qla2xxx: Add qla82xx_rom_unlock() function.
  [SCSI] qla2xxx: Log if qla82xx firmware fails to load from flash.
  [SCSI] qla2xxx: Use passed in host to initialize local scsi_qla_host in queuecommand function
  [SCSI] qla2xxx: Correct buffer start in edc sysfs debug print.
  [SCSI] qla2xxx: Update firmware version after flash update for ISP82xx.
  [SCSI] qla2xxx: Fix hang during driver unload when vport is active.
  [SCSI] qla2xxx: Properly set the dsd_list_len for dsd_chaining in cmd type 6.
  [SCSI] qla2xxx: Fix virtual port failing to login after chip reset.
  [SCSI] qla2xxx: Fix vport delete hang when logins are outstanding.
  [SCSI] hpsa: Change memset using sizeof(ptr) to sizeof(*ptr)
  [SCSI] ipr: Rate limit DMA mapping errors
  [SCSI] hpsa: add P2000 to list of shared SAS devices
  [SCSI] hpsa: do not attempt PCI power management reset method if we know it won't work.
  [SCSI] hpsa: remove superfluous sleeps around reset code
  ...

13 years agoMerge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw
Linus Torvalds [Fri, 20 May 2011 20:28:45 +0000 (13:28 -0700)]
Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw

* git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw: (32 commits)
  GFS2: Move all locking inside the inode creation function
  GFS2: Clean up symlink creation
  GFS2: Clean up mkdir
  GFS2: Use UUID field in generic superblock
  GFS2: Rename ops_inode.c to inode.c
  GFS2: Inode.c is empty now, remove it
  GFS2: Move final part of inode.c into super.c
  GFS2: Move most of the remaining inode.c into ops_inode.c
  GFS2: Move gfs2_refresh_inode() and friends into glops.c
  GFS2: Remove gfs2_dinode_print() function
  GFS2: When adding a new dir entry, inc link count if it is a subdir
  GFS2: Make gfs2_dir_del update link count when required
  GFS2: Don't use gfs2_change_nlink in link syscall
  GFS2: Don't use a try lock when promoting to a higher mode
  GFS2: Double check link count under glock
  GFS2: Improve bug trap code in ->releasepage()
  GFS2: Fix ail list traversal
  GFS2: make sure fallocate bytes is a multiple of blksize
  GFS2: Add an AIL writeback tracepoint
  GFS2: Make writeback more responsive to system conditions
  ...

13 years agoMerge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
Linus Torvalds [Fri, 20 May 2011 20:28:01 +0000 (13:28 -0700)]
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (152 commits)
  powerpc: Fix hard CPU IDs detection
  powerpc/pmac: Update via-pmu to new syscore_ops
  powerpc/kvm: Fix the build for 32-bit Book 3S (classic) processors
  powerpc/kvm: Fix kvmppc_core_pending_dec
  powerpc: Remove last piece of GEMINI
  powerpc: Fix for Pegasos keyboard and mouse
  powerpc: Make early memory scan more resilient to out of order nodes
  powerpc/pseries/iommu: Cleanup ddw naming
  powerpc/pseries/iommu: Find windows after kexec during boot
  powerpc/pseries/iommu: Remove ddw property when destroying window
  powerpc/pseries/iommu: Add additional checks when changing iommu mask
  powerpc/pseries/iommu: Use correct return type in dupe_ddw_if_already_created
  powerpc: Remove unused/obsolete CONFIG_XICS
  misc: Add CARMA DATA-FPGA Programmer support
  misc: Add CARMA DATA-FPGA Access Driver
  powerpc: Make IRQ_NOREQUEST last to clear, first to set
  powerpc: Integrated Flash controller device tree bindings
  powerpc/85xx: Create dts of each core in CAMP mode for P1020RDB
  powerpc/85xx: Fix PCIe IDSEL for Px020RDB
  powerpc/85xx: P2020 DTS: re-organize dts files
  ...

13 years agoSCHED_TTWU_QUEUE is not longer needed since sparc32 now implements IPI
Daniel Hellstrom [Fri, 20 May 2011 04:01:10 +0000 (04:01 +0000)]
SCHED_TTWU_QUEUE is not longer needed since sparc32 now implements IPI

Signed-off-by: Daniel Hellstrom <[email protected]>
Reported-by: Peter Zijlstra <[email protected]>
Acked-by: Peter Zijlstra <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
13 years agoMerge commit '317f394160e9beb97d19a84c39b7e5eb3d7815a8'
David S. Miller [Fri, 20 May 2011 20:10:22 +0000 (13:10 -0700)]
Merge commit '317f394160e9beb97d19a84c39b7e5eb3d7815a8'

Conflicts:
arch/sparc/kernel/smp_32.c

With merge conflict help from Daniel Hellstrom.

Signed-off-by: David S. Miller <[email protected]>
13 years agoMerge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
David S. Miller [Fri, 20 May 2011 19:59:54 +0000 (12:59 -0700)]
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

13 years agospinlock_up.h: include asm/processor.h in for cpu_relax
Stephen Rothwell [Fri, 20 May 2011 05:48:17 +0000 (15:48 +1000)]
spinlock_up.h: include asm/processor.h in for cpu_relax

Commit e66eed651fd1 ("list: remove prefetching from regular list
iterators") removed the include of prefetch.h from list.h and this was a
path to including asm/processor.h.  We need to include it excplicitly
now.

Fixes this build error on sparc32 (at least):

  In file included from include/linux/seqlock.h:29,
                   from include/linux/time.h:8,
                   from include/linux/timex.h:56,
                   from include/linux/sched.h:57,
                   from arch/sparc/kernel/asm-offsets.c:13:
  include/linux/spinlock.h: In function 'spin_unlock_wait':
  include/linux/spinlock.h:360: error: implicit declaration of function 'cpu_relax

Signed-off-by: Stephen Rothwell <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
13 years agosanitize <linux/prefetch.h> usage
Linus Torvalds [Fri, 20 May 2011 19:50:29 +0000 (12:50 -0700)]
sanitize <linux/prefetch.h> usage

Commit e66eed651fd1 ("list: remove prefetching from regular list
iterators") removed the include of prefetch.h from list.h, which
uncovered several cases that had apparently relied on that rather
obscure header file dependency.

So this fixes things up a bit, using

   grep -L linux/prefetch.h $(git grep -l '[^a-z_]prefetchw*(' -- '*.[ch]')
   grep -L 'prefetchw*(' $(git grep -l 'linux/prefetch.h' -- '*.[ch]')

to guide us in finding files that either need <linux/prefetch.h>
inclusion, or have it despite not needing it.

There are more of them around (mostly network drivers), but this gets
many core ones.

Reported-by: Stephen Rothwell <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
13 years agoktest: Allow options to be used by other options
Steven Rostedt [Fri, 20 May 2011 19:48:59 +0000 (15:48 -0400)]
ktest: Allow options to be used by other options

There are cases where one ktest option may be used within another
ktest option. Allow them to be reused just like config variables
but there are evaluated at time of test not config processing time.

Thus having something like:

MAKE_CMD = make ARCH=${ARCH}

TEST_START
ARCH = powerpc

TEST_START
ARCH = arm

Will have the arch defined for each test iteration.

Signed-off-by: Steven Rostedt <[email protected]>
13 years ago[media] imon: Correct call to input_free_device
Julia Lawall [Fri, 20 May 2011 18:31:59 +0000 (15:31 -0300)]
[media] imon: Correct call to input_free_device

ictx->touch is intialied in imon_init_intf1, to the result of calling the
function that contains this code.  Thus, in this code, input_free_device
should be called on touch itself.

A simplified version of the semantic match that finds this problem is:
(http://coccinelle.lip6.fr/)

// <smpl>
@r exists@
local idexpression struct input_dev * x;
expression ra,rr;
position p1,p2;
@@

x = input_allocate_device@p1(...)
...  when != x = rr
    when != input_free_device(x,...)
    when != if (...) { ... input_free_device(x,...) ...}
if(...) { ... when != x = ra
    when forall
    when != input_free_device(x,...)
\(return <+...x...+>; \| return@p2...; \) }

@script:python@
p1 << r.p1;
p2 << r.p2;
@@

cocci.print_main("input_allocate_device",p1)
cocci.print_secs("input_free_device",p2)
// </smpl>

Signed-off-by: Julia Lawall <[email protected]>
Signed-off-by: Jarod Wilson <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
13 years ago[media] saa7134: enable IR support for Hauppauge HVR-1150/1120
Devin Heitmueller [Fri, 20 May 2011 18:28:24 +0000 (15:28 -0300)]
[media] saa7134: enable IR support for Hauppauge HVR-1150/1120

Enable the IR support for the Hauppauge HVR-1150 and HVR-1120.

Thanks to Fernando Laudares Camargos for testing the patch.

Signed-off-by: Devin Heitmueller <[email protected]>
Cc: Fernando Laudares Camargos <[email protected]>
Signed-off-by: Jarod Wilson <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
13 years agoktest: Create variables for the ktest config files
Steven Rostedt [Fri, 20 May 2011 17:36:58 +0000 (13:36 -0400)]
ktest: Create variables for the ktest config files

I found that I constantly reuse information for each test case.
It would be nice to just define a variable to reuse.

For example I may have:

TEST_START
[...]
TEST = ssh root@mybox /path/to/my/script

TEST_START
[...]
TEST = ssh root@mybox /path/to/my/script

[etc]

The issue is, I may wont to change that script or one of the other
fields. Then I need to update each line individually.

With the addition of config variables (variables only used during parsing
the config) we can simplify the config files. These variables can
also be defined multiple times and each time the new value will
overwrite the old value.

The convention to use a config variable over a ktest option is to use :=
instead of =.

Now we could do:

USER := root
TARGET := mybox
TEST_SCRIPT := /path/to/my/script
TEST_CASE := ${USER}@${TARGET} ${TEST_SCRIPT}

TEST_START
[...]
TEST = ${TEST_CASE}

TEST_START
[...]
TEST = ${TEST_CASE}

[etc]

Now we just need to update the variables at the top.

Signed-off-by: Steven Rostedt <[email protected]>
13 years ago[media] redrat3: new rc-core IR transceiver device driver
Jarod Wilson [Wed, 4 May 2011 17:02:42 +0000 (14:02 -0300)]
[media] redrat3: new rc-core IR transceiver device driver

This is a new rc-core device driver for the IR transceivers made by
RedRat Ltd. (http://redrat.co.uk/). It started out life as an
out-of-lirc-tree lirc driver, maintained in its own repo on sourceforge,
by Stephen Cox. He started porting it to what was then ir-core, and I
finally picked it up about two week ago and did a fairly large overhaul
on it, and its now into a state where I'm fairly comfortable submitting
it here for review and inclusion in the kernel. I'm claiming authorship
of this driver, since while it started out as Stephen's work, its
definitely a derivative work now, at 876 lines added and 1698 lines
removed since grabbing it from sourceforge. Stephen's name is retained
as secondary author though, and credited in the headers. Those
interested in seeing how the changes evolved can (at least for now) look
at this branch in my git tree:

http://git.kernel.org/?p=linux/kernel/git/jarod/linux-2.6-ir.git;a=shortlog;h=refs/heads/redrat3

That won't be around forever though, and I'm doing this as a single
commit to go into mainline. Anyway...

I've successfully tested in-kernel decode of rc5, rc6 and nec remotes,
as well as lirc userspace decode of rc5 and rc6. There are still some
quirks here to sort out with rc5 lirc userspace decode, but I'm working
with the RedRat folks themselves to figure out what's going on there
(rc5 lirc decode works, but you only get an event on key release --
in-kernel rc5 decode behaves perfectly fine). Note that lirc decode of
rc6 is working perfectly. Transmit is also working, tested by pointing
the redrat3 at an mceusb transceiver, which happily picked up the
transmitted signals and properly decoded them.

There's no default remote for this hardware, so its somewhat arbitrarily
set to use the Hauppauge RC5 keymap by default. Easily changed out by
way of ir-keytable and irrelevant if you're using lircd for decode.

CC: Chris Dodge <[email protected]>
CC: Andrew Vincer <[email protected]>
CC: Stephen Cox <[email protected]>
Signed-off-by: Jarod Wilson <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
13 years ago[media] rc: add locking to fix register/show race
Jarod Wilson [Wed, 11 May 2011 18:14:31 +0000 (15:14 -0300)]
[media] rc: add locking to fix register/show race

When device_add is called in rc_register_device, the rc sysfs nodes show
up, and there's a window in which ir-keytable can be launched via udev
and trigger a show_protocols call, which runs without various rc_dev
fields filled in yet. Add some locking around registration and
store/show_protocols to prevent that from happening.

The problem manifests thusly:

[64692.957872] BUG: unable to handle kernel NULL pointer dereference at 0000000000000090
[64692.957878] IP: [<ffffffffa036a4c1>] show_protocols+0x47/0xf1 [rc_core]
[64692.957890] PGD 19cfc7067 PUD 19cfc6067 PMD 0
[64692.957894] Oops: 0000 [#1] SMP
[64692.957897] last sysfs file: /sys/devices/pci0000:00/0000:00:03.1/usb3/3-1/3-1:1.0/rc/rc2/protocols
[64692.957902] CPU 3
[64692.957903] Modules linked in: redrat3(+) ir_lirc_codec lirc_dev ir_sony_decoder ir_jvc_decoder ir_rc6_decoder ir_rc5_decoder rc_hauppauge ir_nec
_decoder rc_core ip6t_REJECT nf_conntrack_ipv6 nf_defrag_ipv6 ip6table_filter ip6_tables snd_emu10k1_synth snd_emux_synth snd_seq_virmidi snd_seq_mi
di_event snd_seq_midi_emul snd_emu10k1 snd_rawmidi snd_ac97_codec ac97_bus snd_seq snd_pcm snd_seq_device snd_timer snd_page_alloc snd_util_mem pcsp
kr tg3 snd_hwdep emu10k1_gp snd amd64_edac_mod gameport edac_core soundcore edac_mce_amd k8temp shpchp i2c_piix4 lm63 e100 mii uinput ipv6 raid0 rai
d1 ata_generic firewire_ohci pata_acpi firewire_core crc_itu_t sata_svw pata_serverworks floppy radeon ttm drm_kms_helper drm i2c_algo_bit i2c_core
[last unloaded: redrat3]
[64692.957949] [64692.957952] Pid: 12265, comm: ir-keytable Tainted: G   M    W   2.6.39-rc6+ #2 empty empty/TYAN Thunder K8HM S3892
[64692.957957] RIP: 0010:[<ffffffffa036a4c1>]  [<ffffffffa036a4c1>] show_protocols+0x47/0xf1 [rc_core]
[64692.957962] RSP: 0018:ffff880194509e38  EFLAGS: 00010202
[64692.957964] RAX: 0000000000000000 RBX: ffffffffa036d1e0 RCX: ffffffffa036a47a
[64692.957966] RDX: ffff88019a84d000 RSI: ffffffffa036d1e0 RDI: ffff88019cf2f3f0
[64692.957969] RBP: ffff880194509e68 R08: 0000000000000002 R09: 0000000000000000
[64692.957971] R10: 0000000000000002 R11: 0000000000001617 R12: ffff88019a84d000
[64692.957973] R13: 0000000000001000 R14: ffff8801944d2e38 R15: ffff88019ce5f190
[64692.957976] FS:  00007f0a30c9a720(0000) GS:ffff88019fc00000(0000) knlGS:0000000000000000
[64692.957979] CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
[64692.957981] CR2: 0000000000000090 CR3: 000000019a8e0000 CR4: 00000000000006e0
[64692.957983] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
[64692.957986] DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400
[64692.957989] Process ir-keytable (pid: 12265, threadinfo ffff880194508000, task ffff88019a9fc720)
[64692.957991] Stack:
[64692.957992]  0000000000000002 ffffffffa036d1e0 ffff880194509f58 0000000000001000
[64692.957997]  ffff8801944d2e38 ffff88019ce5f190 ffff880194509e98 ffffffff8131484b
[64692.958001]  ffffffff8118e923 ffffffff810e9b2f ffff880194509e98 ffff8801944d2e18
[64692.958005] Call Trace:
[64692.958014]  [<ffffffff8131484b>] dev_attr_show+0x27/0x4e
[64692.958014]  [<ffffffff8118e923>] ? sysfs_read_file+0x94/0x172
[64692.958014]  [<ffffffff810e9b2f>] ? __get_free_pages+0x16/0x52
[64692.958014]  [<ffffffff8118e94c>] sysfs_read_file+0xbd/0x172
[64692.958014]  [<ffffffff8113205e>] vfs_read+0xac/0xf3
[64692.958014]  [<ffffffff8113347b>] ? fget_light+0x3a/0xa1
[64692.958014]  [<ffffffff811320f2>] sys_read+0x4d/0x74
[64692.958014]  [<ffffffff814c19c2>] system_call_fastpath+0x16/0x1b

Its a bit difficult to reproduce, but I'm fairly confident this has
fixed the problem.

Signed-off-by: Jarod Wilson <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
13 years agomacvlan: fix panic if lowerdev in a bond
Eric Dumazet [Fri, 20 May 2011 18:59:23 +0000 (14:59 -0400)]
macvlan: fix panic if lowerdev in a bond

commit a35e2c1b6d905 (macvlan: use rx_handler_data pointer to store
macvlan_port pointer V2) added a bug in macvlan_port_create()

Steps to reproduce the bug:

# ifenslave bond0 eth0 eth1

# ip link add link eth0 up name eth0#1 type macvlan
->error EBUSY

# ip link add link eth0 up name eth0#1 type macvlan
->panic

Fix: Dont set IFF_MACVLAN_PORT in error case.

Signed-off-by: Eric Dumazet <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
13 years ago[media] mceusb: passing ep to request_packet is redundant
Jarod Wilson [Tue, 10 May 2011 17:09:59 +0000 (14:09 -0300)]
[media] mceusb: passing ep to request_packet is redundant

Signed-off-by: Jarod Wilson <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
13 years ago[media] rc-winfast: fix inverted left/right key mappings
Jarod Wilson [Tue, 10 May 2011 14:59:46 +0000 (11:59 -0300)]
[media] rc-winfast: fix inverted left/right key mappings

Reported-by: Douglas Clowes <[email protected]>
Signed-off-by: Jarod Wilson <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
13 years ago[media] ite-cir: finish tx before suspending
Jarod Wilson [Mon, 9 May 2011 19:53:17 +0000 (16:53 -0300)]
[media] ite-cir: finish tx before suspending

Continuing with IR transmit after resuming from suspend seems fairly
useless, given that the only place we can actually end up suspending is
after IR has been send and we're simply mdelay'ing. Lets simplify the
resume path by just waiting on tx to complete in the suspend path, then
we know we can't be transmitting on resume, and reinitialization of the
hardware registers becomes more straight-forward.

CC: Juan Jesús García de Soria <[email protected]>
Signed-off-by: Jarod Wilson <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
13 years ago[media] ite-cir: clean up odd spacing in ite8709 bits
Jarod Wilson [Mon, 9 May 2011 15:01:35 +0000 (12:01 -0300)]
[media] ite-cir: clean up odd spacing in ite8709 bits

There was some rather odd spacing in a few of the ite8709-specific
functions that made it hard to read those sections of code. This is just
a simple reformatting.

CC: Juan Jesús García de Soria <[email protected]>
Signed-off-by: Jarod Wilson <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
13 years ago[media] ite-cir: make IR receive work after resume
Jarod Wilson [Mon, 9 May 2011 14:48:33 +0000 (11:48 -0300)]
[media] ite-cir: make IR receive work after resume

Just recently acquired an Asus Eee Box PC with an onboard IR receiver
driven by ite-cir (ITE8713 sub-variant). Works out of the box with the
ite-cir driver in 2.6.39, but stops working after a suspend/resume
cycle. Its fixed by simply reinitializing registers after resume,
similar to what's done in the nuvoton-cir driver. I've not tested with
any other ITE variant, but code inspection suggests this should be safe
on all variants.

Reported-by: Stephan Raue <[email protected]>
CC: Juan Jesús García de Soria <[email protected]>
Signed-off-by: Jarod Wilson <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
13 years ago[media] imon: clean up disconnect routine
Jarod Wilson [Thu, 28 Apr 2011 21:20:58 +0000 (18:20 -0300)]
[media] imon: clean up disconnect routine

- Eliminate a possible circular locking lockdep warning
- Make sure we don't try to unregister a vfd on a device w/a vga screen
- Always free imon context after devices are removed (display_close can
  just error out w/no context)

Signed-off-by: Jarod Wilson <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
13 years ago[media] nuvoton-cir: minor tweaks to rc dev init
Jarod Wilson [Thu, 21 Apr 2011 18:21:47 +0000 (15:21 -0300)]
[media] nuvoton-cir: minor tweaks to rc dev init

- Set a default timeout (matching mceusb.c) and use
  ir_raw_event_store_with_filter, which leads to better behavior when
  using lirc userspace decoding with this hardware
- Fill in rx_resolution with the value we're using here (50us)
- Wire up input phys and device parent pointer
- Use device_init_wakeup() instead of device_set_wakeup_*()

Signed-off-by: Jarod Wilson <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
13 years agoMerge branch 'timers/urgent' into timers/core
Thomas Gleixner [Fri, 20 May 2011 18:06:24 +0000 (20:06 +0200)]
Merge branch 'timers/urgent' into timers/core

Reason: Get upstream fixes and kfree_rcu which is necessary for a
follow up patch.

Signed-off-by: Thomas Gleixner <[email protected]>
13 years ago[IA64] define "_sdata" symbol
Tony Luck [Fri, 20 May 2011 17:38:53 +0000 (10:38 -0700)]
[IA64] define "_sdata" symbol

core_kernel_data() wants to know if an address looks like kernel
data. IA64 has had _edata forever, but never needed _sdata until
now.

Signed-off-by: Tony Luck <[email protected]>
13 years agoPull misc-2.6.40 into release branch
Tony Luck [Fri, 20 May 2011 17:35:03 +0000 (10:35 -0700)]
Pull misc-2.6.40 into release branch

13 years agoPull pstore into release branch
Tony Luck [Fri, 20 May 2011 17:34:50 +0000 (10:34 -0700)]
Pull pstore into release branch

13 years agopstore: Fix Kconfig dependencies for apei->pstore
Luck, Tony [Wed, 13 Apr 2011 17:48:12 +0000 (10:48 -0700)]
pstore: Fix Kconfig dependencies for apei->pstore

Geert Uytterhoeven ran a dependency checker which kicked out this warning:

+ warning: (ACPI_APEI) selects PSTORE which has unmet direct dependencies (MISC_FILESYSTEMS):  => N/A

Randy confirmed that the fix was to "select MISC_FILESYSTEMS" too.

Tested-by: Randy Dunlap <[email protected]>
Signed-off-by: Tony Luck <[email protected]>
13 years ago[CIFS] Fix to problem with getattr caused by invalidate simplification patch
Steve French [Fri, 20 May 2011 17:00:01 +0000 (17:00 +0000)]
[CIFS] Fix to problem with getattr caused by invalidate simplification patch

Fix to earlier "Simplify invalidate part (try #6)" patch
That patch caused problems with connectathon test 5.

Reviewed-by: Jeff Layton <[email protected]>
Signed-off-by: Pavel Shilovsky <[email protected]>
Signed-off-by: Steve French <[email protected]>
13 years ago[media] uvcvideo: Add M420 format support
Hans de Goede [Wed, 11 May 2011 12:56:20 +0000 (09:56 -0300)]
[media] uvcvideo: Add M420 format support

The M420 format is used by the Microsoft LifeCam Studio HD.

Signed-off-by: Hans de Goede <[email protected]>
[[email protected]: split into v4l/uvcvideo patches]
Signed-off-by: Laurent Pinchart <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
13 years ago[media] v4l: Add M420 format definition
Hans de Goede [Wed, 11 May 2011 12:56:20 +0000 (09:56 -0300)]
[media] v4l: Add M420 format definition

M420 is a hybrid YUV 4:2:0 packet/planar format. Two Y lines are
followed by an interleaved U/V line.

Signed-off-by: Hans de Goede <[email protected]>
[[email protected]: split into v4l/uvcvideo patches]
[[email protected]: add documentation]
Signed-off-by: Laurent Pinchart <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
13 years ago[media] uvcvideo: Add support for NOMMU arch
Bob Liu [Fri, 29 Apr 2011 10:11:35 +0000 (07:11 -0300)]
[media] uvcvideo: Add support for NOMMU arch

Add support to uvc driver for NOMMU arch including add function
uvc_queue_get_unmapped_area() and make some changes in uvc_queue_mmap().
So that uvc camera can be used on nommu arch like blackfin.

Signed-off-by: Bob Liu <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
13 years ago[media] Revert "V4L/DVB: v4l2-dev: remove get_unmapped_area"
Bob Liu [Fri, 6 May 2011 08:20:09 +0000 (05:20 -0300)]
[media] Revert "V4L/DVB: v4l2-dev: remove get_unmapped_area"

This reverts commit c29fcff3daafbf46d64a543c1950bbd206ad8c1c.

Signed-off-by: Bob Liu <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
13 years ago[media] V4L: mt9m111: fix pixel clock
Teresa Gámez [Wed, 18 May 2011 13:41:45 +0000 (10:41 -0300)]
[media] V4L: mt9m111: fix pixel clock

This camera driver supports only rising edge, which is the default
setting of the device. The function mt9m111_setup_pixfmt() overwrites
this setting. So the driver actually uses falling edge.
This patch corrects that.

Signed-off-by: Teresa Gámez <[email protected]>
[[email protected]: removed superfluous register write]
Signed-off-by: Guennadi Liakhovetski <[email protected]>
Tested-by: Teresa Gámez <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
13 years ago[media] V4L: mt9v022: fix pixel clock
Teresa Gámez [Thu, 14 Apr 2011 14:39:57 +0000 (11:39 -0300)]
[media] V4L: mt9v022: fix pixel clock

The setup of the pixel clock is done wrong in the mt9v022 driver.
The 'Invert Pixel Clock' bit has to be set to 1 for falling edge
and not for rising. This is not clearly described in the data
sheet.

Tested on pcm037 and pcm027/pcm990.

Signed-off-by: Teresa Gámez <[email protected]>
Signed-off-by: Guennadi Liakhovetski <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
13 years ago[media] V4L: soc-camera: a missing mediabus code -> fourcc translation is not critical
Guennadi Liakhovetski [Wed, 18 May 2011 09:49:54 +0000 (06:49 -0300)]
[media] V4L: soc-camera: a missing mediabus code -> fourcc translation is not critical

soc_mbus_get_fmtdesc() returning NULL means only, that no standard
mediabus code -> fourcc conversion is known, this shouldn't be treated
as an error by drivers.

Signed-off-by: Guennadi Liakhovetski <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
13 years ago[media] V4L: soc-camera: add more format look-up entries
Guennadi Liakhovetski [Tue, 17 May 2011 13:44:03 +0000 (10:44 -0300)]
[media] V4L: soc-camera: add more format look-up entries

Add new look-up entries for all mediabus codes, for which respective
fourcc codes exist.

Signed-off-by: Guennadi Liakhovetski <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
13 years ago[media] V4L: soc-camera: add a new packing for YUV 4:2:0 type formats
Guennadi Liakhovetski [Fri, 20 May 2011 07:25:09 +0000 (04:25 -0300)]
[media] V4L: soc-camera: add a new packing for YUV 4:2:0 type formats

12-bit formats, similar to YUV 4:2:0 occupy 3 bytes for each two pixels
and cannot be described by any of the existing SOC_MBUS_PACKING_* macros.
This patch adds a new one SOC_MBUS_PACKING_1_5X8 to describe such
formats and extends soc_mbus_samples_per_pixel() to support it.

Signed-off-by: Guennadi Liakhovetski <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
13 years ago[media] V4L: omap1-camera: fix huge lookup array
Guennadi Liakhovetski [Fri, 13 May 2011 16:11:38 +0000 (13:11 -0300)]
[media] V4L: omap1-camera: fix huge lookup array

Since V4L2_MBUS_FMT_* codes have become large and sparse, they cannot
be used as array indices anymore.

Signed-off-by: Guennadi Liakhovetski <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
13 years ago[media] V4L: soc-camera: avoid huge arrays, caused by changed format codes
Guennadi Liakhovetski [Fri, 13 May 2011 16:21:36 +0000 (13:21 -0300)]
[media] V4L: soc-camera: avoid huge arrays, caused by changed format codes

Recently mediabus pixel format codes have become a part of the user-
space API, at which time their values also have been changed from
contiguous numbers, running from 0 to sparse numbers with values
around 0x1000, 0x2000, 0x3000... This made them unsuitable for the
use as array indices. This patch switches soc-camera internal format
look-ups to not depend on values of those macros.

Signed-off-by: Guennadi Liakhovetski <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
13 years ago[media] V4L: soc-camera: add MIPI bus flags
Kassey Li [Thu, 7 Apr 2011 17:01:29 +0000 (14:01 -0300)]
[media] V4L: soc-camera: add MIPI bus flags

Signed-off-by: Kassey Lee <[email protected]>
Signed-off-by: Qing Xu <[email protected]>
Signed-off-by: Guennadi Liakhovetski <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
13 years ago[media] V4L: soc-camera: add JPEG support
Kassey Li [Fri, 20 May 2011 07:08:39 +0000 (04:08 -0300)]
[media] V4L: soc-camera: add JPEG support

Signed-off-by: Qing Xu <[email protected]>
Signed-off-by: Kassey Lee <[email protected]>
[[email protected]: fixed compiler warning]
Signed-off-by: Guennadi Liakhovetski <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
13 years ago[media] V4L: sh_mobile_ceu_camera: implement live cropping
Guennadi Liakhovetski [Mon, 28 Mar 2011 16:39:16 +0000 (13:39 -0300)]
[media] V4L: sh_mobile_ceu_camera: implement live cropping

PRELIMINARY: break out spinlock changes; consider multiple completing
feames, causing multiple complete() calles.

Add live crop support to the sh_mobile_ceu driver.

Signed-off-by: Guennadi Liakhovetski <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
13 years ago[media] V4L: soc-camera: add a livecrop host operation
Guennadi Liakhovetski [Mon, 28 Mar 2011 16:28:28 +0000 (13:28 -0300)]
[media] V4L: soc-camera: add a livecrop host operation

Add an soc-camera host livecrop operation to implement live zoom. If
a host driver implements it, it should take care to preserve output
frame format, then live crop doesn't break streaming.

Signed-off-by: Guennadi Liakhovetski <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
13 years ago[media] V4L: mx3_camera: implement .stop_streaming()
Guennadi Liakhovetski [Fri, 25 Mar 2011 08:24:01 +0000 (05:24 -0300)]
[media] V4L: mx3_camera: implement .stop_streaming()

The .stop_streaming() videobuf2 operation has to be implemented to
guarantee, that video buffers are not written to after a STREAMOFF.

Signed-off-by: Guennadi Liakhovetski <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
13 years ago[media] V4L: sh_mobile_ceu_camera: implement .stop_streaming()
Guennadi Liakhovetski [Thu, 24 Mar 2011 15:51:07 +0000 (12:51 -0300)]
[media] V4L: sh_mobile_ceu_camera: implement .stop_streaming()

The .stop_streaming() videobuf2 operation has to be implemented to
guarantee, that video buffers are not written to after a STREAMOFF.

Signed-off-by: Guennadi Liakhovetski <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
13 years ago[media] s5p-csis: Do not use uninitialized variables in s5pcsis_suspend
Sylwester Nawrocki [Wed, 18 May 2011 15:06:40 +0000 (12:06 -0300)]
[media] s5p-csis: Do not use uninitialized variables in s5pcsis_suspend

Signed-off-by: Sylwester Nawrocki <[email protected]>
Signed-off-by: Kyungmin Park <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
13 years ago[media] v4l: Add v4l2 subdev driver for S5P/EXYNOS4 MIPI-CSI receivers
Sylwester Nawrocki [Mon, 4 Apr 2011 12:44:19 +0000 (09:44 -0300)]
[media] v4l: Add v4l2 subdev driver for S5P/EXYNOS4 MIPI-CSI receivers

Add the subdev driver for the MIPI CSIS units available in S5P and
Exynos4 SoC series. This driver supports both CSIS0 and CSIS1
MIPI-CSI2 receivers.
The driver requires Runtime PM to be enabled for proper operation.

Signed-off-by: Sylwester Nawrocki <[email protected]>
Signed-off-by: Kyungmin Park <[email protected]>
Acked-by: Laurent Pinchart <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
13 years ago[media] v4l: Move s5p-fimc driver into Video capture devices
Sylwester Nawrocki [Mon, 4 Apr 2011 12:21:57 +0000 (09:21 -0300)]
[media] v4l: Move s5p-fimc driver into Video capture devices

s5p-fimc now also implements a camera capture video node so move
it under the "Video capture devices" Kconfig menu. Also update
the entry to reflect the driver's coverage of EXYNOS4 SoCs and
separate the Makefile entry from the soc-camera drivers set.

Signed-off-by: Sylwester Nawrocki <[email protected]>
Signed-off-by: Kyungmin Park <[email protected]>
Acked-by: Laurent Pinchart <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
13 years agoALSA: hda - Use LPIB for ATI/AMD chipsets as default
Takashi Iwai [Fri, 20 May 2011 14:29:09 +0000 (16:29 +0200)]
ALSA: hda - Use LPIB for ATI/AMD chipsets as default

ATI and AMD chipsets seem not providing the proper position-buffer
information, and it also doesn't provide FIFO register required by
VIACOMBO fix.  It's better to use LPIB for these.

Reported-by: David Henningsson <[email protected]>
Cc: <[email protected]>
Signed-off-by: Takashi Iwai <[email protected]>
13 years ago[media] v4l: Add V4L2_MBUS_FMT_JPEG_1X8 media bus format
Sylwester Nawrocki [Fri, 25 Mar 2011 15:09:43 +0000 (12:09 -0300)]
[media] v4l: Add V4L2_MBUS_FMT_JPEG_1X8 media bus format

Add V4L2_MBUS_FMT_JPEG_1X8 format and the corresponding Docbook
documentation.

Signed-off-by: Sylwester Nawrocki <[email protected]>
Signed-off-by: Kyungmin Park <[email protected]>
Acked-by: Laurent Pinchart <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
13 years agoRevert "ALSA: hda - Use position_fix=3 as default for AMD chipsets"
Takashi Iwai [Fri, 20 May 2011 14:27:02 +0000 (16:27 +0200)]
Revert "ALSA: hda - Use position_fix=3 as default for AMD chipsets"

This reverts commit 447ee6a7cbbfb5ae7ab8f9b8b058b4a04fe398bf.

The workaround introduced by this commit seems bogus.
The AMD chipsets don't provide proper position-buffer nor FIFO value
required by VIACOMBO fix.

Signed-off-by: Takashi Iwai <[email protected]>
13 years agohwmon: (coretemp) Merge pkgtemp with coretemp
Durgadoss R [Thu, 19 May 2011 19:59:35 +0000 (01:29 +0530)]
hwmon: (coretemp) Merge pkgtemp with coretemp

This patch merges the pkgtemp with coretemp driver.
The sysfs interfaces for all cores in the same pkg
are shown under one directory, in hwmon. It also
supports CONFIG_HOTPLUG_CPU. So, the sysfs interfaces
are created when each core comes online and are
removed when it goes offline.

Signed-off-by: Durgadoss R <[email protected]>
Cc: Fenghua Yu <[email protected]>
[[email protected]: Fixed section reference errors]
Signed-off-by: Guenter Roeck <[email protected]>
13 years agoktest: Reboot after each patchcheck run
Steven Rostedt [Fri, 20 May 2011 13:18:18 +0000 (09:18 -0400)]
ktest: Reboot after each patchcheck run

The patches being checked may not leave the kernel in a state
that the next run will allow the new kernel to be copied to the
machine. Reboot to a known good kernel before continuing to the
next kernel to test.

Added option PATCHCHECK_SLEEP_TIME for the max time to sleep between
patchcheck reboots.

Signed-off-by: Steven Rostedt <[email protected]>
13 years agoktest: Reboot to good kernel after every bisect run
Steven Rostedt [Fri, 20 May 2011 13:16:29 +0000 (09:16 -0400)]
ktest: Reboot to good kernel after every bisect run

Reboot after each bisect run regardless if the bisect passed
or failed. The test may just be to boot the kernel and that kernel
may not have a way to copy the next kerne to it. Reboot to a known
good kernel after each bisect run.

Signed-off-by: Steven Rostedt <[email protected]>
13 years agoktest: If test failed due to timeout, print that
Steven Rostedt [Fri, 20 May 2011 13:14:35 +0000 (09:14 -0400)]
ktest: If test failed due to timeout, print that

If the test failed due to timeout for boot, print a message saying
so. Otherwise the user will be confused to why their test just failed.

Signed-off-by: Steven Rostedt <[email protected]>
13 years agoktest: Fix post install command
Steven Rostedt [Sat, 26 Mar 2011 02:42:53 +0000 (22:42 -0400)]
ktest: Fix post install command

The command to run post install (for those that want initrds) was
broken. Instead of doing a substitution for the $KERNEL_VERSION
variable. It was replacing the entire command with nothing.

Signed-off-by: Steven Rostedt <[email protected]>
13 years ago[media] gspca - kinect: fix comments referring to color camera
Antonio Ospite [Thu, 21 Apr 2011 09:51:36 +0000 (06:51 -0300)]
[media] gspca - kinect: fix comments referring to color camera

Use the expression "video stream" instead of "color camera" which is
more correct as the driver supports the RGB and IR image on the same
endpoint.

Signed-off-by: Antonio Ospite <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
13 years ago[media] gspca - kinect: fix a typo s/steram/stream/
Drew Fisher [Thu, 21 Apr 2011 09:51:35 +0000 (06:51 -0300)]
[media] gspca - kinect: fix a typo s/steram/stream/

Signed-off-by: Drew Fisher <[email protected]>
Signed-off-by: Antonio Ospite <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
13 years ago[media] gspca - kinect: move communications buffers out of stack
Drew Fisher [Thu, 21 Apr 2011 09:51:34 +0000 (06:51 -0300)]
[media] gspca - kinect: move communications buffers out of stack

Move large communications buffers out of stack and into device
structure. This prevents the frame size from being >1kB and fixes a
compiler warning when CONFIG_FRAME_WARN=1024:

drivers/media/video/gspca/kinect.c: In function ‘send_cmd.clone.0’:
drivers/media/video/gspca/kinect.c:202: warning: the frame size of 1548 bytes is larger than 1024 bytes

Reported-by: Mauro Carvalho Chehab <[email protected]>
Signed-off-by: Drew Fisher <[email protected]>
Signed-off-by: Antonio Ospite <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
13 years ago[media] DVB: return meaningful error codes in dvb_frontend
Andreas Oberritter [Sun, 8 May 2011 23:03:34 +0000 (00:03 +0100)]
[media] DVB: return meaningful error codes in dvb_frontend

- Return values should not be ORed. Abort early instead.
- Return -EINVAL instead of -1.

Signed-off-by: Andreas Oberritter <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
13 years ago[media] Kconfig: Fix indention of ---help--- for timerdale driver
Oliver Endriss [Fri, 6 May 2011 18:43:27 +0000 (15:43 -0300)]
[media] Kconfig: Fix indention of ---help--- for timerdale driver

Signed-off-by: Oliver Endriss <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
13 years agoDocBook/dvb: Improve description of the DVB API v5
Mauro Carvalho Chehab [Fri, 6 May 2011 15:32:03 +0000 (12:32 -0300)]
DocBook/dvb: Improve description of the DVB API v5

Signed-off-by: Mauro Carvalho Chehab <[email protected]>
13 years ago[media] DiBxxxx: get rid of DMA buffer on stack
Olivier Grenie [Tue, 3 May 2011 15:27:33 +0000 (12:27 -0300)]
[media] DiBxxxx: get rid of DMA buffer on stack

This patch removes the remaining on-stack buffer for USB DMA transfer.
This patch also reduces the stack memory usage.

Cc: [email protected]
Cc: Florian Mickler <[email protected]>
Signed-off-by: Olivier Grenie <[email protected]>
Signed-off-by: Patrick Boettcher <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
13 years ago[media] via-camera: add MODULE_ALIAS
Daniel Drake [Fri, 29 Apr 2011 21:45:01 +0000 (18:45 -0300)]
[media] via-camera: add MODULE_ALIAS

This fixes autoloading of the module.

Signed-off-by: Daniel Drake <[email protected]>
Acked-by: Jonathan Corbet <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
13 years ago[media] cx18: Fix warnings introduced during cleanup
Simon Farnsworth [Thu, 5 May 2011 12:42:36 +0000 (09:42 -0300)]
[media] cx18: Fix warnings introduced during cleanup

I misused the ktime API, and failed to remove some traces of the
in-kernel format conversion. Fix these, so the the driver builds
without warnings.

Signed-off-by: Simon Farnsworth <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
13 years ago[media] uvcvideo: Make the API public
Laurent Pinchart [Sun, 21 Nov 2010 20:15:44 +0000 (17:15 -0300)]
[media] uvcvideo: Make the API public

Move the public API definitions to include/linux/uvcvideo.h and bump the
version number to 1.1.0. Compatibility with the old API is kept,
application can still be compiled against the private header and will
not break.

Signed-off-by: Laurent Pinchart <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
13 years ago[media] uvcvideo: Return -ERANGE when userspace sets an unsupported menu entry
Laurent Pinchart [Sat, 30 Apr 2011 12:46:11 +0000 (09:46 -0300)]
[media] uvcvideo: Return -ERANGE when userspace sets an unsupported menu entry

Instead of passing the value down to the device and getting an error
back (or worse, crashing the firmware), return -ERANGE when the
requested menu entry is not supported.

Signed-off-by: Laurent Pinchart <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
13 years ago[media] uvcvideo: Don't report unsupported menu entries
Laurent Pinchart [Sat, 30 Apr 2011 12:46:11 +0000 (09:46 -0300)]
[media] uvcvideo: Don't report unsupported menu entries

Supported menu entries are reported by the device in response to the
GET_RES query. Use the information to return -EINVAL to userspace for
unsupported values when enumerating menu entries.

Signed-off-by: Laurent Pinchart <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
13 years ago[media] uvcvideo: Override wrong bandwidth value for Hercules Classic Silver
Laurent Pinchart [Fri, 25 Jun 2010 07:58:43 +0000 (04:58 -0300)]
[media] uvcvideo: Override wrong bandwidth value for Hercules Classic Silver

Set the FIX_BANDWIDTH quirk for the device.

Signed-off-by: Laurent Pinchart <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
13 years ago[media] uvcvideo: Add support for JMicron USB2.0 XGA WebCam
Laurent Pinchart [Fri, 25 Jun 2010 07:58:43 +0000 (04:58 -0300)]
[media] uvcvideo: Add support for JMicron USB2.0 XGA WebCam

The camera requires the PROBE_MINMAX quirk. Add a corresponding entry
in the device IDs list

Signed-off-by: Laurent Pinchart <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
13 years ago[media] uvcvideo: Add support for V4L2_PIX_FMT_RGB565
Laurent Pinchart [Sun, 6 Mar 2011 11:32:04 +0000 (08:32 -0300)]
[media] uvcvideo: Add support for V4L2_PIX_FMT_RGB565

The TomTom navigation system used in the Sony XNV 660BT and 770BT
reports an RGB565 (RGBP) format, support it in the driver.

Signed-off-by: Laurent Pinchart <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
13 years ago[media] uvcvideo: Add driver documentation
Martin Rubli [Wed, 1 Sep 2010 07:11:22 +0000 (04:11 -0300)]
[media] uvcvideo: Add driver documentation

This adds detailed documentation about the driver's extension unit control
features. Part of it has been adopted from the dynctrl.txt that used to be
available in the driver's previous Subversion repository.

The documentation has been rewritten to match the current implementation, in
particular to capture the new XU control support including UVCIOC_CTRL_QUERY.

Signed-off-by: Martin Rubli <[email protected]>
Signed-off-by: Laurent Pinchart <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
13 years ago[media] uvcvideo: Rename UVC_CONTROL_* flags to UVC_CTRL_FLAG_*
Laurent Pinchart [Sun, 21 Nov 2010 20:08:16 +0000 (17:08 -0300)]
[media] uvcvideo: Rename UVC_CONTROL_* flags to UVC_CTRL_FLAG_*

This makes the public driver API more uniform, in preparation of moving
uvcvideo.h to include/linux. Keep the old names for backward
compatibility with existing applications.

Signed-off-by: Laurent Pinchart <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
13 years ago[media] uvcvideo: Deprecate UVCIOC_CTRL_{ADD,MAP_OLD,GET,SET}
Laurent Pinchart [Tue, 12 Oct 2010 15:11:30 +0000 (12:11 -0300)]
[media] uvcvideo: Deprecate UVCIOC_CTRL_{ADD,MAP_OLD,GET,SET}

Those ioctls are deprecated, list them in the features removal schedule
for 2.6.42.

Signed-off-by: Laurent Pinchart <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
13 years ago[media] uvcvideo: Add UVCIOC_CTRL_QUERY ioctl
Martin Rubli [Sat, 2 Oct 2010 22:10:16 +0000 (19:10 -0300)]
[media] uvcvideo: Add UVCIOC_CTRL_QUERY ioctl

This ioctl extends UVCIOC_CTRL_GET/SET by not only allowing to get/set
XU controls but to also send arbitrary UVC commands to XU controls,
namely GET_CUR, SET_CUR, GET_MIN, GET_MAX, GET_RES, GET_LEN, GET_INFO
and GET_DEF. This is required for applications to work with XU controls,
so that they can properly query the size and allocate the necessary
buffers.

Signed-off-by: Martin Rubli <[email protected]>
Signed-off-by: Laurent Pinchart <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
13 years ago[media] cx18: Bump driver version to 1.5.0
Simon Farnsworth [Wed, 4 May 2011 11:39:07 +0000 (08:39 -0300)]
[media] cx18: Bump driver version to 1.5.0

To simplify maintainer support of this driver, bump the version to
1.5.0 - this will be the first version that is expected to support
mmap() for raw video frames.

Signed-off-by: Simon Farnsworth <[email protected]>
Acked-by: Andy Walls <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
This page took 0.110566 seconds and 4 git commands to generate.