Skip to content
  • Linus Torvalds's avatar
    Merge tag 'armsoc-for-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · b1f368b5
    Linus Torvalds authored
    Pull ARM SoC fixes from Olof Johansson:
     "Another quiet week:
    
       - a fix to silence edma probe error on non-supported platforms from
         Arnd
       - a fix to enable the PL clock for Parallella, to make mainline
         usable with the SDK.
       - a somewhat verbose fix for the PLL clock tree on VF610
       - enabling of SD/MMC on one of the VF610-based boards (for testing)
       - a fix for i.MX where CONFIG_SPI used to be implicitly enabled and
         now needs to be added to the defconfig instead
       - another maintainer added for bcm2835: Lee Jones"
    
    * tag 'armsoc-for-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
      ARM: dts: zynq: Enable PL clocks for Parallella
      dma: edma: move device registration to platform code
      ARM: dts: vf610: add SD node to cosmic dts
      MAINTAINERS: update bcm2835 entry
      ARM: imx: Fix the removal of CONFIG_SPI option
      ARM: imx: clk-vf610: define PLL's clock tree
    b1f368b5