Skip to content
  1. Mar 30, 2015
    • Olof Johansson's avatar
      Merge tag 'fixes-v4.0-rc4' of... · b1dae3d8
      Olof Johansson authored
      
      Merge tag 'fixes-v4.0-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes
      
      Fixes for omaps for the -rc cycle:
      
      - Fix a device tree based booting vs legacy booting regression for
        omap3 crypto hardware by adding the missing DMA channels.
      
      - Fix /sys/bus/soc/devices/soc0/family for am33xx devices.
      
      - Fix two timer issues that can cause hangs if the timer related
        hwmod data is missing like it often initially is for new SoCs.
      
      - Remove pcie hwmods entry from dts as that causes runtime PM to
        fail for the PHYs.
      
      - A paper bag type dts configuration fix for dm816x GPIO
        interrupts that I just noticed. This is most of the changes
        diffstat wise, but as it's a basic feature for connecting
        devices and things work otherwise, it should be fixed.
      
      * tag 'fixes-v4.0-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
        ARM: dts: Fix gpio interrupts for dm816x
        ARM: dts: dra7: remove ti,hwmod property from pcie phy
        ARM: OMAP: dmtimer: disable pm runtime on remove
        ARM: OMAP: dmtimer: check for pm_runtime_get_sync() failure
        ARM: OMAP2+: Fix socbus family info for AM33xx devices
        ARM: dts: omap3: Add missing dmas for crypto
      
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      b1dae3d8
    • Olof Johansson's avatar
      Merge tag 'socfpga_fix_for_v4.0_2' of git://git.rocketboards.org/linux-socfpga-next into fixes · ebc0aa8f
      Olof Johansson authored
      
      
      Late fix for v4.0 on the SoCFPGA platform:
      - Fix interrupt number for SPI1 interface
      
      * tag 'socfpga_fix_for_v4.0_2' of git://git.rocketboards.org/linux-socfpga-next:
        ARM: socfpga: dts: fix spi1 interrupt
      
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      ebc0aa8f
    • Dave Martin's avatar
      arm64: juno: Fix misleading name of UART reference clock · 78d84bc3
      Dave Martin authored
      
      
      The UART reference clock speed is 7273.8 kHz, not 72738 kHz.
      
      Dots aren't usually used in node names even though ePAPR permits
      them.  However, this can easily be avoided by expressing the
      frequency in Hz, not kHz.
      
      This patch changes the name to refclk7273800hz, reflecting the
      actual clock speed.
      
      Signed-off-by: default avatarDave Martin <Dave.Martin@arm.com>
      Acked-by: default avatarLiviu Dudau <Liviu.Dudau@arm.com>
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      78d84bc3
    • Olof Johansson's avatar
      Merge tag 'fixes-for-v4.0-rc5' of https://github.com/rjarzmik/linux into fixes · 53b1a663
      Olof Johansson authored
      
      
      arm: pxa: fixes for v4.0-rc5
      
      There are only 2 fixes, one for the zeus board about the regulator changes,
      where a typo prevented the zeus board from having a working can regulator,
      and one regression triggered by the interrupts IRQ shift of 16 affecting all
      boards.
      
      * tag 'fixes-for-v4.0-rc5' of https://github.com/rjarzmik/linux:
        ARM: pxa: fix pxa interrupts handling in DT
        ARM: pxa: Fix typo in zeus.c
      
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      53b1a663
  2. Mar 19, 2015
    • Mark James's avatar
      ARM: socfpga: dts: fix spi1 interrupt · 1ac31de7
      Mark James authored
      
      
      The socfpga.dtsi currently has the wrong interrupt number set for SPI master 1
      Trying to use the master without this change results in the kernel boot
      process waiting forever for an interrupt that will never occur while
      attempting to probe any slave devices configured in the device tree as being
      under SPI master 1.
      
      The change works for the Cyclone V, and according to the Arria 5 handbook
      should be good there too.
      
      Signed-off-by: default avatarMark James <maj@jamers.net>
      Acked-by: default avatarSteffen Trumtrar <s.trumtrar@pengutronix.de>
      Signed-off-by: default avatarDinh Nguyen <dinguyen@opensource.altera.com>
      1ac31de7
    • Tony Lindgren's avatar
      ARM: dts: Fix gpio interrupts for dm816x · 599c376c
      Tony Lindgren authored
      Commit 7800064b
      
       ("ARM: dts: Add basic dm816x device tree
      configuration") added basic devices for dm816x, but I was not able
      to test the GPIO interrupts earlier until I found some suitable pins
      to test with. We can mux the MMC card detect and write protect pins
      from SD_SDCD and SD_SDWP mode to use a normal GPIO interrupts that
      are also suitable for the MMC subsystem.
      
      This turned out several issues that need to be fixed:
      
      - I set the GPIO type wrong to be compatible with omap3 instead
        of omap4. The GPIO controller on dm816x has EOI interrupt
        register like omap4 and am335x.
      
      - I got the GPIO interrupt numbers wrong as each bank has two
        and we only use one. They need to be set up the same way as
        on am335x.
      
      - The gpio banks are missing interrupt controller related
        properties.
      
      With these changes the GPIO interrupts can be used with the
      MMC card detect pin, so let's wire that up. Let's also mux all
      the MMC lines for completeness while at it.
      
      For the first GPIO bank I tested using GPMC lines temporarily
      muxed to GPIOs on the dip switch 10.
      
      Cc: Brian Hutchinson <b.hutchman@gmail.com>
      Cc: Matthijs van Duin <matthijsvanduin@gmail.com>
      Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
      599c376c
    • Kishon Vijay Abraham I's avatar
      ARM: dts: dra7: remove ti,hwmod property from pcie phy · 07715533
      Kishon Vijay Abraham I authored
      
      
      Now that we don't have hwmod entry for pcie PHY remove the
      ti,hwmod property from PCIE PHY's. Otherwise we will get:
      
      platform 4a094000.pciephy: Cannot lookup hwmod 'pcie1-phy'
      
      Signed-off-by: default avatarKishon Vijay Abraham I <kishon@ti.com>
      [tony@atomide.com: updated comments]
      Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
      07715533
  3. Mar 18, 2015
  4. Mar 17, 2015
  5. Mar 16, 2015
    • Arnd Bergmann's avatar
      Merge tag 'v4.0-rockchip-armfixes1' of... · 3034b008
      Arnd Bergmann authored
      Merge tag 'v4.0-rockchip-armfixes1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into fixes
      
      Pull "ARM: rockchip: small fixes for 4.0-rc" from Heiko Stuebner:
      
      Adding a default-disabled state to the new gmac node and an
      update to the MAINTAINERS entry adding a rockchip regexp entry.
      
      * tag 'v4.0-rockchip-armfixes1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
        ARM: dts: rockchip: disable gmac by default in rk3288.dtsi
        MAINTAINERS: add rockchip regexp to the ARM/Rockchip entry
      3034b008
    • Linus Torvalds's avatar
      Linux 4.0-rc4 · 06e5801b
      Linus Torvalds authored
      v4.0-rc4
      06e5801b
    • Linus Torvalds's avatar
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · 08352086
      Linus Torvalds authored
      Pull drm fix from Dave Airlie:
       "An oops snuck in in an -rc3 patch, this fixes it"
      
      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
        [PATCH] drm/mm: Fix support 4 GiB and larger ranges
      08352086
    • Linus Torvalds's avatar
      Merge tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux · 1ee89c51
      Linus Torvalds authored
      Pull clock framework fixes from Michael Turquette:
       "The clk fixes for 4.0-rc4 comprise three themes.
      
        First are the usual driver fixes for new regressions since v3.19.
      
        Second are fixes to the common clock divider type caused by recent
        changes to how we round clock rates.  This affects many clock drivers
        that use this common code.
      
        Finally there are fixes for drivers that improperly compared struct
        clk pointers (drivers must not deref these pointers).  While some of
        these drivers have done this for a long time, this did not cause a
        problem until we started generating unique struct clk pointers for
        every consumer.  A new function, clk_is_match was introduced to get
        these drivers working again and they are fixed up to no longer deref
        the pointers themselves"
      
      * tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux:
        ASoC: kirkwood: fix struct clk pointer comparing
        ASoC: fsl_spdif: fix struct clk pointer comparing
        ARM: imx: fix struct clk pointer comparing
        clk: introduce clk_is_match
        clk: don't export static symbol
        clk: divider: fix calculation of initial best divider when rounding to closest
        clk: divider: fix selection of divider when rounding to closest
        clk: divider: fix calculation of maximal parent rate for a given divider
        clk: divider: return real rate instead of divider value
        clk: qcom: fix platform_no_drv_owner.cocci warnings
        clk: qcom: fix platform_no_drv_owner.cocci warnings
        clk: qcom: Add PLL4 vote clock
        clk: qcom: lcc-msm8960: Fix PLL rate detection
        clk: qcom: Fix slimbus n and m val offsets
        clk: ti: Fix FAPLL parent enable bit handling
      1ee89c51
    • Krzysztof Kolasa's avatar
      [PATCH] drm/mm: Fix support 4 GiB and larger ranges · 046d669c
      Krzysztof Kolasa authored
      
      
      bad argument if(tmp)... in check_free_hole
      
      fix oops: kernel BUG at drivers/gpu/drm/drm_mm.c:305!
      
      [airlied: excellent, this was my task for today].
      
      Signed-off-by: default avatarKrzysztof Kolasa <kkolasa@winsoft.pl>
      Reviewed-by: default avatarChris wilson <chris@chris-wilson.co.uk>
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      046d669c
    • Linus Torvalds's avatar
      Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 6981e2af
      Linus Torvalds authored
      Pull ARM SoC fixes from Arnd Bergmann:
       "This is a rather unpleasantly large set of bug fixes for arm-soc, Most
        of them because of cross-tree dependencies for Exynos where we should
        have figured out the right path to merge things before the merge
        window, and then the maintainer being unable to sort things out in
        time during a business trip.
      
        The other changes contained here are the usual collection:
      
        MAINTAINERS file updates
         - Gregory Clement is now a co-maintainer for the legacy Marvell EBU
           platforms
         - A MAINTAINERS entry for the Freescale Vybrid platform that was
           added last year
         - Matt Porter no longer works as a maintainer on Broadcom SoCs
      
        Build-time issues
         - A compile-time error for at91
         - Several minor DT fixes on at91, imx, exynos, socfpga, and omap
         - The new digicolor platform was not correctly enabled at all
      
        Configuration issues
         - Two defconfig fix for regressions using USB on versatile express
           and on OMAP3
         - Enabling all 8 CPUs on Allwinner/SUNxi
         - Enabling the new STiH410 platform to be usable
      
        Bug fixes in platform code
         - A missing barrier for socfpga
         - Fixing LPDDR1 self-refresh mode on at91
         - Fixing RTC interrupt numbers on Exynos3250
         - Fixing a cache-coherency issues in CPU power-down on Exynos5
         - Multiple small OMAP power management fixes"
      
      * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (69 commits)
        MAINTAINERS: Add myself as co-maintainer to the legacy support of the mvebu SoCs
        ARM: at91: pm_slowclock: fix the compilation error
        ARM: at91/dt: fix USB high-speed clock to select UTMI
        ARM: at91/dt: fix at91 udc compatible strings
        ARM: at91/dt: declare matrix node as a syscon device
        ARM: vexpress: update CONFIG_USB_ISP1760 option
        ARM: digicolor: add the machine directory to Makefile
        ARM: STi: Add STiH410 SoC support
        MAINTAINERS: add Freescale Vybrid SoC
        MAINTAINERS: Remove self as ARM mach-bcm co-maintainer
        ARM: imx6sl-evk: set swbst_reg as vbus's parent reg
        ARM: imx6qdl-sabresd: set swbst_reg as vbus's parent reg
        ARM: at91/dt: at91sam9261: fix clocks and clock-names in udc definition
        ARM: OMAP2+: Fix wl12xx on dm3730-evm with mainline u-boot
        ARM: OMAP: enable TWL4030_USB in omap2plus_defconfig
        ARM: dts: dra7x-evm: avoid possible contention while muxing on CAN lines
        ARM: dts: dra7x-evm: Don't use dcan1_rx.gpio1_15 in DCAN pinctrl
        ARM: dts: am43xx: fix SLEWCTRL_FAST pinctrl binding
        ARM: dts: am33xx: fix SLEWCTRL_FAST pinctrl binding
        ARM: dts: OMAP5: fix polling intervals for thermal zones
        ...
      6981e2af
    • Linus Torvalds's avatar
      Merge tag 'irqchip-fixes-4.0' of git://git.infradead.org/users/jcooper/linux · 71c87bd0
      Linus Torvalds authored
      Pull irqchip fixes from Jason Cooper:
       "armada-370-xp:
         - Chained per-cpu interrupts
      
        gic{,-v3,v3-its}"
         - Various fixes for safer operation"
      
      * tag 'irqchip-fixes-4.0' of git://git.infradead.org/users/jcooper/linux:
        irqchip: gicv3-its: Support safe initialization
        irqchip: gicv3-its: Define macros for GITS_CTLR fields
        irqchip: gicv3-its: Add limitation to page order
        irqchip: gicv3-its: Use 64KB page as default granule
        irqchip: gicv3-its: Zero itt before handling to hardware
        irqchip: gic-v3: Fix out of bounds access to cpu_logical_map
        irqchip: gic: Fix unsafe locking reported by lockdep
        irqchip: gicv3-its: Fix unsafe locking reported by lockdep
        irqchip: gicv3-its: Iterate over PCI aliases to generate ITS configuration
        irqchip: gicv3-its: Allocate enough memory for the full range of DeviceID
        irqchip: gicv3-its: Fix ITS CPU init
        irqchip: armada-370-xp: Fix chained per-cpu interrupts
      71c87bd0
  6. Mar 15, 2015
    • Jason Cooper's avatar
      aaa95f74
    • Linus Torvalds's avatar
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · 7cd9beb3
      Linus Torvalds authored
      Pull drm fixes from Dave Airlie:
       "Misc i915, vmwgfx and radeon fixes along with a fix for one of those
        recursive sleep mutex debug cases in the mst code"
      
      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
        drm/vmwgfx: Fix an issue with the device losing its irq line on module unload
        drm/vmwgfx: Correctly NULLify dma buffer pointer on failure
        drm/vmwgfx: Reorder device takedown somewhat
        drm/vmwgfx: Fix a couple of lock dependency violations
        drm/radeon: drop setting UPLL to sleep mode
        drm/radeon: fix wait to actually occur after the signaling callback
        drm/i915: Prevent TLB error on first execution on SNB
        drm/i915: Do both mt and gen6 style forcewake reset on ivb probe
        drm/i915: Make WAIT_IOCTL negative timeouts be indefinite again
        drm/i915: use in_interrupt() not in_irq() to check context
        drm/mst: fix recursive sleep warning on qlock
        drm: Don't assign fbs for universal cursor support to files
      7cd9beb3
    • Linus Torvalds's avatar
      Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi · 60b3e7bd
      Linus Torvalds authored
      Pull SCSI fix from James Bottomley:
       "This is a simple fix for a domain revalidation crash which has
        recently turned up in the libsas code (applies to mvsas, isc and
        aic94xx)"
      
      * tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
        libsas: Fix Kernel Crash in smp_execute_task
      60b3e7bd
    • Alexandru M Stan's avatar
      ARM: dts: rockchip: disable gmac by default in rk3288.dtsi · 54b0bc60
      Alexandru M Stan authored
      
      
      This block should not be enabled by default or else if the kconfig is set,
      it will try to load/probe even if there's no phy connected.
      
      Signed-off-by: default avatarAlexandru M Stan <amstan@chromium.org>
      Signed-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
      54b0bc60
    • Heiko Stuebner's avatar
      MAINTAINERS: add rockchip regexp to the ARM/Rockchip entry · b4331b43
      Heiko Stuebner authored
      
      
      The regexp option is a nice way to catch even weirder paths like the current
      drivers/gpu/drm/rockchip/* or others in the future.
      
      Signed-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
      b4331b43
    • Linus Torvalds's avatar
      Merge tag 'locks-v4.0-4' of git://git.samba.org/jlayton/linux · 0f0910a1
      Linus Torvalds authored
      Pull file locking bugfix from Jeff Layton:
       "Just a small fix for a potential problem in one of the lease
        tracepoints"
      
      * tag 'locks-v4.0-4' of git://git.samba.org/jlayton/linux:
        locks: fix generic_delete_lease tracepoint to use victim pointer
      0f0910a1
    • Linus Torvalds's avatar
      Merge tag 'vfio-v4.0-rc4' of git://github.com/awilliam/linux-vfio · 0be952c1
      Linus Torvalds authored
      Pull VFIO fix from Alex Williamson:
       "Add missing break to avoid clobbering ioctl (Alexey Kardashevskiy)"
      
      * tag 'vfio-v4.0-rc4' of git://github.com/awilliam/linux-vfio:
        vfio-pci: Add missing break to enable VFIO_PCI_ERR_IRQ_INDEX
      0be952c1
    • Linus Torvalds's avatar
      Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux · 9c987a33
      Linus Torvalds authored
      Pull arm64 fixes from Catalin Marinas:
      
       - add TLB invalidation for page table tear-down which was missed when
         support for CONFIG_HAVE_RCU_TABLE_FREE was added (assuming page table
         freeing was always deferred)
      
       - use UEFI for system and reset poweroff if available
      
       - fix asm label placement in relation to the alignment statement
      
      * tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
        arm64: put __boot_cpu_mode label after alignment instead of before
        efi/arm64: use UEFI for system reset and poweroff
        arm64: Invalidate the TLB corresponding to intermediate page table levels
      9c987a33
    • Linus Torvalds's avatar
      Merge tag 'linux-kselftest-4.0-rc4' of... · e6c2d9ce
      Linus Torvalds authored
      Merge tag 'linux-kselftest-4.0-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest
      
      Pull Kselftest fix from Shuah Khan:
       "selftests/exec: Check if the syscall exists and bail if not"
      
      * tag 'linux-kselftest-4.0-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest:
        selftests/exec: Check if the syscall exists and bail if not
      e6c2d9ce
  7. Mar 14, 2015
    • Jeff Layton's avatar
      locks: fix generic_delete_lease tracepoint to use victim pointer · a9b1b455
      Jeff Layton authored
      
      
      It's possible that "fl" won't point at a valid lock at this point, so
      use "victim" instead which is either a valid lock or NULL.
      
      Signed-off-by: default avatarJeff Layton <jeff.layton@primarydata.com>
      a9b1b455
    • Ard Biesheuvel's avatar
      arm64: put __boot_cpu_mode label after alignment instead of before · 947bb758
      Ard Biesheuvel authored
      
      
      Another one for the big head.S spring cleaning: the label should
      be after the .align or it may point to the padding.
      
      Signed-off-by: default avatarArd Biesheuvel <ard.biesheuvel@linaro.org>
      Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
      947bb758
    • Ard Biesheuvel's avatar
      efi/arm64: use UEFI for system reset and poweroff · 60c0d45a
      Ard Biesheuvel authored
      
      
      If UEFI Runtime Services are available, they are preferred over direct
      PSCI calls or other methods to reset the system.
      
      For the reset case, we need to hook into machine_restart(), as the
      arm_pm_restart function pointer may be overwritten by modules.
      
      Tested-by: default avatarMark Rutland <mark.rutland@arm.com>
      Reviewed-by: default avatarMark Rutland <mark.rutland@arm.com>
      Reviewed-by: default avatarMatt Fleming <matt.fleming@intel.com>
      Signed-off-by: default avatarArd Biesheuvel <ard.biesheuvel@linaro.org>
      Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
      60c0d45a
    • Catalin Marinas's avatar
      arm64: Invalidate the TLB corresponding to intermediate page table levels · 285994a6
      Catalin Marinas authored
      The ARM architecture allows the caching of intermediate page table
      levels and page table freeing requires a sequence like:
      
      	pmd_clear()
      	TLB invalidation
      	pte page freeing
      
      With commit 5e5f6dc1 (arm64: mm: enable HAVE_RCU_TABLE_FREE logic),
      the page table freeing batching was moved from tlb_remove_page() to
      tlb_remove_table(). The former takes care of TLB invalidation as this is
      also shared with pte clearing and page cache page freeing. The latter,
      however, does not invalidate the TLBs for intermediate page table levels
      as it probably relies on the architecture code to do it if required.
      When the mm->mm_users < 2, tlb_remove_table() does not do any batching
      and page table pages are freed before tlb_finish_mmu() which performs
      the actual TLB invalidation.
      
      This patch introduces __tlb_flush_pgtable() for arm64 and calls it from
      the {pte,pmd,pud}_free_tlb() directly without relying on deferred page
      table freeing.
      
      Fixes: 5e5f6dc1
      
       arm64: mm: enable HAVE_RCU_TABLE_FREE logic
      Reported-by: default avatarJon Masters <jcm@redhat.com>
      Tested-by: default avatarJon Masters <jcm@redhat.com>
      Tested-by: default avatarSteve Capper <steve.capper@linaro.org>
      Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
      285994a6
    • Linus Torvalds's avatar
      Merge tag 'pm+acpi-4.0-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 5fb0f7fa
      Linus Torvalds authored
      Pull power management and ACPI fixes from Rafael Wysocki:
       "Just two fixes, one for an ACPI LPSS driver issue introduced during
        the 3.17 cycle and one revert of a recent commit that sort of broke
        the cpupower tool.
      
        Specifics:
      
         - Fix an ACPI LPSS (Low-Power Subsystem) driver issue causing the
           8250_dw driver to confuse an LPSS clock with another one it is
           supposed to handle due to the lack of identification allowing it to
           tell those clocks apart (Heikki Krogerus).
      
         - Revert a recent commit that was supposed to improve the usability
           of the cpupower tool, but clearly did the opposite (Josh Boyer)"
      
      * tag 'pm+acpi-4.0-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        Revert "cpupower Makefile change to help run the tool without 'make install'"
        ACPI / LPSS: provide con_id for the clkdev
      5fb0f7fa
    • Gregory CLEMENT's avatar
      MAINTAINERS: Add myself as co-maintainer to the legacy support of the mvebu SoCs · bfda4031
      Gregory CLEMENT authored
      
      
      I will also take care of the legacy support(not fully converted to DT)
      of the mvebu SoCs.
      
      Signed-off-by: default avatarGregory CLEMENT <gregory.clement@free-electrons.com>
      Acked-by: default avatarAndrew Lunn <andrew@lunn.ch>
      Acked-by: default avatarJason Cooper <jason@lakedaemon.net>
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      bfda4031
    • Rafael J. Wysocki's avatar
      Merge branch 'pm-tools' · b1760233
      Rafael J. Wysocki authored
      * pm-tools:
        Revert "cpupower Makefile change to help run the tool without 'make install'"
      b1760233
    • Linus Torvalds's avatar
      Merge tag 'stable/for-linus-4.0-rc3-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip · f47e3310
      Linus Torvalds authored
      Pull xen bug fixes from David Vrabel:
      
       - fix a PV regression in 3.19.
      
       - fix a dom0 crash on hosts with large numbers of PIRQs.
      
       - prevent pcifront from disabling memory or I/O port access, which may
         trigger host crashes.
      
      * tag 'stable/for-linus-4.0-rc3-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
        xen-pciback: limit guest control of command register
        xen/events: avoid NULL pointer dereference in dom0 on large machines
        xen: Remove trailing semicolon from xenbus_register_frontend() definition
        x86/xen: correct bug in p2m list initialization
      f47e3310
    • Linus Torvalds's avatar
      Merge tag 'sound-4.0-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · bbc54a00
      Linus Torvalds authored
      Pull sound fixes from Takashi Iwai:
       "This is a round of HD-audio fixes: there are a long-standing
        regression fix and a few more device/codec-specific quirks.
      
        In addition, a couple of FireWire regression fixes, a USB-audio quirk
        for Roland UA-22 and a sanity check in API for user-defined control
        elements"
      
      * tag 'sound-4.0-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
        ALSA: hda - Don't access stereo amps for mono channel widgets
        ALSA: hda - Add workaround for MacBook Air 5,2 built-in mic
        ALSA: hda - Set single_adc_amp flag for CS420x codecs
        ALSA: snd-usb: add quirks for Roland UA-22
        ALSA: control: Add sanity checks for user ctl id name string
        ALSA: hda - Fix built-in mic on Compaq Presario CQ60
        ALSA: firewire-lib: leave unit reference counting completely
        Revert "ALSA: dice: fix wrong offsets for Dice interface"
        ALSA: hda - Fix regression of HD-audio controller fallback modes
      bbc54a00
    • Linus Torvalds's avatar
      Merge tag 'devicetree-fixes-for-4.0' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux · 3d52c5bd
      Linus Torvalds authored
      Pull DeviceTree fixes from Rob Herring:
      
       - fix for stdout-path option parsing with added unittest
      
       - fix for stdout-path interaction with earlycon
      
       - several DT unittest fixes
      
       - fix Sparc allmodconfig build error on of_platform_register_reconfig_notifier
      
       - several DT overlay kconfig and build warning fixes
      
       - several DT binding documentation updates
      
      * tag 'devicetree-fixes-for-4.0' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
        of/platform: Fix sparc:allmodconfig build
        of: unittest: Add options string testcase variants
        of: fix handling of '/' in options for of_find_node_by_path()
        of/unittest: Fix the wrong expected value in of_selftest_property_string
        of/unittest: remove the duplicate of_changeset_init
        dt: submitting-patches: clarify that DT maintainers are to be cced on bindings
        of: unittest: fix I2C dependency
        of/overlay: Remove unused variable
        Documentation: DT: Renamed of-serial.txt to 8250.txt
        of: Fix premature bootconsole disable with 'stdout-path'
        serial: add device tree binding documentation for ETRAX FS UART
        of/overlay: Directly include idr.h
        of: Drop superfluous dependance for OF_OVERLAY
        of: Add vendor prefix for Arasan
        of: Add prompt for OF_OVERLAY config
      3d52c5bd
    • Linus Torvalds's avatar
      Merge branch 'gadget' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs · f788baad
      Linus Torvalds authored
      Pull gadgetfs fixes from Al Viro:
       "Assorted fixes around AIO on gadgetfs: leaks, use-after-free, troubles
        caused by ->f_op flipping"
      
      * 'gadget' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
        gadgetfs: really get rid of switching ->f_op
        gadgetfs: get rid of flipping ->f_op in ep_config()
        gadget: switch ep_io_operations to ->read_iter/->write_iter
        gadgetfs: use-after-free in ->aio_read()
        gadget/function/f_fs.c: switch to ->{read,write}_iter()
        gadget/function/f_fs.c: use put iov_iter into io_data
        gadget/function/f_fs.c: close leaks
        move iov_iter.c from mm/ to lib/
        new helper: dup_iter()
      f788baad
  8. Mar 13, 2015
    • Guenter Roeck's avatar
      of/platform: Fix sparc:allmodconfig build · a697c2ef
      Guenter Roeck authored
      sparc:allmodconfig fails to build with:
      
      drivers/built-in.o: In function `platform_bus_init':
      (.init.text+0x3684): undefined reference to `of_platform_register_reconfig_notifier'
      
      of_platform_register_reconfig_notifier is only declared if both OF_ADDRESS
      and OF_DYNAMIC are configured. Yet, the include file only declares a dummy
      function if OF_DYNAMIC is not configured. The sparc architecture does not
      configure OF_ADDRESS, but does configure OF_DYNAMIC, causing above error.
      
      Fixes: 801d728c
      
       ("of/reconfig: Add OF_DYNAMIC notifier for platform_bus_type")
      Cc: Pantelis Antoniou <pantelis.antoniou@konsulko.com>
      Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
      Signed-off-by: default avatarRob Herring <robh@kernel.org>
      a697c2ef
    • Takashi Iwai's avatar
      ALSA: hda - Don't access stereo amps for mono channel widgets · ef403edb
      Takashi Iwai authored
      
      
      The current HDA generic parser initializes / modifies the amp values
      always in stereo, but this seems causing the problem on ALC3229 codec
      that has a few mono channel widgets: namely, these mono widgets react
      to actions for both channels equally.
      
      In the driver code, we do care the mono channel and create a control
      only for the left channel (as defined in HD-audio spec) for such a
      node.  When the control is updated, only the left channel value is
      changed.  However, in the resume, the right channel value is also
      restored from the initial value we took as stereo, and this overwrites
      the left channel value.  This ends up being the silent output as the
      right channel has been never touched and remains muted.
      
      This patch covers the places where unconditional stereo amp accesses
      are done and converts to the conditional accesses.
      
      Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=94581
      Cc: <stable@vger.kernel.org>
      Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
      ef403edb