1. 09 7月, 2014 9 次提交
    • C
      mfd: arizona: Disable PM runtime at start of driver removal · b804020a
      Charles Keepax 提交于
      We don't want to trigger any PM runtime operations whilst we are tearing
      down the driver, as things the suspend and resume callbacks rely on
      might already have been destroyed. So disable PM runtime for the device
      as the first step arizona_dev_exit.
      Signed-off-by: NCharles Keepax <ckeepax@opensource.wolfsonmicro.com>
      Signed-off-by: NLee Jones <lee.jones@linaro.org>
      b804020a
    • L
      mfd: tc3589x: Translate onecell, not twocell · 627918ed
      Linus Walleij 提交于
      Something changed in the OF parser in the v3.16 merge window
      making it be strict about passing the number of IRQ cells
      correctly and disturbing the irqdomain xlate function guard
      to crash when subdevices try to obtain IRQs like this:
      
      ------------[ cut here ]------------
      WARNING: CPU: 0 PID: 1 at
      /home/linus/linux-stericsson/kernel/irq/irqdomain.c:676
      irq_domain_xlate_twocell+0x40/0x48()
      Modules linked in:
      CPU: 0 PID: 1 Comm: swapper/0 Not tainted
       3.15.0-07915-gf6d059821ce9-dirty #46
      [<c0014660>] (unwind_backtrace)
       from [<c0011424>] (show_stack+0x10/0x14)
      [<c0011424>] (show_stack)
       from [<c0432630>] (dump_stack+0x9c/0xd4)
      [<c0432630>] (dump_stack)
       from [<c001d5c0>] (warn_slowpath_common+0x6c/0x88)
      [<c001d5c0>] (warn_slowpath_common)
       from [<c001d678>] (warn_slowpath_null+0x1c/0x24)
      [<c001d678>] (warn_slowpath_null)
       from [<c005acd0>] (irq_domain_xlate_twocell+0x40/0x48)
      [<c005acd0>] (irq_domain_xlate_twocell)
       from [<c005b658>] (irq_create_of_mapping+0x64/0x110)
      [<c005b658>] (irq_create_of_mapping)
       from [<c02e147c>] (of_irq_get+0x38/0x48)
      [<c02e147c>] (of_irq_get)
       from [<c01f8910>] (tc3589x_gpio_probe+0x38/0x1e4)
      [<c01f8910>] (tc3589x_gpio_probe)
       from [<c022eedc>] (platform_drv_probe+0x18/0x48)
      [<c022eedc>] (platform_drv_probe)
       from [<c022d80c>] (driver_probe_device+0x118/0x24c)
      [<c022d80c>] (driver_probe_device)
       from [<c022bf20>] (bus_for_each_drv+0x58/0x8c)
      [<c022bf20>] (bus_for_each_drv)
       from [<c022d6c4>] (device_attach+0x74/0x88)
      [<c022d6c4>] (device_attach)
       from [<c022cdac>] (bus_probe_device+0x84/0xa8)
      [<c022cdac>] (bus_probe_device)
       from [<c022b35c>] (device_add+0x440/0x520)
      [<c022b35c>] (device_add)
       from [<c022ec50>] (platform_device_add+0xb4/0x218)
      [<c022ec50>] (platform_device_add)
       from [<c0243508>] (mfd_add_device+0x220/0x31c)
      [<c0243508>] (mfd_add_device)
       from [<c02436a8>] (mfd_add_devices+0xa4/0x100)
      [<c02436a8>] (mfd_add_devices)
       from [<c024312c>] (tc3589x_probe+0x334/0x3c0)
      [<c024312c>] (tc3589x_probe)
       from [<c022d80c>] (driver_probe_device+0x118/0x24c)
      
      The TC3589x device trees specify the MFD core device
      as having one interrupt cell (cannot specify flags) so the
      twocell translation function is clearly wrong, changing it to
      onecell, as it should be, fixes the regression.
      Signed-off-by: NLinus Walleij <linus.walleij@linaro.org>
      Signed-off-by: NLee Jones <lee.jones@linaro.org>
      627918ed
    • S
      mfd: asic3: Fix potential null pointer dereference · 44b61a9f
      Sachin Kamat 提交于
      We previously assumed 'mem_sdio' could be null but it is
      dereferenced in ioremap(). Add a check to avoid a potential
      null pointer dereference error.
      Signed-off-by: NSachin Kamat <sachin.kamat@linaro.org>
      Signed-off-by: NLee Jones <lee.jones@linaro.org>
      44b61a9f
    • D
      mfd: cros_ec: spi: Fix end of transfer on devices with no spi-msg-delay · 96758059
      Doug Anderson 提交于
      cros_ec_spi makes the assumption that a 0-length message will put the
      spi chip select back to normal (non cs_toggle mode).  This used to be
      the case back on kernel-3.8 on the spi-s3c64xx driver but doesn't
      appear to be true anymore.  It seems like it was a pretty questionable
      assumption to begin with, so let's fix the code to be more robust.  We
      know that a message with a single 0-length segment _will_ put things
      back in order.  Change cros_ec_spi to handle this.
      
      This wasn't a problem on the main user of cros_ec_spi upstream (tegra)
      because it specified 'google,cros-ec-spi-msg-delay'.
      Signed-off-by: NDoug Anderson <dianders@chromium.org>
      Signed-off-by: NLee Jones <lee.jones@linaro.org>
      96758059
    • J
      mfd: Fix cs5535 dependencies · c03842d8
      Jean Delvare 提交于
      As far as I know, the CS5535 and CS5536 chipsets are companions of the
      Geode series of processors, which are 32-bit only. So the CS5535
      drivers are not needed on x86-64, except for build testing purpose.
      
      This aligns the dependencies to what FB_GEODE already uses.
      Signed-off-by: NJean Delvare <jdelvare@suse.de>
      Signed-off-by: NLee Jones <lee.jones@linaro.org>
      c03842d8
    • J
      mfd: timberdale: Depend on X86_32 · 84c3a8f6
      Jean Delvare 提交于
      As far as I know the Timberdale chip was only used as a companion for
      Intel Atom E600 series processors. As such, its drivers are only
      useful on X86_32.
      Signed-off-by: NJean Delvare <jdelvare@suse.de>
      Signed-off-by: NLee Jones <lee.jones@linaro.org>
      84c3a8f6
    • L
      Merge branches 'ib-mfd-extcon-regulator-3.17', 'ib-mfd-gpio-3.17' and... · 6ec9dc32
      Lee Jones 提交于
      Merge branches 'ib-mfd-extcon-regulator-3.17', 'ib-mfd-gpio-3.17' and 'ib-mfd-mmc-3.17' into ibs-for-mfd-merged
      6ec9dc32
    • M
      mmc: rtsx: add support for async request · 6291e715
      Micky Ching 提交于
      Add support for non-blocking request, pre_req() runs dma_map_sg() and
      post_req() runs dma_unmap_sg(). This patch can increase card read/write
      speed, especially for high speed card and slow speed CPU.
      
      Test on intel i3(800MHz - 2.3GHz) performance mode(2.3GHz), SD card
      clock 208MHz
      
      run dd if=/dev/mmcblk0 of=/dev/null bs=64k count=1024
      before:
      67108864 bytes (67 MB) copied, 0.85427 s, 78.6 MB/s
      after:
      67108864 bytes (67 MB) copied, 0.74799 s, 89.7 MB/s
      Signed-off-by: NMicky Ching <micky_ching@realsil.com.cn>
      Acked-by: NUlf Hansson <ulf.hansson@linaro.org>
      Signed-off-by: NLee Jones <lee.jones@linaro.org>
      6291e715
    • M
      mfd: rtsx: Add dma transfer function · 8cd11830
      Micky Ching 提交于
      rtsx driver using a single function for transfer data, dma map/unmap are
      placed in one fix function. We need map/unmap dma in different place(for
      mmc async driver), so add three function for dma map, dma transfer and
      dma unmap.
      Signed-off-by: NMicky Ching <micky_ching@realsil.com.cn>
      Signed-off-by: NLee Jones <lee.jones@linaro.org>
      8cd11830
  2. 07 7月, 2014 3 次提交
    • L
      Linux 3.16-rc4 · cd3de83f
      Linus Torvalds 提交于
      cd3de83f
    • L
      Merge tag 'dt-for-linus' of git://git.secretlab.ca/git/linux · 100193f5
      Linus Torvalds 提交于
      Pull devicetree bugfix from Grant Likely:
       "Important bug fix for parsing 64-bit addresses on 32-bit platforms.
        Without this patch the kernel will try to use memory ranges that
        cannot be reached"
      
      * tag 'dt-for-linus' of git://git.secretlab.ca/git/linux:
        of: Check for phys_addr_t overflows in early_init_dt_add_memory_arch
      100193f5
    • L
      Merge tag 'scsi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi · 8addf0c7
      Linus Torvalds 提交于
      Pull SCSI fixes from James Bottomley:
       "This is a set of 13 fixes, a MAINTAINERS update and a sparse update.
        The fixes are mostly correct value initialisations, avoiding NULL
        derefs and some uninitialised pointer avoidance.
      
        All the patches have been incubated in -next for a few days.  The
        final patch (use the scsi data buffer length to extract transfer size)
        has been rebased to add a cc to stable, but only the commit message
        has changed"
      
      * tag 'scsi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
        [SCSI] use the scsi data buffer length to extract transfer size
        virtio-scsi: fix various bad behavior on aborted requests
        virtio-scsi: avoid cancelling uninitialized work items
        ibmvscsi: Add memory barriers for send / receive
        ibmvscsi: Abort init sequence during error recovery
        qla2xxx: Fix sparse warning in qla_target.c.
        bnx2fc: Improve stats update mechanism
        bnx2fc: do not scan uninitialized lists in case of error.
        fc: ensure scan_work isn't active when freeing fc_rport
        pm8001: Fix potential null pointer dereference and memory leak.
        MAINTAINERS: Update LSILOGIC MPT FUSION DRIVERS (FC/SAS/SPI) maintainers Email IDs
        be2iscsi: remove potential junk pointer free
        be2iscsi: add an missing goto in error path
        scsi_error: set DID_TIME_OUT correctly
        scsi_error: fix invalid setting of host byte
      8addf0c7
  3. 06 7月, 2014 8 次提交
  4. 05 7月, 2014 6 次提交
    • S
      MAINTAINERS: Add few more Keystone drivers · bc6aa566
      Santosh Shilimkar 提交于
      Update MAINTAINERS file for recently added reset controller, AEMIF
      and clocksource driver for Keystone SOCs.
      
      The EMIF memory controller driver is also added along with AEMIF.
      
      Cc: Arnd Bergmann <arnd@arndb.de>
      Cc: Olof Johansson <olof@lixom.net>
      Cc: Kevin Hilman <khilman@linaro.org>
      Cc: Mike Turquette <mturquette@linaro.org>
      Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
      Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
      Signed-off-by: NSantosh Shilimkar <santosh.shilimkar@ti.com>
      Signed-off-by: NOlof Johansson <olof@lixom.net>
      bc6aa566
    • S
      MAINTAINERS: merge MXS entry into IMX one · ce515a6b
      Shawn Guo 提交于
      The mach-mxs platform is actually co-maintained by myself and
      pengutronix folks.  Also it's hosted in the same kernel tree as IMX.
      So let's merge the entry into IMX one.
      Signed-off-by: NShawn Guo <shawn.guo@freescale.com>
      Acked-by: NSascha Hauer <s.hauer@pengutronix.de>
      Signed-off-by: NOlof Johansson <olof@lixom.net>
      ce515a6b
    • O
      Merge tag 'mvebu-fixes-3.16-2' of git://git.infradead.org/linux-mvebu into fixes · 25d11631
      Olof Johansson 提交于
      mvebu fixes for v3.16 (round #2)
      
       - mvebu
          - Fix PCIe deadlock now that SMP is enabled
          - Fix cpuidle for big-endian systems
      
      * tag 'mvebu-fixes-3.16-2' of git://git.infradead.org/linux-mvebu:
        ARM: mvebu: fix cpuidle implementation to work on big-endian systems
        ARM: mvebu: update L2/PCIe deadlock workaround after L2CC cleanup
        ARM: mvebu: move Armada 375 external abort logic as a quirk
      Signed-off-by: NOlof Johansson <olof@lixom.net>
      25d11631
    • M
      ARM: sunxi: Reintroduce the restart code for A10/A20 SoCs · d767af5e
      Maxime Ripard 提交于
      This partly reverts commits 55360050 (ARM: sunxi: Remove reset code from
      the platform) and 5e669ec5 (ARM: sunxi: Remove init_machine callback) for
      the sun4i, sun5i and sun7i families.
      
      This is needed because the watchdog counterpart of these commits was dropped,
      and didn't make it into 3.16. In order to still be able to reboot the board, we
      need to reintroduce that code. Of course, the long term view is still to get
      rid of that code in mach-sunxi.
      Signed-off-by: NMaxime Ripard <maxime.ripard@free-electrons.com>
      Signed-off-by: NOlof Johansson <olof@lixom.net>
      d767af5e
    • O
      Merge tag 'omap-for-v3.16/fixes-against-rc1' of... · 5acd78c5
      Olof Johansson 提交于
      Merge tag 'omap-for-v3.16/fixes-against-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes
      
      Merge OMAP fixes from Tony Lindgren:
      
      Fixes for omaps for issues discovered during the merge window and
      enabling of a few features that had to wait for the driver
      dependencies to clear.
      
      The fixes included are:
      
      - Fix am43xx hard reset flags
      - Fix SoC detection for DRA722
      - Fix CPU OPP table for omap5
      - Fix legacy mux parser bug if requested muxname is a prefix of
        multiple mux entries
      - Fix qspi interrupt binding that relies on the irq crossbar
        that has not yet been enabled
      - Add missing phy_sel for am43x-epos-evm
      - Drop unused gic_init_irq() that is no longer needed
      
      And the enabling of features that had driver dependencies are:
      
      - Change dra7 to use Audio Tracking Logic clock instead of a fixed
        clock now that the clock driver for it has been merged
      
      - Enable off idle configuration for selected omaps as all the kernel
        dependencies for device tree based booting are finally merged as
        this is needed to get the automated PM tests working finally with
        device tree based booting
      
      - Add hwmod entry for ocp2scp3 for omap5 to get sata working as
        all the driver dependencies are now in the kernel and this patch
        fell through the cracks during the merge window
      
      * tag 'omap-for-v3.16/fixes-against-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
        ARM: dts: dra7-evm: remove interrupt binding
        ARM: OMAP2+: Fix parser-bug in platform muxing code
        ARM: DTS: dra7/dra7xx-clocks: ATL related changes
        ARM: OMAP2+: drop unused function
        ARM: dts: am43x-epos-evm: Add Missing cpsw-phy-sel for am43x-epos-evm
        ARM: dts: omap5: Update CPU OPP table as per final production Manual
        ARM: DRA722: add detection of SoC information
        ARM: dts: Enable twl4030 off-idle configuration for selected omaps
        ARM: OMAP5: hwmod: Add ocp2scp3 and sata hwmods
        ARM: OMAP2+: hwmod: Change hardreset soc_ops for AM43XX
      5acd78c5
    • L
      Merge tag 'md/3.16-fixes' of git://neil.brown.name/md · 77c4cf17
      Linus Torvalds 提交于
      Pull md bugfixes from Neil Brown:
       "Two minor bugfixes for md in 3.16"
      
      * tag 'md/3.16-fixes' of git://neil.brown.name/md:
        md: flush writes before starting a recovery.
        md: make sure GET_ARRAY_INFO ioctl reports correct "clean" status
      77c4cf17
  5. 04 7月, 2014 14 次提交