Skip to content
  1. Sep 30, 2014
  2. Sep 22, 2014
    • Markos Chandras's avatar
      MIPS: pgtable.h: Implement the pgprot_writecombine function for MIPS · 4b050ba7
      Markos Chandras authored
      
      
      Previously, the pgprot_writecombine function was simply defined
      as pgprot_uncached in include/asm-generic/pgtable.h. This is not
      optimal for cores that can actually do write-combine memory writes
      so define this function to take into account the core's cache coherency
      attribute to achieve such behavior.
      
      Signed-off-by: default avatarMarkos Chandras <markos.chandras@imgtec.com>
      Cc: linux-mips@linux-mips.org
      Patchwork: https://patchwork.linux-mips.org/patch/7403/
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      4b050ba7
    • Markos Chandras's avatar
      MIPS: cpu-probe: Set the write-combine CCA value on per core basis · 4f12b91d
      Markos Chandras authored
      
      
      Different cores use different CCA values to achieve write-combine
      memory writes. For cores that do not support write-combine we
      set the default value to CCA:2 (uncached, non-coherent) which is the
      default value as set by the kernel.
      
      Signed-off-by: default avatarMarkos Chandras <markos.chandras@imgtec.com>
      Cc: linux-mips@linux-mips.org
      Patchwork: https://patchwork.linux-mips.org/patch/7402/
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      4f12b91d
    • Markos Chandras's avatar
      MIPS: pgtable-bits: Define the CCA bit for WC writes on Ingenic cores · 80bc94d1
      Markos Chandras authored
      
      
      Ingenic uses the CCA:1 bit to achieve write-combine memory writes.
      
      Signed-off-by: default avatarMarkos Chandras <markos.chandras@imgtec.com>
      Cc: linux-mips@linux-mips.org
      Patchwork: https://patchwork.linux-mips.org/patch/7401/
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      80bc94d1
    • Markos Chandras's avatar
      MIPS: pgtable-bits: Move the CCA bits out of the core's ifdef blocks · fb020350
      Markos Chandras authored
      
      
      Define all the CCA bits outside the ifdef blocks for specific cores
      but also allow cores to override them if necessary.
      
      Signed-off-by: default avatarMarkos Chandras <markos.chandras@imgtec.com>
      Cc: linux-mips@linux-mips.org
      Patchwork: https://patchwork.linux-mips.org/patch/7400/
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      fb020350
    • Zubair Lutfullah Kakakhel's avatar
      MIPS: DMA: Add cma support · f4649382
      Zubair Lutfullah Kakakhel authored
      
      
      Adds cma support to the MIPS architecture.
      
      cma uses memblock. However, mips uses bootmem.
      bootmem is informed about any regions reserved by memblock
      
      dma api is modified to use cma reserved memory regions when available
      
      Tested using cma_test. cma_test is a simple driver that assigns blocks
      of memory from cma reserved sections.
      
      Signed-off-by: default avatarZubair Lutfullah Kakakhel <Zubair.Kakakhel@imgtec.com>
      Acked-by: default avatarMichal Nazarewicz <mina86@mina86.com>
      Cc: catalin.marinas@arm.com
      Cc: will.deacon@arm.com
      Cc: tglx@linutronix.de
      Cc: mingo@redhat.com
      Cc: hpa@zytor.com
      Cc: arnd@arndb.de
      Cc: gregkh@linuxfoundation.org
      Cc: m.szyprowski@samsung.com
      Cc: x86@kernel.org
      Cc: linux-arm-kernel@lists.infradead.org
      Cc: linux-kernel@vger.kernel.org
      Cc: linux-mips@linux-mips.org
      Cc: linux-arch@vger.kernel.org
      Patchwork: https://patchwork.linux-mips.org/patch/7360/
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      f4649382
    • Zubair Lutfullah Kakakhel's avatar
      x86: use generic dma-contiguous.h · 8057b308
      Zubair Lutfullah Kakakhel authored
      
      
      dma-contiguous.h is now in asm-generic. Use that to avoid code
      repetition in x86.
      
      Signed-off-by: default avatarZubair Lutfullah Kakakhel <Zubair.Kakakhel@imgtec.com>
      Acked-by: default avatarMichal Nazarewicz <mina86@mina86.com>
      Cc: catalin.marinas@arm.com
      Cc: will.deacon@arm.com
      Cc: tglx@linutronix.de
      Cc: mingo@redhat.com
      Cc: hpa@zytor.com
      Cc: arnd@arndb.de
      Cc: gregkh@linuxfoundation.org
      Cc: m.szyprowski@samsung.com
      Cc: x86@kernel.org
      Cc: linux-arm-kernel@lists.infradead.org
      Cc: linux-kernel@vger.kernel.org
      Cc: linux-mips@linux-mips.org
      Cc: linux-arch@vger.kernel.org
      Patchwork: https://patchwork.linux-mips.org/patch/7359/
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      8057b308
    • Zubair Lutfullah Kakakhel's avatar
      arm64: use generic dma-contiguous.h · 2f06dbe4
      Zubair Lutfullah Kakakhel authored
      
      
      dma-contiguous.h is now in asm-generic. Use that to avoid code
      repetition in arm64.
      
      Signed-off-by: default avatarZubair Lutfullah Kakakhel <Zubair.Kakakhel@imgtec.com>
      Acked-by: default avatarMichal Nazarewicz <mina86@mina86.com>
      Acked-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
      Cc: will.deacon@arm.com
      Cc: tglx@linutronix.de
      Cc: mingo@redhat.com
      Cc: hpa@zytor.com
      Cc: arnd@arndb.de
      Cc: gregkh@linuxfoundation.org
      Cc: m.szyprowski@samsung.com
      Cc: x86@kernel.org
      Cc: linux-arm-kernel@lists.infradead.org
      Cc: linux-kernel@vger.kernel.org
      Cc: linux-mips@linux-mips.org
      Cc: linux-arch@vger.kernel.org
      Patchwork: https://patchwork.linux-mips.org/patch/7358/
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      2f06dbe4
    • Zubair Lutfullah Kakakhel's avatar
      asm-generic: Add dma-contiguous.h · 02d31c7d
      Zubair Lutfullah Kakakhel authored
      
      
      This header is used by arm64 and x86 individually.
      
      Adding to asm-generic to avoid further code repetition while adding cma
      to mips.
      
      Signed-off-by: default avatarZubair Lutfullah Kakakhel <Zubair.Kakakhel@imgtec.com>
      Acked-by: default avatarMichal Nazarewicz <mina86@mina86.com>
      Cc: catalin.marinas@arm.com
      Cc: will.deacon@arm.com
      Cc: tglx@linutronix.de
      Cc: mingo@redhat.com
      Cc: hpa@zytor.com
      Cc: arnd@arndb.de
      Cc: gregkh@linuxfoundation.org
      Cc: m.szyprowski@samsung.com
      Cc: x86@kernel.org
      Cc: linux-arm-kernel@lists.infradead.org
      Cc: linux-kernel@vger.kernel.org
      Cc: linux-mips@linux-mips.org
      Cc: linux-arch@vger.kernel.org
      Patchwork: https://patchwork.linux-mips.org/patch/7357/
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      02d31c7d
    • Markos Chandras's avatar
      MIPS: BPF: Add new emit_long_instr macro · 39bcb796
      Markos Chandras authored
      
      
      This macro uses the capitalized UASM_* macros to emit 32 or 64-bit
      instructions depending on the kernel configurations. This allows
      us to remove a few CONFIG_64BIT ifdefs from the code.
      
      Signed-off-by: default avatarMarkos Chandras <markos.chandras@imgtec.com>
      Cc: linux-mips@linux-mips.org
      Patchwork: https://patchwork.linux-mips.org/patch/7446/
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      39bcb796
    • Andrew Bresticker's avatar
      MIPS: ralink: Move device-trees to arch/mips/boot/dts/ · 011eeece
      Andrew Bresticker authored
      
      
      Move the Ralink device-trees to arch/mips/boot/dts/ and update the
      Makefiles accordingly.  A built-in device-tree is optional, so select
      BUILTIN_DTB when it is requested.
      
      Signed-off-by: default avatarAndrew Bresticker <abrestic@chromium.org>
      Cc: Rob Herring <robh+dt@kernel.org>
      Cc: Pawel Moll <pawel.moll@arm.com>
      Cc: Mark Rutland <mark.rutland@arm.com>
      Cc: Ian Campbell <ijc+devicetree@hellion.org.uk>
      Cc: Kumar Gala <galak@codeaurora.org>
      Cc: James Hogan <james.hogan@imgtec.com>
      Cc: Paul Burton <paul.burton@imgtec.com>
      Cc: David Daney <david.daney@cavium.com>
      Cc: John Crispin <blogic@openwrt.org>
      Cc: Jayachandran C <jchandra@broadcom.com>
      Cc: Qais Yousef <qais.yousef@imgtec.com>
      Cc: linux-mips@linux-mips.org
      Cc: linux-kernel@vger.kernel.org
      Cc: devicetree@vger.kernel.org
      Patchwork: https://patchwork.linux-mips.org/patch/7561/
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      011eeece
    • Andrew Bresticker's avatar
      MIPS: Netlogic: Move device-trees to arch/mips/boot/dts/ · 36094619
      Andrew Bresticker authored
      
      
      Move the Netlogic XLP device-trees to arch/mips/boot/dts/ and update the
      Makefiles accordingly.  A built-in device-tree is optional, so select
      BUILTIN_DTB when it is requested.
      
      Signed-off-by: default avatarAndrew Bresticker <abrestic@chromium.org>
      Cc: Rob Herring <robh+dt@kernel.org>
      Cc: Pawel Moll <pawel.moll@arm.com>
      Cc: Mark Rutland <mark.rutland@arm.com>
      Cc: Ian Campbell <ijc+devicetree@hellion.org.uk>
      Cc: Kumar Gala <galak@codeaurora.org>
      Cc: James Hogan <james.hogan@imgtec.com>
      Cc: Paul Burton <paul.burton@imgtec.com>
      Cc: David Daney <david.daney@cavium.com>
      Cc: John Crispin <blogic@openwrt.org>
      Cc: Jayachandran C <jchandra@broadcom.com>
      Cc: Qais Yousef <qais.yousef@imgtec.com>
      Cc: linux-mips@linux-mips.org
      Cc: linux-kernel@vger.kernel.org
      Cc: devicetree@vger.kernel.org
      Patchwork: https://patchwork.linux-mips.org/patch/7560/
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      36094619
    • Andrew Bresticker's avatar
      MIPS: sead3: Move device-trees to arch/mips/boot/dts/ · f262b5f2
      Andrew Bresticker authored
      
      
      Move the SEAD-3 device-tree to arch/mips/boot/dts/ and update the
      Makefiles accordingly.  Since SEAD-3 requires the device-tree to be
      built into the kernel, select BUILTIN_DTB when building for SEAD-3.
      
      Signed-off-by: default avatarAndrew Bresticker <abrestic@chromium.org>
      Cc: Rob Herring <robh+dt@kernel.org>
      Cc: Pawel Moll <pawel.moll@arm.com>
      Cc: Mark Rutland <mark.rutland@arm.com>
      Cc: Ian Campbell <ijc+devicetree@hellion.org.uk>
      Cc: Kumar Gala <galak@codeaurora.org>
      Cc: James Hogan <james.hogan@imgtec.com>
      Cc: Paul Burton <paul.burton@imgtec.com>
      Cc: David Daney <david.daney@cavium.com>
      Cc: John Crispin <blogic@openwrt.org>
      Cc: Jayachandran C <jchandra@broadcom.com>
      Cc: Qais Yousef <qais.yousef@imgtec.com>
      Cc: linux-mips@linux-mips.org
      Cc: linux-kernel@vger.kernel.org
      Cc: devicetree@vger.kernel.org
      Patchwork: https://patchwork.linux-mips.org/patch/7555/
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      f262b5f2
    • Andrew Bresticker's avatar
      MIPS: Lantiq: Move device-trees to arch/mips/boot/dts/ · 3229a6d8
      Andrew Bresticker authored
      
      
      Move the Lantiq device-trees to arch/mips/boot/dts/ and update the
      Makefiles accordingly.  There is currently only a single Lantiq
      device-tree (EASY50712), and it's required to be built into the kernel,
      so select BUILTIN_DTB for it.
      
      Signed-off-by: default avatarAndrew Bresticker <abrestic@chromium.org>
      Cc: Rob Herring <robh+dt@kernel.org>
      Cc: Pawel Moll <pawel.moll@arm.com>
      Cc: Mark Rutland <mark.rutland@arm.com>
      Cc: Ian Campbell <ijc+devicetree@hellion.org.uk>
      Cc: Kumar Gala <galak@codeaurora.org>
      Cc: James Hogan <james.hogan@imgtec.com>
      Cc: Paul Burton <paul.burton@imgtec.com>
      Cc: David Daney <david.daney@cavium.com>
      Cc: John Crispin <blogic@openwrt.org>
      Cc: Jayachandran C <jchandra@broadcom.com>
      Cc: Qais Yousef <qais.yousef@imgtec.com>
      Cc: linux-mips@linux-mips.org
      Cc: linux-kernel@vger.kernel.org
      Cc: devicetree@vger.kernel.org
      Patchwork: https://patchwork.linux-mips.org/patch/7559/
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      3229a6d8
    • Andrew Bresticker's avatar
      MIPS: Octeon: Move device-trees to arch/mips/boot/dts/ · e326479f
      Andrew Bresticker authored
      
      
      Move the Octeon device-trees to arch/mips/boot/dts/ and update the
      Makefiles accordingly.  Since Octeon requires the device-tree to be
      built into the kernel, select BUILTIN_DTB as well.
      
      Signed-off-by: default avatarAndrew Bresticker <abrestic@chromium.org>
      Cc: Rob Herring <robh+dt@kernel.org>
      Cc: Pawel Moll <pawel.moll@arm.com>
      Cc: Mark Rutland <mark.rutland@arm.com>
      Cc: Ian Campbell <ijc+devicetree@hellion.org.uk>
      Cc: Kumar Gala <galak@codeaurora.org>
      Cc: James Hogan <james.hogan@imgtec.com>
      Cc: Paul Burton <paul.burton@imgtec.com>
      Cc: David Daney <david.daney@cavium.com>
      Cc: John Crispin <blogic@openwrt.org>
      Cc: Jayachandran C <jchandra@broadcom.com>
      Cc: Qais Yousef <qais.yousef@imgtec.com>
      Cc: linux-mips@linux-mips.org
      Cc: linux-kernel@vger.kernel.org
      Cc: devicetree@vger.kernel.org
      Patchwork: https://patchwork.linux-mips.org/patch/7556/
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      e326479f
    • Andrew Bresticker's avatar
      MIPS: Add support for building device-tree binaries · c8d333df
      Andrew Bresticker authored
      
      
      Add a 'dtbs' Makefile target that just builds the device-tree binaries
      enabled by the configuration.
      
      Signed-off-by: default avatarAndrew Bresticker <abrestic@chromium.org>
      Cc: Rob Herring <robh+dt@kernel.org>
      Cc: Pawel Moll <pawel.moll@arm.com>
      Cc: Mark Rutland <mark.rutland@arm.com>
      Cc: Ian Campbell <ijc+devicetree@hellion.org.uk>
      Cc: Kumar Gala <galak@codeaurora.org>
      Cc: James Hogan <james.hogan@imgtec.com>
      Cc: Paul Burton <paul.burton@imgtec.com>
      Cc: David Daney <david.daney@cavium.com>
      Cc: John Crispin <blogic@openwrt.org>
      Cc: Jayachandran C <jchandra@broadcom.com>
      Cc: Qais Yousef <qais.yousef@imgtec.com>
      Cc: linux-mips@linux-mips.org
      Cc: linux-kernel@vger.kernel.org
      Cc: devicetree@vger.kernel.org
      Patchwork: https://patchwork.linux-mips.org/patch/7557/
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      c8d333df
    • Andrew Bresticker's avatar
      MIPS: Create common infrastructure for building built-in device-trees · 7fafb068
      Andrew Bresticker authored
      
      
      In preparation for moving the device-trees to a common location,
      introduce the config option BUILTIN_DTB, which can be selected by
      platforms that use a device-tree built into the kernel image, and
      create a Makefile to build the device-trees in arch/mips/boot/dts/.
      
      Signed-off-by: default avatarAndrew Bresticker <abrestic@chromium.org>
      Cc: Rob Herring <robh+dt@kernel.org>
      Cc: Pawel Moll <pawel.moll@arm.com>
      Cc: Mark Rutland <mark.rutland@arm.com>
      Cc: Ian Campbell <ijc+devicetree@hellion.org.uk>
      Cc: Kumar Gala <galak@codeaurora.org>
      Cc: James Hogan <james.hogan@imgtec.com>
      Cc: Paul Burton <paul.burton@imgtec.com>
      Cc: David Daney <david.daney@cavium.com>
      Cc: John Crispin <blogic@openwrt.org>
      Cc: Jayachandran C <jchandra@broadcom.com>
      Cc: Qais Yousef <qais.yousef@imgtec.com>
      Cc: linux-mips@linux-mips.org
      Cc: linux-kernel@vger.kernel.org
      Cc: devicetree@vger.kernel.org
      Patchwork: https://patchwork.linux-mips.org/patch/7564/
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      7fafb068
    • Markos Chandras's avatar
      MIPS: SEAD3: Enable DEVTMPFS · bfe03079
      Markos Chandras authored
      This is similar to 68f30ba7
      
      
      "MIPS: Malta: Enable DEVTMPFS"
      
      Signed-off-by: default avatarMarkos Chandras <markos.chandras@imgtec.com>
      Cc: linux-mips@linux-mips.org
      Patchwork: https://patchwork.linux-mips.org/patch/6738/
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      bfe03079
    • Markos Chandras's avatar
      MIPS: SEAD3: Regenerate defconfigs · ff848c9f
      Markos Chandras authored
      This is similar to a86dc812
      
      
      "MIPS: Regenerate malta defconfigs"
      
      Signed-off-by: default avatarMarkos Chandras <markos.chandras@imgtec.com>
      Cc: linux-mips@linux-mips.org
      Patchwork: https://patchwork.linux-mips.org/patch/6737/
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      ff848c9f
    • Manuel Lauss's avatar
      MIPS: Alchemy: DB1300: Add touch penirq support · c64bb5f0
      Manuel Lauss authored
      
      
      wire up the WM9713 pendown irq support.
      
      Signed-off-by: default avatarManuel Lauss <manuel.lauss@gmail.com>
      Cc: Linux-MIPS <linux-mips@linux-mips.org>
      Patchwork: https://patchwork.linux-mips.org/patch/7563/
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      c64bb5f0
    • Manuel Lauss's avatar
      MIPS: Alchemy: DB1xxx: Explicitly set 50MHz clock for I2C/SPI units. · c02a505e
      Manuel Lauss authored
      
      
      Add an explicit call to set the desired rate to get the correct
      clock routing for the PSC clocks.  It wasn't broken before, but
      now it's less affected by bootloader changes.
      
      Signed-off-by: default avatarManuel Lauss <manuel.lauss@gmail.com>
      Cc: Linux-MIPS <linux-mips@linux-mips.org>
      Patchwork: https://patchwork.linux-mips.org/patch/7554/
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      c02a505e
    • Manuel Lauss's avatar
      MIPS: Alchemy: Update cpu-feature-overrides · 7ec32e49
      Manuel Lauss authored
      
      
      More features the Au1 core definitely doesn't have.
      
      Signed-off-by: default avatarManuel Lauss <manuel.lauss@gmail.com>
      Cc: Linux-MIPS <linux-mips@linux-mips.org>
      Patchwork: https://patchwork.linux-mips.org/patch/7562/
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      7ec32e49
    • Manuel Lauss's avatar
      MIPS: Alchemy: devboards: sit and spin after poweroff · 092ea466
      Manuel Lauss authored
      
      
      On boards which don't support poweroff, systemd complains about this fact.
      In case poweroff fails, just sit and spin in the wait loop.
      
      Signed-off-by: default avatarManuel Lauss <manuel.lauss@gmail.com>
      Cc: Linux-MIPS <linux-mips@linux-mips.org>
      Cc: Manuel Lauss <manuel.lauss@gmail.com>
      Patchwork: https://patchwork.linux-mips.org/patch/7558/
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      092ea466
    • Chen Jie's avatar
      MIPS: Use WSBH/DSBH/DSHD on Loongson 3A · 3c09bae4
      Chen Jie authored
      
      
      Signed-off-by: default avatarchenj <chenj@lemote.com>
      Cc: linux-mips@linux-mips.org
      Cc: chenhc@lemote.com
      Patchwork: https://patchwork.linux-mips.org/patch/7542/
      Patchwork: https://patchwork.linux-mips.org/patch/7550/
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      3c09bae4
    • Linus Torvalds's avatar
      Linux 3.17-rc6 · 0f33be00
      Linus Torvalds authored
      0f33be00
    • Linus Torvalds's avatar
      Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm · dae0af78
      Linus Torvalds authored
      Pull ARM fixes from Russell King:
       "Fixes for ARM, the most notable being the fix from Nathan Lynch to fix
        the state of various registers during execve, to ensure that data
        can't be leaked between two executables.
      
        Fixes from Victor Kamensky for get_user() on big endian platforms,
        since the addition of 8-byte get_user() support broke these fairly
        badly.
      
        A fix from Sudeep Holla for affinity setting when hotplugging CPU 0.
      
        A fix from Stephen Boyd for a perf-induced sleep attempt while atomic.
      
        Lastly, a correctness fix for emulation of the SWP instruction on
        ARMv7+, and a fix for wrong carry handling when updating the
        translation table base address on LPAE platforms"
      
      * 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
        ARM: 8149/1: perf: Don't sleep while atomic when enabling per-cpu interrupts
        ARM: 8148/1: flush TLS and thumbee register state during exec
        ARM: 8151/1: add missing exports for asm functions required by get_user macro
        ARM: 8137/1: fix get_user BE behavior for target variable with size of 8 bytes
        ARM: 8135/1: Fix in-correct barrier usage in SWP{B} emulation
        ARM: 8133/1: use irq_set_affinity with force=false when migrating irqs
        ARM: 8132/1: LPAE: drop wrong carry flag correction after adding TTBR1_OFFSET
      dae0af78
    • Linus Torvalds's avatar
      Merge tag 'media-v3.17-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media · c1f03b48
      Linus Torvalds authored
      Pull media fixes from Mauro Carvalho Chehab:
       "some media bug fixes:
         - a Kconfig dependency issue
         - some fixes for af9033/it913x demod to be more reliable and address
           a performance regression
         - cx18: fix an oops on devices with tda8290 tuner
         - two new USB IDs for af9035
         - a couple fixes on smapp driver"
      
      * tag 'media-v3.17-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
        [media] af9035: new IDs: add support for PCTV 78e and PCTV 79e
        [media] af9033: feed clock to RF tuner
        [media] it913x: init tuner on attach
        [media] af9033: update IT9135 tuner inittabs
        [media] Kconfig: do not select SPI bus on sub-driver auto-select
        [media] cx18: fix kernel oops with tda8290 tuner
        [media] smiapp: Set sub-device owner
        [media] smiapp: Fix power count handling
      c1f03b48
  3. Sep 21, 2014
    • Linus Torvalds's avatar
      Merge tag 'staging-3.17-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging · 3c2ea702
      Linus Torvalds authored
      Pull staging / IIO fixes from Greg KH:
       "Here are some IIO and Staging driver fixes for 3.17-rc6.  They are all
        pretty simple, and resolve reported issues"
      
      * tag 'staging-3.17-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
        staging: vt6655: buffer overflow in ioctl
        iio:magnetometer: bugfix magnetometers gain values
        iio: adc: at91: don't use the last converted data register
        iio: adc: xilinx-xadc: assign auxiliary channels address correctly
        iio: meter: ade7758: Fix indio_dev->trig assignment
        iio: inv_mpu6050: Fix indio_dev->trig assignment
        iio: gyro: itg3200: Fix indio_dev->trig assignment
        iio: st_sensors: Fix indio_dev->trig assignment
        iio: hid_sensor_hub: Fix indio_dev->trig assignment
        iio: adc: ad_sigma_delta: Fix indio_dev->trig assignment
        iio: accel: bma180: Fix indio_dev->trig assignment
        iio:trigger: modify return value for iio_trigger_get
        iio:inkern: fix overwritten -EPROBE_DEFER in of_iio_channel_get_by_name
      3c2ea702
    • Linus Torvalds's avatar
      Merge tag 'usb-3.17-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb · c1fb79e2
      Linus Torvalds authored
      Pull USB fixes / quirks from Greg KH:
       "Here are some USB and PHY fixes and quirks for 3.17-rc6.  Nothing
        major, just a few things that have been reported"
      
      * tag 'usb-3.17-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
        USB: storage: Add quirks for Entrega/Xircom USB to SCSI converters
        USB: storage: Add quirk for Ariston Technologies iConnect USB to SCSI adapter
        USB: storage: Add quirk for Adaptec USBConnect 2000 USB-to-SCSI Adapter
        USB: EHCI: unlink QHs even after the controller has stopped
        phy: spear1340-miphy: fix driver dependencies
        phy: spear1310-miphy: fix driver dependencies
        phy: miphy365x: Fix off-by-one error
      c1fb79e2
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending · 0d951433
      Linus Torvalds authored
      Pull SCSI target fixes from Nicholas Bellinger:
       "Here are the target pending fixes for v3.17-rc6.
      
        Included are Sagi's long overdue fixes related to iser-target
        shutdown, along with a couple of fixes from Sebastian related to ALUA
        Referrals changes that when in during the v3.14 time-frame.
      
        Also included are a few iscsi-target fixes, most recently of which
        where found during Joern's Coverity scanning of target code"
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending:
        iscsi-target: avoid NULL pointer in iscsi_copy_param_list failure
        iscsi-target: Fix memory corruption in iscsit_logout_post_handler_diffcid
        target: Fix inverted logic in SE_DEV_ALUA_SUPPORT_STATE_STORE
        target: Fix user data segment multiplier in spc_emulate_evpd_b3()
        iscsi-target: Ignore ICF_GOT_LAST_DATAOUT during Data-Out ITT lookup
        Target/iser: Fix initiator_depth and responder_resources
        Target/iser: Avoid calling rdma_disconnect twice
        Target/iser: Don't put isert_conn inside disconnected handler
        Target/iser: Get isert_conn reference once got to connected_handler
      0d951433
    • Linus Torvalds's avatar
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · 1734a6e4
      Linus Torvalds authored
      Pull drm fixes from Dave Airlie:
       "A bunch of radeon fixes for oops on module unload, and problems with
        resetting the dma engine, one nouveau fix for black boxes in rendering
        on my mbp retina, one sti fix, and a couple of intel fixes"
      
      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
        drm/nouveau: ltc/gf100-: fix cbc issues on certain boards
        drm/bochs: add missing drm_connector_register call
        drm/cirrus: add missing drm_connector_register call
        drm/radeon: Fix typo 'addr' -> 'entry' in rs400_gart_set_page
        drm/nouveau/runpm: fix module unload
        drm/radeon/px: fix module unload
        vgaswitcheroo: add vga_switcheroo_fini_domain_pm_ops
        drm/radeon: don't reset dma on r6xx-evergreen init
        drm/radeon: don't reset sdma on CIK init
        drm/radeon: don't reset dma on NI/SI init
        drm/radeon/dpm: fix resume on mullins
        drm/radeon: Disable HDP flush before every CS again for < r600
        drm/radeon: delete unused PTE_* defines
        drm/i915: Add limited color range readout for HDMI/DP ports on g4x/vlv/chv
        drm: sti: do not iterate over the info frame array
        drm/i915: Fix SRC_COPY width on 830/845g
      1734a6e4
  4. Sep 20, 2014
    • Ben Skeggs's avatar
      drm/nouveau: ltc/gf100-: fix cbc issues on certain boards · fe3d9c4b
      Ben Skeggs authored
      
      
      A mismatch between FB and LTC's idea of how big a large page is causes
      issues such as black "holes" in rendering to occur on some boards
      (those where LTC is configured for 64KiB large pages) when compression
      is used.
      
      Confirmed to fix at least the GK107 MBP.
      
      Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      fe3d9c4b
    • Dave Airlie's avatar
      Merge branch 'drm-fixes-3.17' of git://people.freedesktop.org/~agd5f/linux into drm-fixes · 92a32a47
      Dave Airlie authored
      single fix for regression on rs4xx/rs690/rs740
      * 'drm-fixes-3.17' of git://people.freedesktop.org/~agd5f/linux:
        drm/radeon: Fix typo 'addr' -> 'entry' in rs400_gart_set_page
      92a32a47
    • Gerd Hoffmann's avatar
      b1fb0124
    • Gerd Hoffmann's avatar
      c5267091
    • Dan Carpenter's avatar
      staging: vt6655: buffer overflow in ioctl · ed87c2b2
      Dan Carpenter authored
      
      
      ->u.generic_elem.len is a user controlled number between 0-255.  We
      should limit it to avoid memory corruption.
      
      Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      ed87c2b2
    • Greg Kroah-Hartman's avatar
      Merge tag 'iio-fixes-3.17a' of... · 922b83b4
      Greg Kroah-Hartman authored
      Merge tag 'iio-fixes-3.17a' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus
      
      Jonathan writes:
      
      First round of IIO fixes for the 3.17 cycle.
      
      * Fix an overwritten error return that can prevent deferred probing when
        using of_iio_channel_get_by_name
      * A series that deals with an incorrect reference count when the default
        trigger is set within the main probe routine for a driver.  Can result
        in a double free if the trigger is changed.
      * Fix a buglet with xilinx-xadc concerning setup of the address for an
        aux channel.
      * At91 adc driver could sometimes get a touchscreen reading rather than
        the intended adc channel.  This is fixed by using the channel data register
        instead.
      * Fix some ST magnetometer gain values that differ in production parts from
        the prerelease ones used for driver development.
      922b83b4
    • Mark's avatar
      USB: storage: Add quirks for Entrega/Xircom USB to SCSI converters · c80b4495
      Mark authored
      
      
      This patch adds quirks for Entrega Technologies (later Xircom PortGear) USB-
      SCSI converters. They use Shuttle Technology EUSB-01/EUSB-S1 chips. The
      US_FL_SCM_MULT_TARG quirk is needed to allow multiple devices on the SCSI
      chain to be accessed. Without it only the (single) device with SCSI ID 0
      can be used.
      
      The standalone converter sold by Entrega had model number U1-SC25. Xircom
      acquired Entrega and re-branded the product line PortGear. The PortGear USB
      to SCSI Converter (model PGSCSI) is internally identical to the Entrega
      product, but later models may use a different USB ID. The Entrega-branded
      units have USB ID 1645:0007, as does my Xircom PGSCSI, but the Windows and
      Macintosh drivers also support 085A:0028.
      
      Entrega also sold the "Mac USB Dock", which provides two USB ports, a Mac
      (8-pin mini-DIN) serial port and a SCSI port. It appears to the computer as
      a four-port hub, USB-serial, and USB-SCSI converters. The USB-SCSI part may
      have initially used the same ID as the standalone U1-SC25 (1645:0007), but
      later production used 085A:0026.
      
      My Xircom PortGear PGSCSI has bcdDevice=0x0100. Units with bcdDevice=0x0133
      probably also exist.
      
      This patch adds quirks for 1645:0007, 085A:0026 and 085A:0028. The Windows
      driver INF file also mentions 085A:0032 "PortStation SCSI Module", but I
      couldn't find any mention of that actually existing in the wild; perhaps it
      was cancelled before release?
      
      Signed-off-by: default avatarMark Knibbs <markk@clara.co.uk>
      Cc: stable <stable@vger.kernel.org>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      c80b4495
    • Mark's avatar
      USB: storage: Add quirk for Ariston Technologies iConnect USB to SCSI adapter · b6a3ed67
      Mark authored
      
      
      Hi,
      
      The Ariston Technologies iConnect 025 and iConnect 050 (also known as e.g.
      iSCSI-50) are SCSI-USB converters which use Shuttle Technology/SCM
      Microsystems chips. Only the connectors differ; both have the same USB ID.
      The US_FL_SCM_MULT_TARG quirk is required to use SCSI devices with ID other
      than 0.
      
      I don't have one of these, but based on the other entries for Shuttle/
      SCM-based converters this patch is very likely correct. I used 0x0000 and
      0x9999 for bcdDeviceMin and bcdDeviceMax because I'm not sure which
      bcdDevice value the products use.
      
      Signed-off-by: default avatarMark Knibbs <markk@clara.co.uk>
      Cc: stable <stable@vger.kernel.org>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      b6a3ed67
    • Mark's avatar
      USB: storage: Add quirk for Adaptec USBConnect 2000 USB-to-SCSI Adapter · 67d365a5
      Mark authored
      
      
      The Adaptec USBConnect 2000 is another SCSI-USB converter which uses
      Shuttle Technology/SCM Microsystems chips. The US_FL_SCM_MULT_TARG quirk is
      required to use SCSI devices with ID other than 0.
      
      I don't have a USBConnect 2000, but based on the other entries for Shuttle/
      SCM-based converters this patch is very likely correct. I used 0x0000 and
      0x9999 for bcdDeviceMin and bcdDeviceMax because I'm not sure which
      bcdDevice value the product uses.
      
      Signed-off-by: default avatarMark Knibbs <markk@clara.co.uk>
      Cc: stable <stable@vger.kernel.org>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      67d365a5