1. 11 Oct, 2012 1 commit
    • Mauro Carvalho Chehab's avatar
      Merge branch 'staging/for_v3.7' into v4l_for_linus · bf3b202b
      Mauro Carvalho Chehab authored
      Applied on the top of changeset 782cd9ee, as some of those patches
      depend on some fixes that went via -arm tree.
      
      * staging/for_v3.7: (109 commits)
        [media] m5mols: Add missing #include <linux/sizes.h>
        [media] stk1160: Add support for S-Video input
        Revert "[media] omap3isp: Replace cpu_is_omap3630() with ISP revision check"
        [media]  dvb: LNA implementation changes
        [media] v4l2-ioctl: fix W=1 warnings
        [media] v4l2-ioctl: add blocks check for VIDIOC_SUBDEV_G/S_EDID
        [media] omap3isp: Fix compilation error in ispreg.h
        [media] rc-msi-digivox-ii: Add full scan keycodes
        [media] cx25821: testing the wrong variable
        [media] tda18271-common: hold the I2C adapter during write transfers
        [media] ds3000: add module parameter to force firmware upload
        [media] drivers/media: Remove unnecessary semicolon
        [media] winbond: remove space from driver name
        [media] iguanair: cannot send data from the stack
        [media] omap3isp: Replace cpu_is_omap3630() with ISP revision check
        [media] dvb-usb: print small buffers via %*ph
        [media] uvc: Add return code check at vb2_queue_init()
        [media] em28xx: Replace memcpy with struct assignment
        [media] bt8xx: Add video4linux control V4L2_CID_COLOR_KILLER
        [media] mem2mem_testdev: Use devm_kzalloc() in probe
        ...
      bf3b202b
  2. 10 Oct, 2012 2 commits
  3. 09 Oct, 2012 6 commits
    • Mauro Carvalho Chehab's avatar
      Revert "[media] omap3isp: Replace cpu_is_omap3630() with ISP revision check" · d6d022e7
      Mauro Carvalho Chehab authored
      Reverted, as requested by Laurent:
      
      I don't consider it as being ready yet, as Sakari pointed out we need
      to investigate whether the right fix shouldn't be at the OMAP3 clocks
      level instead.
      
      This reverts commit 947c4808
      
      .
      
      Requested-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
      Cc: Tony Lindgren <tony@atomide.com>
      Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
      d6d022e7
    • Olof Johansson's avatar
      Merge branch 'fixes2' into fixes · 782cd9ee
      Olof Johansson authored
      Three more warnings fixes from Arnd Bergmann:
      
      * fixes2:
        ARM: integrator: use __iomem pointers for MMIO, part 2
        ARM: assabet: fix bogus warning in get_assabet_scr (again)
        ARM: shmobile: mark shmobile_init_late as __init
      782cd9ee
    • Arnd Bergmann's avatar
      ARM: integrator: use __iomem pointers for MMIO, part 2 · 21c8715f
      Arnd Bergmann authored
      
      
      Due to some interesting merges in the integrator code, not
      all users of mmio pointers were converted before, this
      fixes all warnings that got introduced as a consequence.
      
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      Cc: Linus Walleij <linus.walleij@linaro.org>
      Cc: Russell King <rmk+kernel@arm.linux.org.uk>
      21c8715f
    • Arnd Bergmann's avatar
      ARM: assabet: fix bogus warning in get_assabet_scr (again) · c6e9fbbf
      Arnd Bergmann authored
      Russell fixed this bogus warning before in 2f3eca8b
      
       "Shut up gcc
      warning in assabet.c", but apparently gcc has become smarter (or dumber)
      since 2005, and the same warning came up again.
      
      This uses the uninitialized_var() macro to convince gcc that the
      variable is actually being initialized. 100 times in fact.
      
      Without this patch, building assabet_defconfig results in:
      
      arch/arm/mach-sa1100/assabet.c: In function 'fixup_assabet':
      arch/arm/mach-sa1100/assabet.c:397:6: warning: 'scr' may be used uninitialized in this function [-Wuninitialized]
      arch/arm/mach-sa1100/assabet.c:389:16: note: 'scr' was declared here
      
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      Cc: Russell King <rmk+kernel@arm.linux.org.uk>
      c6e9fbbf
    • Arnd Bergmann's avatar
      ARM: shmobile: mark shmobile_init_late as __init · b3796d92
      Arnd Bergmann authored
      Patch 35f2b0bd
      
       "ARM: shmobile: Move definition of shmobile_init_late()
      to header" moved the definition of the shmobile_init_late function, but
      dropped the __init annotation, which is now causing warnings because
      the function calls shmobile_suspend_init, which is also marked init.
      
      Without this patch, building kota2_defconfig results in:
      
      WARNING: vmlinux.o(.text+0xb7c8): Section mismatch in reference from the function shmobile_init_late() to the function .init.text:shmobile_suspend_init()
      The function shmobile_init_late() references
      the function __init shmobile_suspend_init().
      This is often because shmobile_init_late lacks a __init
      annotation or the annotation of shmobile_suspend_init is wrong.
      
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      Cc: Rafael J. Wysocki <rjw@sisk.pl>
      Cc: Magnus Damm <damm@opensource.se>
      Cc: Simon Horman <horms@verge.net.au>
      b3796d92
    • Olof Johansson's avatar
      ARM: integrator_cp: fix build failure · 6e3a78d9
      Olof Johansson authored
      
      
      arch/arm/mach-integrator/integrator_cp.c:272:32: error: 'of_aliases'
      undeclared (first use in this function)
      
      Move the OF-only timer init under #ifdef CONFIG_OF, just like
      integrator_ap has it.
      
      Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      6e3a78d9
  4. 07 Oct, 2012 31 commits
    • Tony Prisk's avatar
      arm: vt8500: Fix build warning in uncompress.h · 096947fd
      Tony Prisk authored
      
      
      This removes a build-time warning in uncompress.h due to incorrectly
      cast values being passed to readb/writeb.
      
      Removed arm/io.h and readb/writeb. Read/write directly to the serial
      port with a volatile pointer.
      
      Signed-off-by: default avatarTony Prisk <linux@prisktech.co.nz>
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      096947fd
    • Shawn Guo's avatar
      ARM: dts: remove redundant imx dtb targets from Makefile · 68528265
      Shawn Guo authored
      
      
      We already have CONFIG_ARCH_MXC cover imx5 and imx6 dtb targets.
      Remove the redundant ones with CONFIG_ARCH_IMX5 and CONFIG_SOC_IMX6Q.
      
      Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      68528265
    • Olof Johansson's avatar
      Merge branch 'late/fixes' into fixes · 0b33162e
      Olof Johansson authored
      
      
      This is a series from Arnd that fixes a number of compiler warnings
      when building defconfigs on ARM.
      
      * late/fixes:
        ARM: footbridge: nw_gpio_lock is raw_spin_lock
        ARM: mv78xx0: correct addr_map_cfg __initdata annotation
        ARM: footbridge: remove RTC_IRQ definition
        ARM: soc: dependency warnings for errata
        ARM: ks8695: __arch_virt_to_dma type handling
        ARM: rpc: check device_register return code in ecard_probe
        ARM: davinci: don't mark da850_register_cpufreq as __init
        ARM: iop13xx: fix iq81340sc_atux_map_irq prototype
        ARM: iop13xx: mark iop13xx_scan_bus as __devinit
        ARM: mv78xx0: mark mv78xx0_timer_init as __init_refok
        ARM: s3c24xx: fix multiple section mismatch warnings
        ARM: at91: unused variable in at91_pm_verify_clocks
        ARM: at91: skip at91_io_desc definition for NOMMU
        ARM: pxa: work around duplicate definition of GPIO24_SSP1_SFRM
        ARM: pxa: remove sharpsl_fatal_check function
        ARM: pxa: define palmte2_pxa_keys conditionally
        ARM: pxa: Wunused-result warning in viper board file
        ARM: shark: fix shark_pci_init return code
      
      Fixed trivial conflicts in arch/arm/mach-at91/setup.c.
      
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      0b33162e
    • Tony Prisk's avatar
      vt8500: Fix build warning when no framebuffer selected · a4ee7770
      Tony Prisk authored
      
      
      Check for framebuffer defines before declaring variables in vt8500.c
      Removes a compile-time warning about unused variables.
      
      Signed-off-by: default avatarTony Prisk <linux@prisktech.co.nz>
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      a4ee7770
    • Tony Prisk's avatar
      dtb: Add arch-vt8500 board files to arch/arm/boot/dts/Makefile · ed304be1
      Tony Prisk authored
      
      
      Add board files (vt8500-bv07, wm8505-ref and wm8650-mid)
      to allow 'make dtbs' on arch-vt8500.
      
      Signed-off-by: default avatarTony Prisk <linux@prisktech.co.nz>
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      ed304be1
    • Stephen Warren's avatar
      ARM: bcm2835: fix typos in DT binding documentation · 53f40352
      Stephen Warren authored
      
      
      The compatible value shouldn't include ".txt", which was probably cut
      and paste from the filename.
      
      Reported-by: default avatarDomenico Andreoli <cavokz@gmail.com>
      Signed-off-by: Stephen Warren's avatarStephen Warren <swarren@wwwdotorg.org>
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      53f40352
    • Stephen Warren's avatar
      ARM: tegra: remove "Tegra board type" comment from Kconfig · 6dd41a1f
      Stephen Warren authored
      
      
      Since the complete conversion to device tree, there are no board-
      specific Kconfig options left, so remove the useless Kconfig entry.
      
      Signed-off-by: Stephen Warren's avatarStephen Warren <swarren@nvidia.com>
      Reviewed-by: default avatarThierry Reding <thierry.reding@avionic-design.de>
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      6dd41a1f
    • Stephen Warren's avatar
      ARM: tegra: fix invalid unit-address in tegra*.dtsi · bbfc33bd
      Stephen Warren authored
      
      
      Unit addresses, whilst written in hex, don't contain a 0x prefix.
      
      Signed-off-by: Stephen Warren's avatarStephen Warren <swarren@nvidia.com>
      Reviewed-by: default avatarThierry Reding <thierry.reding@avionic-design.de>
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      bbfc33bd
    • Olof Johansson's avatar
      ARM: tegra: fix mismerges of header file inclusions · 823bba8f
      Olof Johansson authored
      
      
      Another mishandled merge conflict by me, where the header file renames
      and the removal of gpio includes clashed and I chose the wrong end result.
      
      Fixes build breakage for tegra_defconfig.
      
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      823bba8f
    • Olof Johansson's avatar
      ARM: iop: fix mismerge of Kconfig · c0f72d7c
      Olof Johansson authored
      
      
      I mismerged one of the branches that moves around gpio header file usage,
      and messed up for IOP. This fixes the obvious compilation failures caused
      by it.
      
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      c0f72d7c
    • Antti Palosaari's avatar
      [media] dvb: LNA implementation changes · 33eebec5
      Antti Palosaari authored
      
      
      * use dvb property cache
      * implement get (thus API minor++)
      * PCTV 290e: 1=LNA ON, all the other values LNA OFF
        Also fix PCTV 290e LNA comment, it is disabled by default
      Hans and Mauro proposed use of cache implementation of get as they
      were planning to extend LNA usage for analog side too.
      
      Reported-by: default avatarHans Verkuil <hverkuil@xs4all.nl>
      Reported-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
      Signed-off-by: default avatarAntti Palosaari <crope@iki.fi>
      Acked-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
      Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
      33eebec5
    • Hans Verkuil's avatar
      [media] v4l2-ioctl: fix W=1 warnings · d9246240
      Hans Verkuil authored
      
      
      Since the prt_names() macro is always called with an unsigned index the
      ((a) >= 0) condition is always true and gives a compiler warning when
      compiling with W=1.
      Rewrite the macro to avoid that warning, but cast the index to unsigned
      just in case it is ever called with a signed argument.
      
      Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
      Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
      d9246240
    • Hans Verkuil's avatar
      [media] v4l2-ioctl: add blocks check for VIDIOC_SUBDEV_G/S_EDID · 1b8b10cc
      Hans Verkuil authored
      
      
      The maximum size of an EDID is 32768 bytes, which is 32768 / 128 = 256 blocks.
      Return -EINVAL if blocks > 256 to ensure that the memory allocation is sane.
      
      Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
      Reported-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
      Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
      1b8b10cc
    • Ido Yariv's avatar
      [media] omap3isp: Fix compilation error in ispreg.h · 8a18382c
      Ido Yariv authored
      Commit c49f34bc
      
       ("ARM: OMAP2+ Move SoC specific headers to be local to
      mach-omap2") moved omap34xx.h to mach-omap2. This broke omap3isp, as it
      includes omap34xx.h.
      Instead of moving omap34xx to platform_data, simply add the two
      definitions the driver needs and remove the include altogether.
      
      Signed-off-by: default avatarIdo Yariv <ido@wizery.com>
      Acked-by: default avatarTony Lindgren <tony@atomide.com>
      Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
      8a18382c
    • Wolfgang Bail's avatar
      [media] rc-msi-digivox-ii: Add full scan keycodes · b45681a6
      Wolfgang Bail authored
      
      
      The ir-rc from my MSI DigiVox mini II Version 3 (af9015) will not work since
      kernel 3.2.x.
      
      sudo ir-keytable -t shows:
      
      	1348890734.303273: event MSC: scancode = 317
      	1348890734.303280: event key down: KEY_POWER (0x0074)
      	1348890734.303282: event sync
      	1348890734.553961: event key up: KEY_POWER (0x0074)
      	1348890734.553963: event sync
      	1348890741.303451: event MSC: scancode = 30d
      	1348890741.303457: event key down: KEY_DOWN (0x006c)
      	1348890741.303459: event sync
      	1348890741.553956: event key up: KEY_DOWN (0x006c)
      
      So I changed in rc-msi-digivox-ii.c { 0x0002, KEY_2 }, to { 0x0302, KEY_2 },
      and so on. And now it works well.
      
      Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
      b45681a6
    • Dan Carpenter's avatar
      [media] cx25821: testing the wrong variable · 546196ad
      Dan Carpenter authored
      
      
      ->input_filename could be NULL here.  The intent was to test
      ->_filename.
      
      Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
      Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
      546196ad
    • Mauro Carvalho Chehab's avatar
      [media] tda18271-common: hold the I2C adapter during write transfers · 78ef81f6
      Mauro Carvalho Chehab authored
      
      
      The tda18271 datasheet says:
      	"The image rejection calibration and RF tracking filter
      	 calibration must be launched exactly as described in the
      	 flowchart, otherwise bad calibration or even blocking of the
      	 TDA18211HD can result making it impossible to communicate
      	 via the I2C-bus."
      (yeah, tda18271 refers there to tda18211 - likely a typo at their
       datasheets)
      That likely explains why sometimes tda18271 stops answering. That
      is now happening more often on designs with drx-k chips, as the
      firmware is now loaded asyncrousnly there.
      While the above text doesn't explicitly tell that the I2C bus
      couldn't be used by other devices during such initialization,
      that seems to be a requirement there.
      So, let's explicitly use the I2C lock there, avoiding I2C bus
      share during those critical moments.
      Compile-tested only. Please test.
      
      Acked-by: default avatarMichael Krufky <mkrufky@linuxtv.org>
      Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
      78ef81f6
    • Rémi Cardona's avatar
      [media] ds3000: add module parameter to force firmware upload · 034351ff
      Rémi Cardona authored
      
      
      [mchehab@redhat.com: Fix a merge conflict]
      Signed-off-by: default avatarRémi Cardona <remi.cardona@smartjog.com>
      Reviewed-by: default avatarAntti Palosaari <crope@iki.fi>
      Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
      034351ff
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm · 0e51793e
      Linus Torvalds authored
      Pull ARM updates from Russell King:
       "This is the first chunk of ARM updates for this merge window.
        Conflicts are expected in two files - asm/timex.h and
        mach-integrator/integrator_cp.c.  Nothing particularly stands out more
        than anything else.
      
        Most of the growth is down to the opcodes stuff from Dave Martin,
        which is countered by Rob's patches to use more of the asm-generic
        headers on ARM."
      
      (A few more conflicts grew since then, but it all looked fairly trivial)
      
      * 'for-linus' of git://git.linaro.org/people/rmk/linux-arm: (44 commits)
        ARM: 7548/1: include linux/sched.h in syscall.h
        ARM: 7541/1: Add ARM ERRATA 775420 workaround
        ARM: ensure vm_struct has its phys_addr member filled in
        ARM: 7540/1: kexec: Check segment memory addresses
        ARM: 7539/1: kexec: scan for dtb magic in segments
        ARM: 7538/1: delay: add registration mechanism for delay timer sources
        ARM: 7536/1: smp: Formalize an IPI for wakeup
        ARM: 7525/1: ptrace: use updated syscall number for syscall auditing
        ARM: 7524/1: support syscall tracing
        ARM: 7519/1: integrator: convert platform devices to Device Tree
        ARM: 7518/1: integrator: convert AMBA devices to device tree
        ARM: 7517/1: integrator: initial device tree support
        ARM: 7516/1: plat-versatile: add DT support to FPGA IRQ
        ARM: 7515/1: integrator: check PL010 base address from resource
        ARM: 7514/1: integrator: call common init function from machine
        ARM: 7522/1: arch_timers: register a time/cycle counter
        ARM: 7523/1: arch_timers: enable the use of the virtual timer
        ARM: 7531/1: mark kernelmode mem{cpy,set} non-experimental
        ARM: 7520/1: Build dtb files in all target
        ARM: Fix build warning in arch/arm/mm/alignment.c
        ...
      0e51793e
    • Peter Senna Tschudin's avatar
      [media] drivers/media: Remove unnecessary semicolon · c2c1b415
      Peter Senna Tschudin authored
      A simplified version of the semantic patch that finds this problem is as
      follows: (http://coccinelle.lip6.fr/
      
      )
      // <smpl>
      @r1@
      statement S;
      position p,p1;
      @@
      S@p1;@p
      @script:python r2@
      p << r1.p;
      p1 << r1.p1;
      @@
      if p[0].line != p1[0].line_end:
              cocci.include_match(False)
      @@
      position r1.p;
      @@
      -;@p
      // </smpl>
      
      [mchehab@redhat.com: some hunks got bitroted; applied only the
       ones that succeeds]
      Signed-off-by: default avatarPeter Senna Tschudin <peter.senna@gmail.com>
      [crope@iki.fi: For my drivers a8293, af9013, af9015, af9035]
      Acked-by: default avatarAntti Palosaari <crope@iki.fi>
      Reviewed-by: default avatarAntti Palosaari <crope@iki.fi>
      Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
      c2c1b415
    • Linus Torvalds's avatar
      Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze · 5cad3598
      Linus Torvalds authored
      Pull microblaze arch updates from Michal Simek.
      
      * 'next' of git://git.monstr.eu/linux-2.6-microblaze:
        Revert "microblaze_mmu_v2: Update signal returning address"
        microblaze: Added more support for PCI
        microblaze: Prefer to use pr_XXX instead of printk(KERN_XX)
        microblaze: Fix bug with passing command line
        microblaze: Remove PAGE properties duplication
        microblaze: Remove additional andi which has been already done
        microblaze: Use predefined macro for ESR_DIZ
        microblaze: Support 4k/16k/64k pages
        microblaze: Do not used hardcoded value in exception handler
        microblaze: Added fdt chosen capability for timer
        microblaze: Add support for ioreadXX/iowriteXX_rep
        microblaze: Improve failure handling for GPIO reset
        microblaze: clinkage.h
      5cad3598
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security · 638c87a9
      Linus Torvalds authored
      Pull IMA bugfix (security subsystem) from James Morris.
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
        ima: fix bug in argument order
      638c87a9
    • Linus Torvalds's avatar
      Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu · 7cb9cf02
      Linus Torvalds authored
      Pull m68knommu arch updates from Greg Ungerer:
       "Most of it is a cleanup of the ColdFire hardware header files.  We
        have had a few occurrances of bugs caused by inconsistent definitions
        of peripheral addresses.  These patches make them all consistent, and
        also clean out a bunch of old crap.  Overall we remove about 1000
        lines."
      
      * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu: (27 commits)
        m68knommu: fix inconsistent formating in ColdFire 5407 definitions
        m68knommu: fix inconsistent formating in ColdFire 5307 definitions
        m68knommu: fix inconsistent formating in ColdFire 527x definitions
        m68knommu: fix inconsistent formating in ColdFire 5272 definitions
        m68knommu: fix inconsistent formating in ColdFire 523x definitions
        m68knommu: clean up ColdFire 54xx General Timer definitions
        m68knommu: clean up Pin Assignment definitions for the 54xx ColdFire CPU
        m68knommu: fix multi-function pin setup for FEC module on ColdFire 523x
        m68knommu: move ColdFire slice timer address defiens to 54xx header
        m68knommu: use read/write IO access functions in ColdFire m532x setup code
        m68knommu: modify ColdFire 532x GPIO register definitions to be consistent
        m68knommu: remove a lot of unsed definitions for 532x ColdFire
        m68knommu: use definitions for the ColdFire 528x FEC multi-function pins
        m68knommu: remove address offsets relative to IPSBAR for ColdFire 527x
        m68knommu: remove unused ColdFire 5282 register definitions
        m68knommu: fix wrong register offsets used for ColdFire 5272 multi-function pins
        m68knommu: make ColdFire 5249 MBAR2 register definitions absolute addresses
        m68knommu: make remaining ColdFire 5272 register definitions absolute addresses
        m68knommu: make ColdFire Park and Assignment register definitions absolute addresses
        m68knommu: make ColdFire Chip Select register definitions absolute addresses
        ...
      7cb9cf02
    • Linus Torvalds's avatar
      Merge branch 'virtio-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux · dc92b1f9
      Linus Torvalds authored
      Pull virtio changes from Rusty Russell:
       "New workflow: same git trees pulled by linux-next get sent straight to
        Linus.  Git is awkward at shuffling patches compared with quilt or mq,
        but that doesn't happen often once things get into my -next branch."
      
      * 'virtio-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux: (24 commits)
        lguest: fix occasional crash in example launcher.
        virtio-blk: Disable callback in virtblk_done()
        virtio_mmio: Don't attempt to create empty virtqueues
        virtio_mmio: fix off by one error allocating queue
        drivers/virtio/virtio_pci.c: fix error return code
        virtio: don't crash when device is buggy
        virtio: remove CONFIG_VIRTIO_RING
        virtio: add help to CONFIG_VIRTIO option.
        virtio: support reserved vqs
        virtio: introduce an API to set affinity for a virtqueue
        virtio-ring: move queue_index to vring_virtqueue
        virtio_balloon: not EXPERIMENTAL any more.
        virtio-balloon: dependency fix
        virtio-blk: fix NULL checking in virtblk_alloc_req()
        virtio-blk: Add REQ_FLUSH and REQ_FUA support to bio path
        virtio-blk: Add bio-based IO path for virtio-blk
        virtio: console: fix error handling in init() function
        tools: Fix pthread flag for Makefile of trace-agent used by virtio-trace
        tools: Add guest trace agent as a user tool
        virtio/console: Allocate scatterlist according to the current pipe size
        ...
      dc92b1f9
    • Sean Young's avatar
      [media] winbond: remove space from driver name · 54fd321e
      Sean Young authored
      
      
      -snip-
      ACTION=add
      DEVPATH=/devices/pnp0/00:04/rc/rc0
      DRV_NAME=Winbond CIR
      NAME=rc-rc6-mce
      SUBSYSTEM=rc
      UDEV_LOG=6
      USEC_INITIALIZED=88135858
      run: '/usr/bin/ir-keytable -a /etc/rc_maps.cfg -s rc0'
      Having a space makes it impossible to match in /etc/rc_maps.cfg.
      
      [root@pequod ~]# udevadm test /sys/class/rc/rc0
      Signed-off-by: default avatarSean Young <sean@mess.org>
      Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
      54fd321e
    • Sean Young's avatar
      [media] iguanair: cannot send data from the stack · 48b0fa6a
      Sean Young authored
      
      
      Note that the firmware already disables the receiver before transmit,
      there is no need to do this from the driver.
      
      Reported-by: default avatarFengguang Wu <fengguang.wu@intel.com>
      Signed-off-by: default avatarSean Young <sean@mess.org>
      Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
      48b0fa6a
    • Linus Torvalds's avatar
      Merge tag 'soc-late' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 5e090ed7
      Linus Torvalds authored
      Pull late ARM soc platform updates from Olof Johansson:
       "This branch contains updates to OMAP and Marvell platforms (kirkwood,
        dove, mvebu) that came in after we had done the big multiplatform
        merges, so they were kept separate from the rest, and not separated
        into the traditional topics of cleanup/driver/platform features.
      
        For OMAP, the updates are:
         - Runtime PM conversions for the GPMC and RNG IP blocks
         - Preparation patches for the OMAP common clock framework conversion
         - clkdev alias additions required by other drivers
         - Performance Monitoring Unit (PMU) support for OMAP2, 3, and
           non-4430 OMAP4
         - OMAP hwmod code and data improvements
         - Preparation patches for the IOMMU runtime PM conversion
         - Preparation patches for OMAP4 full-chip retention support
      
        For Kirkwood/Dove/mvebu:
         - New driver for "address decoder controller" for mvebu, which is a
           piece of hardware that configures addressable devices and
           peripherals.  First user is the boot rom aperture on armada XP
           since it is needed for SMP support.
         - New device tree bindings for peripherals such as gpio-fan, iconnect
           nand, mv_cesa and the above address decoder controller.
         - Some defconfig updates, mostly to enable new DT boards and a few
           drivers.
         - New drivers using the pincontrol subsystem for dove, kirkwood and
           mvebu
         - New clean gpio driver for mvebu"
      
      * tag 'soc-late' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (98 commits)
        ARM: mvebu: fix build breaks from multi-platform conversion
        ARM: OMAP4460/4470: PMU: Enable PMU for OMAP4460/70
        ARM: OMAP2+: PMU: Add runtime PM support
        ARM: OMAP4430: PMU: prepare to create PMU device via HWMOD
        ARM: OMAP2+: PMU: Convert OMAP2/3 devices to use HWMOD
        ARM: OMAP3: hwmod data: Add debugss HWMOD data
        ARM: OMAP2+: clockdomain/hwmod: add workaround for EMU clockdomain idle problems
        ARM: OMAP: Add a timer attribute for timers that can interrupt the DSP
        hwrng: OMAP: remove SoC restrictions from driver registration
        ARM: OMAP: split OMAP1, OMAP2+ RNG device registration
        hwrng: OMAP: convert to use runtime PM
        hwrng: OMAP: store per-device data in per-device variables, not file statics
        ARM: OMAP2xxx: hwmod/CM: add RNG integration data
        ARM: OMAP2+: gpmc: minimal driver support
        ARM: OMAP2+: gpmc: Adapt to HWMOD
        ARM: OMAP2/3: hwmod data: add gpmc
        ARM: OMAP4: hwmod data: add mmu hwmod for ipu and dsp
        ARM: OMAP3: hwmod data: add mmu data for iva and isp
        ARM: OMAP: iommu: fix including iommu.h without IOMMU_API selected
        ARM: OMAP4: hwmod data: add missing HWMOD_NO_IDLEST flags to some PRCM IP blocks
        ...
      5e090ed7
    • Linus Torvalds's avatar
      Merge tag 'defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 84424026
      Linus Torvalds authored
      Pull ARM soc defconfig updates from Olof Johansson:
       "This might be the last time we do a standalone defconfig branch, since
        we now prefer to get them with the rest of the subarch updates
        instead.  These add a handful of useful options on various platforms,
        enable new boards and SoCs, etc."
      
      * tag 'defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
        ARM: tegra: defconfig updates
        ARM: LPC32xx: Defconfig update
        ARM: mach-shmobile: marzen: defconfig update
        ARM: mxs_defconfig: Add SPI and LRADC support
        ARM: s3c6400_defconfig: enable more boards in defconfig
        ARM: imx_v6_v7_defconfig: Remove CONFIG_DEFAULT_MMAP_MIN_ADDR
        ARM: imx_v6_v7_defconfig: Add Chipidea USB driver support
        ARM: mxs_defconfig: Add framebuffer support
        ARM: mxs_defconfig: Add LED, PWM and MTD_CHAR support
        ARM: mxs_defconfig: Enable USB host
      84424026
    • Linus Torvalds's avatar
      Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media · 0b8e74c6
      Linus Torvalds authored
      Pull media updates from Mauro Carvalho Chehab:
       "The first part of the media updates for Kernel 3.7.
      
        This series contain:
      
         - A major tree renaming patch series: now, drivers are organized
           internally by their used bus, instead of by V4L2 and/or DVB API,
           providing a cleaner driver location for hybrid drivers that
           implement both APIs, and allowing to cleanup the Kconfig items and
           make them more intuitive for the end user;
      
         - Media Kernel developers are typically very lazy with their duties
           of keeping the MAINTAINERS entries for their drivers updated.  As
           now the tree is more organized, we're doing an effort to add/update
           those entries for the drivers that aren't currently orphan;
      
         - Several DVB USB drivers got moved to a new DVB USB v2 core; the new
           core fixes several bugs (as the existing one that got bitroted).
           Now, suspend/resume finally started to work fine (at least with
           some devices - we should expect more work with regards to it);
      
         - added multistream support for DVB-T2, and unified the API for
           DVB-S2 and ISDB-S.  Backward binary support is preserved;
      
         - as usual, a few new drivers, some V4L2 core improvements and lots
           of drivers improvements and fixes.
      
        There are some points to notice on this series:
      
         1) you should expect a trivial merge conflict on your tree, with the
            removal of Documentation/feature-removal-schedule.txt: this series
            would be adding two additional entries there.  I opted to not
            rebase it due to this recent change;
      
         2) With regards to the PCTV 520e udev-related breakage, I opted to
            fix it in a way that the patches can be backported to 3.5 even
            without your firmware fix patch.  This way, Greg doesn't need to
            rush backporting your patch (as there are still the firmware cache
            and firmware path customization issues to be addressed there).
      
            I'll send later a patch (likely after the end of the merge window)
            reverting the rest of the DRX-K async firmware request, fully
            restoring its original behaviour to allow media drivers to
            initialize everything serialized as before for 3.7 and upper.
      
         3) I'm planning to work on this weekend to test the DMABUF patches
            for V4L2.  The patches are on my queue for several Kernel cycles,
            but, up to now, there is/was no way to test the series locally.
      
            I have some concerns about this particular changeset with regards
            to security issues, and with regards to the replacement of the old
            VIDIOC_OVERLAY ioctl's that is broken on modern systems, due to
            GPU drivers change.  The Overlay API allows direct PCI2PCI
            transfers from a media capture card into the GPU framebuffer, but
            its API is crappy.  Also, the only existing X11 driver that
            implements it requires a XV extension that is not available
            anymore on modern drivers.  The DMABUF can do the same thing, but
            with it is promising to be a properly-designed API.  If I can
            successfully test this series and be happy with it, I should be
            asking you to pull them next week."
      
      * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (717 commits)
        em28xx: regression fix: use DRX-K sync firmware requests on em28xx
        drxk: allow loading firmware synchrousnously
        em28xx: Make all em28xx extensions to be initialized asynchronously
        [media] tda18271: properly report read errors in tda18271_get_id
        [media] tda18271: delay IR & RF calibration until init() if delay_cal is set
        [media] MAINTAINERS: add Michael Krufky as tda827x maintainer
        [media] MAINTAINERS: add Michael Krufky as tda8290 maintainer
        [media] MAINTAINERS: add Michael Krufky as cxusb maintainer
        [media] MAINTAINERS: add Michael Krufky as lg2160 maintainer
        [media] MAINTAINERS: add Michael Krufky as lgdt3305 maintainer
        [media] MAINTAINERS: add Michael Krufky as mxl111sf maintainer
        [media] MAINTAINERS: add Michael Krufky as mxl5007t maintainer
        [media] MAINTAINERS: add Michael Krufky as tda18271 maintainer
        [media] s5p-tv: Report only multi-plane capabilities in vidioc_querycap
        [media] s5p-mfc: Fix misplaced return statement in s5p_mfc_suspend()
        [media] exynos-gsc: Add missing static storage class specifiers
        [media] exynos-gsc: Remove <linux/version.h> header file inclusion
        [media] s5p-fimc: Fix incorrect condition in fimc_lite_reqbufs()
        [media] s5p-tv: Fix potential NULL pointer dereference error
        [media] s5k6aa: Fix possible NULL pointer dereference
        ...
      0b8e74c6
    • Arnd Bergmann's avatar
      ARM: footbridge: nw_gpio_lock is raw_spin_lock · 45ef6ac6
      Arnd Bergmann authored
      bd31b859
      
       "locking, ARM: Annotate low level hw locks as raw"
      made nw_gpio_lock a raw spinlock, but did not change all the
      users in device drivers. This fixes the remaining ones.
      
      sound/oss/waveartist.c: In function 'vnc_mute_spkr':
      sound/oss/waveartist.c:1485:2: warning: passing argument 1 of 'spinlock_check' from incompatible pointer type [enabled by default]
      include/linux/spinlock.h:272:102: note: expected 'struct spinlock_t *' but argument is of type 'struct raw_spinlock_t *'
      drivers/char/ds1620.c: In function 'netwinder_lock':
      drivers/char/ds1620.c:77:2: warning: passing argument 1 of 'spinlock_check' from incompatible pointer type [enabled by default]
      include/linux/spinlock.h:272:102: note: expected 'struct spinlock_t *' but argument is of type 'struct raw_spinlock_t *'
      drivers/char/nwflash.c: In function 'kick_open':
      drivers/char/nwflash.c:620:2: warning: passing argument 1 of 'spinlock_check' from incompatible pointer type [enabled by default]
      include/linux/spinlock.h:272:102: note: expected 'struct spinlock_t *' but argument is of type 'struct raw_spinlock_t *'
      
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      Cc: Thomas Gleixner <tglx@linutronix.de>
      Cc: Russell King <rmk+kernel@arm.linux.org.uk>
      45ef6ac6
    • Arnd Bergmann's avatar
      ARM: mv78xx0: correct addr_map_cfg __initdata annotation · edc9e333
      Arnd Bergmann authored
      
      
      The annotation on the addr_map_cfg variable is in the wrong place.
      
      Without this patch, building mv78xx0_defconfig results in:
      
      /home/arnd/linux-arm/arch/arm/mach-mv78xx0/addr-map.c:59:2: warning: initialization from incompatible pointer type [enabled by default]
      /home/arnd/linux-arm/arch/arm/mach-mv78xx0/addr-map.c:59:2: warning: (near initialization for 'addr_map_cfg.win_cfg_base') [enabled by default]
      
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      Acked-by: default avatarAndrew Lunn <andrew@lunn.ch>
      Cc: Jason Cooper <jason@lakedaemon.net>
      edc9e333