Skip to content
  • Linus Torvalds's avatar
    Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 75bf757e
    Linus Torvalds authored
    Pull ARM SoC fixes from Olof Johansson:
     "This week's arm-soc fixes:
    
       - A set of of OMAP patches that we had missed Tony's pull request of:
         * Reset fix for am43xx
         * Proper OPP table for omap5
         * Fix for SoC detection of one of the DRA7 SoCs
         * hwmod updates to get SATA and OCP to work on omap5 (drivers
           merged in 3.16)
         * ... plus a handful of smaller fixes
       - sunxi needed to re-add machine specific restart code that was
         removed in anticipation of a watchdog driver being merged for 3.16,
         and it didn't make it in.
       - Marvell fixes for PCIe on SMP and a big-endian fix.
       - A trivial defconfig update to make my capri test board boot with
         bcm_defconfig again.
    
      ... and a couple of MAINTAINERS updates, one to claim new Keystone
      drivers that have been merged, and one to merge MXS and i.MX (both
      Freescale platforms).
    
      The largest diffs come from the hwmod code for omap5 and the re-add of
      the restart code on sunxi.  The hwmod stuff is quite late at this
      point but it slipped through cracks repeatedly while coming up the
      maintainer chain and only affects the one SoC so risk is low"
    
    * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
      MAINTAINERS: Add few more Keystone drivers
      MAINTAINERS: merge MXS entry into IMX one
      ARM: sunxi: Reintroduce the restart code for A10/A20 SoCs
      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
      ARM: bcm: Fix bcm and multi_v7 defconfigs
      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
    75bf757e