01 Mar, 2013

1 commit

  • Pull ARM SoC late OMAP changes from Olof Johansson:
    "This branch contains changes for OMAP that came in late during the
    release staging, close to when the merge window opened.

    It contains, among other things:

    - OMAP PM fixes and some patches for audio device integration
    - OMAP clock fixes related to common clock conversion
    - A set of patches cleaning up WFI entry and blocking.
    - A set of fixes and IP block support for PM on TI AM33xx SoCs
    (Beaglebone, etc)
    - A set of smaller fixes and cleanups around AM33xx restart and
    revision detection, as well as removal of some dead code
    (CONFIG_32K_TIMER_HZ)"

    * tag 'late-omap' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (34 commits)
    ARM: omap2: include linux/errno.h in hwmod_reset
    ARM: OMAP2+: fix some omap_device_build() calls that aren't compiled by default
    ARM: OMAP4: hwmod data: Enable AESS hwmod device
    ARM: OMAP4: hwmod data: Update AESS data with memory bank area
    ARM: OMAP4+: AESS: enable internal auto-gating during initial setup
    ASoC: TI AESS: add autogating-enable function, callable from architecture code
    ARM: OMAP2+: hwmod: add enable_preprogram hook
    ARM: OMAP4: clock data: Add missing clkdm association for dpll_usb
    ARM: OMAP2+: PM: Fix the dt return condition in pm_late_init()
    ARM: OMAP2: am33xx-hwmod: Fix "register offset NULL check" bug
    ARM: OMAP2+: AM33xx: hwmod: add missing HWMOD_NO_IDLEST flags
    ARM: OMAP: AM33xx hwmod: Add parent-child relationship for PWM subsystem
    ARM: OMAP: AM33xx hwmod: Corrects PWM subsystem HWMOD entries
    ARM: DTS: AM33XX: Add nodes for OCMC RAM and WKUP-M3
    ARM: OMAP2+: AM33XX: Update the hardreset API
    ARM: OMAP2+: AM33XX: hwmod: Update the WKUP-M3 hwmod with reset status bit
    ARM: OMAP2+: AM33XX: hwmod: Fixup cpgmac0 hwmod entry
    ARM: OMAP2+: AM33XX: hwmod: Update TPTC0 hwmod with the right flags
    ARM: OMAP2+: AM33XX: hwmod: Register OCMC RAM hwmod
    ARM: OMAP2+: AM33XX: CM/PRM: Use __ASSEMBLER__ macros in header files
    ...

    Linus Torvalds
     

27 Feb, 2013

1 commit

  • Pull vfs pile (part one) from Al Viro:
    "Assorted stuff - cleaning namei.c up a bit, fixing ->d_name/->d_parent
    locking violations, etc.

    The most visible changes here are death of FS_REVAL_DOT (replaced with
    "has ->d_weak_revalidate()") and a new helper getting from struct file
    to inode. Some bits of preparation to xattr method interface changes.

    Misc patches by various people sent this cycle *and* ocfs2 fixes from
    several cycles ago that should've been upstream right then.

    PS: the next vfs pile will be xattr stuff."

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (46 commits)
    saner proc_get_inode() calling conventions
    proc: avoid extra pde_put() in proc_fill_super()
    fs: change return values from -EACCES to -EPERM
    fs/exec.c: make bprm_mm_init() static
    ocfs2/dlm: use GFP_ATOMIC inside a spin_lock
    ocfs2: fix possible use-after-free with AIO
    ocfs2: Fix oops in ocfs2_fast_symlink_readpage() code path
    get_empty_filp()/alloc_file() leave both ->f_pos and ->f_version zero
    target: writev() on single-element vector is pointless
    export kernel_write(), convert open-coded instances
    fs: encode_fh: return FILEID_INVALID if invalid fid_type
    kill f_vfsmnt
    vfs: kill FS_REVAL_DOT by adding a d_weak_revalidate dentry op
    nfsd: handle vfs_getattr errors in acl protocol
    switch vfs_getattr() to struct path
    default SET_PERSONALITY() in linux/elf.h
    ceph: prepopulate inodes only when request is aborted
    d_hash_and_lookup(): export, switch open-coded instances
    9p: switch v9fs_set_create_acl() to inode+fid, do it before d_instantiate()
    9p: split dropping the acls from v9fs_set_create_acl()
    ...

    Linus Torvalds
     

26 Feb, 2013

1 commit


25 Feb, 2013

1 commit

  • Pull media updates from Mauro Carvalho Chehab:

    - Some cleanups at V4L2 documentation

    - new drivers: ts2020 frontend, ov9650 sensor, s5c73m3 sensor,
    sh-mobile veu mem2mem driver, radio-ma901, davinci_vpfe staging
    driver

    - Lots of missing MAINTAINERS entries added

    - several em28xx driver improvements, including its conversion to
    videobuf2

    - several fixups on drivers to make them to better comply with the API

    - DVB core: add support for DVBv5 stats, allowing the implementation of
    statistics for new standards like ISDB

    - mb86a20s: add statistics to the driver

    - lots of new board additions, cleanups, and driver improvements.

    * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (596 commits)
    [media] media: Add 0x3009 USB PID to ttusb2 driver (fixed diff)
    [media] rtl28xxu: Add USB IDs for Compro VideoMate U620F
    [media] em28xx: add usb id for terratec h5 rev. 3
    [media] media: rc: gpio-ir-recv: add support for device tree parsing
    [media] mceusb: move check earlier to make smatch happy
    [media] radio-si470x doc: add info about v4l2-ctl and sox+alsa
    [media] staging: media: Remove unnecessary OOM messages
    [media] sh_vou: Use vou_dev instead of vou_file wherever possible
    [media] sh_vou: Use video_drvdata()
    [media] drivers/media/platform/soc_camera/pxa_camera.c: use devm_ functions
    [media] mt9t112: mt9t111 format set up differs from mt9t112
    [media] sh-mobile-ceu-camera: fix SHARPNESS control default
    Revert "[media] fc0011: Return early, if the frequency is already tuned"
    [media] cx18/ivtv: fix regression: remove __init from a non-init function
    [media] em28xx: fix analog streaming with USB bulk transfers
    [media] stv0900: remove unnecessary null pointer check
    [media] fc0011: Return early, if the frequency is already tuned
    [media] fc0011: Add some sanity checks and cleanups
    [media] fc0011: Fix xin value clamping
    Revert "[media] [PATH,1/2] mxl5007 move reset to attach"
    ...

    Linus Torvalds
     

23 Feb, 2013

1 commit


22 Feb, 2013

5 commits

  • Pull s390 update from Martin Schwidefsky:
    "The most prominent change in this patch set is the software dirty bit
    patch for s390. It removes __HAVE_ARCH_PAGE_TEST_AND_CLEAR_DIRTY and
    the page_test_and_clear_dirty primitive which makes the common memory
    management code a bit less obscure.

    Heiko fixed most of the PCI related fallout, more often than not
    missing GENERIC_HARDIRQS dependencies. Notable is one of the 3270
    patches which adds an export to tty_io to be able to resize a tty.

    The rest is the usual bunch of cleanups and bug fixes."

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: (42 commits)
    s390/module: Add missing R_390_NONE relocation type
    drivers/gpio: add missing GENERIC_HARDIRQ dependency
    drivers/input: add couple of missing GENERIC_HARDIRQS dependencies
    s390/cleanup: rename SPP to LPP
    s390/mm: implement software dirty bits
    s390/mm: Fix crst upgrade of mmap with MAP_FIXED
    s390/linker skript: discard exit.data at runtime
    drivers/media: add missing GENERIC_HARDIRQS dependency
    s390/bpf,jit: add vlan tag support
    drivers/net,AT91RM9200: add missing GENERIC_HARDIRQS dependency
    iucv: fix kernel panic at reboot
    s390/Kconfig: sort list of arch selected config options
    phylib: remove !S390 dependeny from Kconfig
    uio: remove !S390 dependency from Kconfig
    dasd: fix sysfs cleanup in dasd_generic_remove
    s390/pci: fix hotplug module init
    s390/pci: cleanup clp page allocation
    s390/pci: cleanup clp inline assembly
    s390/perf: cpum_cf: fallback to software sampling events
    s390/mm: provide PAGE_SHARED define
    ...

    Linus Torvalds
     
  • Pull trivial tree from Jiri Kosina:
    "Assorted tiny fixes queued in trivial tree"

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (22 commits)
    DocBook: update EXPORT_SYMBOL entry to point at export.h
    Documentation: update top level 00-INDEX file with new additions
    ARM: at91/ide: remove unsused at91-ide Kconfig entry
    percpu_counter.h: comment code for better readability
    x86, efi: fix comment typo in head_32.S
    IB: cxgb3: delay freeing mem untill entirely done with it
    net: mvneta: remove unneeded version.h include
    time: x86: report_lost_ticks doesn't exist any more
    pcmcia: avoid static analysis complaint about use-after-free
    fs/jfs: Fix typo in comment : 'how may' -> 'how many'
    of: add missing documentation for of_platform_populate()
    btrfs: remove unnecessary cur_trans set before goto loop in join_transaction
    sound: soc: Fix typo in sound/codecs
    treewide: Fix typo in various drivers
    btrfs: fix comment typos
    Update ibmvscsi module name in Kconfig.
    powerpc: fix typo (utilties -> utilities)
    of: fix spelling mistake in comment
    h8300: Fix home page URL in h8300/README
    xtensa: Fix home page URL in Kconfig
    ...

    Linus Torvalds
     
  • Pull ARM SoC multiplatform support from Arnd Bergmann:
    "Converting more ARM platforms to multiplatform support. This time,
    OMAP gets converted, which is a major step since this is by far the
    largest platform in terms of code size. The same thing happens to the
    vt8500 platform."

    * tag 'multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
    net: cwdavinci_cpdma: export symbols for cpsw
    remoteproc: omap: depend on OMAP_MBOX_FWK
    [media] davinci: do not include mach/hardware.h
    ARM: OMAP2+: Make sure files with omap initcalls include soc.h
    ARM: OMAP2+: Include soc.h to drm.c to fix compiling
    ARM: OMAP2+: Fix warning for hwspinlock omap_postcore_initcall
    ARM: multi_v7_defconfig: add ARCH_ZYNQ
    ARM: multi_v7_defconfig: remove unnecessary CONFIG_GPIOLIB
    arm: vt8500: Remove remaining mach includes
    arm: vt8500: Convert debug-macro.S to be multiplatform friendly
    arm: vt8500: Remove single platform Kconfig options
    ARM: OMAP2+: Remove now obsolete uncompress.h and debug-macro.S
    ARM: OMAP2+: Add minimal support for booting vexpress
    ARM: OMAP2+: Enable ARCH_MULTIPLATFORM support
    ARM: OMAP2+: Disable code that currently does not work with multiplaform
    ARM: OMAP2+: Add multiplatform debug_ll support
    ARM: OMAP: Fix dmaengine init for multiplatform
    ARM: OMAP: Fix i2c cmdline initcall for multiplatform
    ARM: OMAP2+: Use omap initcalls
    ARM: OMAP2+: Limit omap initcalls to omap only on multiplatform kernels

    Linus Torvalds
     
  • Pull tty/serial patches from Greg Kroah-Hartman:
    "Here's the big tty/serial driver patches for 3.9-rc1.

    More tty port rework and fixes from Jiri here, as well as lots of
    individual serial driver updates and fixes.

    All of these have been in the linux-next tree for a while."

    * tag 'tty-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (140 commits)
    tty: mxser: improve error handling in mxser_probe() and mxser_module_init()
    serial: imx: fix uninitialized variable warning
    serial: tegra: assume CONFIG_OF
    TTY: do not update atime/mtime on read/write
    lguest: select CONFIG_TTY to build properly.
    ARM defconfigs: add missing inclusions of linux/platform_device.h
    fb/exynos: include platform_device.h
    ARM: sa1100/assabet: include platform_device.h directly
    serial: imx: Fix recursive locking bug
    pps: Fix build breakage from decoupling pps from tty
    tty: Remove ancient hardpps()
    pps: Additional cleanups in uart_handle_dcd_change
    pps: Move timestamp read into PPS code proper
    pps: Don't crash the machine when exiting will do
    pps: Fix a use-after free bug when unregistering a source.
    pps: Use pps_lookup_dev to reduce ldisc coupling
    pps: Add pps_lookup_dev() function
    tty: serial: uartlite: Support uartlite on big and little endian systems
    tty: serial: uartlite: Fix sparse and checkpatch warnings
    serial/arc-uart: Miscll DT related updates (Grant's review comments)
    ...

    Fix up trivial conflicts, mostly just due to the TTY config option
    clashing with the EXPERIMENTAL removal.

    Linus Torvalds
     
  • Pull driver core patches from Greg Kroah-Hartman:
    "Here is the big driver core merge for 3.9-rc1

    There are two major series here, both of which touch lots of drivers
    all over the kernel, and will cause you some merge conflicts:

    - add a new function called devm_ioremap_resource() to properly be
    able to check return values.

    - remove CONFIG_EXPERIMENTAL

    Other than those patches, there's not much here, some minor fixes and
    updates"

    Fix up trivial conflicts

    * tag 'driver-core-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (221 commits)
    base: memory: fix soft/hard_offline_page permissions
    drivercore: Fix ordering between deferred_probe and exiting initcalls
    backlight: fix class_find_device() arguments
    TTY: mark tty_get_device call with the proper const values
    driver-core: constify data for class_find_device()
    firmware: Ignore abort check when no user-helper is used
    firmware: Reduce ifdef CONFIG_FW_LOADER_USER_HELPER
    firmware: Make user-mode helper optional
    firmware: Refactoring for splitting user-mode helper code
    Driver core: treat unregistered bus_types as having no devices
    watchdog: Convert to devm_ioremap_resource()
    thermal: Convert to devm_ioremap_resource()
    spi: Convert to devm_ioremap_resource()
    power: Convert to devm_ioremap_resource()
    mtd: Convert to devm_ioremap_resource()
    mmc: Convert to devm_ioremap_resource()
    mfd: Convert to devm_ioremap_resource()
    media: Convert to devm_ioremap_resource()
    iommu: Convert to devm_ioremap_resource()
    drm: Convert to devm_ioremap_resource()
    ...

    Linus Torvalds
     

16 Feb, 2013

1 commit

  • As reported by Klaus Schmidinger:
    "In VDR I use an ioctl() call with FE_READ_UNCORRECTED_BLOCKS on a
    device (using stb0899). After this call I check 'errno' for
    EOPNOTSUPP to determine whether this device supports this call. This
    used to work just fine, until a few months ago I noticed that my
    devices using stb0899 didn't display their signal quality in VDR's OSD
    any more. After further investigation I found that
    ioctl(FE_READ_UNCORRECTED_BLOCKS) no longer returns EOPNOTSUPP, but
    rather ENOTTY. And since I stop getting the signal quality in case
    any unknown errno value appears, this broke my signal quality query
    function."

    While the changes reflect what is there at:

    http://comments.gmane.org/gmane.linux.kernel/1235728

    it does cause regression on userspace. So, revert it to stop the
    damage.

    This reverts commit 177ffe506cf8 ("[media] dvb_frontend: return -ENOTTY
    for unimplement IOCTL").

    Reported-by: Klaus Schmidinger
    Signed-off-by: Mauro Carvalho Chehab
    Signed-off-by: Linus Torvalds

    Mauro Carvalho Chehab
     

15 Feb, 2013

2 commits

  • The omap multiplatform support uncovered a bug in the cwdavinci_cpdma
    code and was missing two drivers that are enabled now but are not
    quite ready for multiplatform, as found by allyesconfig builds.

    There is also a conflict generated by automated merge in
    arch/arm/mach-omap2/drm.c between a bug fix that went into v3.8-rc5
    and a different version of the same fix that went into the
    omap/multiplatform branch. This merge removes the extraneous
    #include that was causing build errors.

    * omap/multiplatform-fixes:
    net: cwdavinci_cpdma: export symbols for cpsw
    remoteproc: omap: depend on OMAP_MBOX_FWK
    [media] davinci: do not include mach/hardware.h

    Signed-off-by: Arnd Bergmann

    Arnd Bergmann
     
  • It is now possible to build the davinci vpss code
    on multiplatform kernels, which causes a problem
    since the driver tries to incude the davinci
    platform specific mach/hardware.h file. Fortunately
    that file is not required at all in the driver,
    so we can simply remove the #include statement.

    Without this patch, building allyesconfig results in:

    drivers/media/platform/davinci/vpss.c:28:27: fatal error: mach/hardware.h: No such file or directory
    compilation terminated.

    Signed-off-by: Arnd Bergmann
    Acked-by: "Lad, Prabhakar"
    Acked-by: Tony Lindgren
    Cc: Mauro Carvalho Chehab

    Arnd Bergmann
     

14 Feb, 2013

11 commits


13 Feb, 2013

1 commit

  • …nel/git/tmlind/linux-omap into late/omap

    From Tony Lindgren:
    omap clock changes via Paul Walmsley <paul@pwsan.com>:

    Some miscellaneous OMAP2+ clock fixes, mostly related to the recent
    common clock framework conversion.

    Basic test logs are available here:

    http://www.pwsan.com/omap/testlogs/clock_devel_a_3.9/20130208120108/

    * tag 'omap-for-v3.9/clock-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
    ARM: OMAP4: clock data: Add missing clkdm association for dpll_usb
    ARM: OMAP AM33XX: clock data: SET_RATE_PARENT in lcd path
    ARM: OMAP2+: clock data: add DEFINE_STRUCT_CLK_FLAGS helper
    ARM: OMAP2+: dpll: am335x - avoid freqsel
    omap3isp: Set cam_mclk rate directly
    ARM: OMAP3: clock: Back-propagate rate change from cam_mclk to dpll4_m5

    Olof Johansson
     

12 Feb, 2013

3 commits

  • This reverts commit a92591a7112042f92b609be42bc332d989776e9b.

    From: Michael Büsch
    To: linux-media@vger.kernel.org
    Cc: mchehab@redhat.com
    Subject: Re: [git:v4l-dvb/for_v3.9] [media] fc0011: Return early, if the frequency is already tuned
    Date: Mon, 11 Feb 2013 21:59:19 +0100

    Can you please revert this one again? It might cause issues if the dvb device
    is reset/reinitialized.

    Requested-by: Michael Büsch
    Signed-off-by: Mauro Carvalho Chehab

    Mauro Carvalho Chehab
     
  • Commits 5e6e81b2890db3969527772a8350825a85c22d5c (cx18) and
    2aebbf6737212265b917ed27c875c59d3037110a (ivtv) added an __init
    annotation to the cx18-alsa-load and ivtv-alsa-load functions. However,
    these functions are called *after* initialization by the main cx18/ivtv
    driver. By that time the memory containing those functions is already
    freed and your machine goes BOOM.

    Cc: stable@vger.kernel.org # for 3.8
    Signed-off-by: Hans Verkuil
    Signed-off-by: Mauro Carvalho Chehab

    Hans Verkuil
     
  • With the conversion to videobuf2, some unnecessary calls of
    em28xx_set_alternate() have been removed. It is now called at analog streaming
    start only.
    This has unveiled a bug that causes USB bulk transfers to fail with all urbs
    having status -EVOERFLOW.
    The reason is, that for bulk transfers usb_set_interface() needs to be called
    even if the previous alt setting was the same (side note: bulk transfers seem
    to work only with alt=0).
    While it seems to be NOT necessary for isoc transfers, it's reasonable to just
    call usb_set_interface() unconditionally in em28xx_set_alternate().
    Also add a comment that explains the issue to prevent regressions in the future.

    Cc: stable@vger.kernel.org # for 3.8
    Signed-off-by: Frank Schäfer
    Signed-off-by: Mauro Carvalho Chehab

    Frank Schaefer
     

09 Feb, 2013

12 commits