• Linus Torvalds's avatar
    Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc · 575966e0
    Linus Torvalds authored
    Pull ARM SoC fixes from Olof Johansson:
     "I've been sitting on these longer than I meant, so the patch count is
      a bit higher than ideal for this part of the release. There's also
      some reverts of double-applied patches that brings the diffstat up a
      bit.
    
      With that said, the biggest changes are:
    
       - Revert of duplicate i2c device addition on two Aspeed (BMC)
         Devicetrees.
    
       - Move of two device nodes that got applied to the wrong part of the
         tree on ASpeed G6.
    
       - Regulator fix for Beaglebone X15 (adding 12/5V supplies)
    
       - Use interrupts for keys on Amlogic SM1 to avoid missed polls
    
      In addition to that, there is a collection of smaller DT fixes:
    
       - Power supply assignment fixes for i.MX6
    
       - Fix of interrupt line for magnetometer on i.MX8 Librem5 devkit
    
       - Build fixlets (selects) for davinci/omap2+
    
       - More interrupt number fixes for Stratix10, Amlogic SM1, etc.
    
       - ... and more similar fixes across different platforms
    
      And some non-DT stuff:
    
       - optee fix to register multiple shared pages properly
    
       - Clock calculation fixes for MMP3
    
       - Clock fixes for OMAP as well"
    
    * tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (42 commits)
      MAINTAINERS: Add myself as the co-maintainer for Actions Semi platforms
      ARM: dts: imx7: Fix Toradex Colibri iMX7S 256MB NAND flash support
      ARM: dts: imx6sll-evk: Remove incorrect power supply assignment
      ARM: dts: imx6sl-evk: Remove incorrect power supply assignment
      ARM: dts: imx6sx-sdb: Remove incorrect power supply assignment
      ARM: dts: imx6qdl-sabresd: Remove incorrect power supply assignment
      ARM: dts: imx6q-icore-mipi: Use 1.5 version of i.Core MX6DL
      ARM: omap2plus: select RESET_CONTROLLER
      ARM: davinci: select CONFIG_RESET_CONTROLLER
      ARM: dts: aspeed: rainier: Fix fan fault and presence
      ARM: dts: aspeed: rainier: Remove duplicate i2c busses
      ARM: dts: aspeed: tacoma: Remove duplicate flash nodes
      ARM: dts: aspeed: tacoma: Remove duplicate i2c busses
      ARM: dts: aspeed: tacoma: Fix fsi master node
      ARM: dts: aspeed-g6: Fix FSI master location
      ARM: dts: mmp3: Fix the TWSI ranges
      clk: mmp2: Fix the order of timer mux parents
      ARM: mmp: do not divide the clock rate
      arm64: dts: rockchip: Fix IR on Beelink A1
      optee: Fix multi page dynamic shm pool alloc
      ...
    575966e0
MAINTAINERS 527 KB