Skip to content
  • Linus Torvalds's avatar
    Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 42b76d0e
    Linus Torvalds authored
    Pull ARM SoC fixes from Olof Johansson:
     "Our first batch of fixes this release cycle, unfortunately a bit
      noisier than usual. Two major groups stand out:
    
       - Some pinctril dts/dtsi changes for stm32 due to a new driver being
         merged during the merge window, and this aligns the DT contents
         between the old format and the new. This could arguably be moved to
         the next merge window but it also seemed relatively harmless to
         include now.
    
       - Amlogic/meson had driver changes merged that required devicetree
         changes to avoid functional/performance regressions. I've already
         asked them to be more careful about this going forward, and making
         sure drivers are compatible with older DTs when they make these
         kind of changes. The platform is actively being upstreamed so
         there's a few things in flight, we've seen this happen before and
         sometimes it's hard to catch in time.
    
      Besides that there is the usual mix of minor fixes"
    
    * tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (33 commits)
      ARM: dts: stm32: use right pinctrl compatible for stm32f469
      ARM: dts: stm32: Fix STMPE1600 binding on stm32429i-eval board
      ARM: defconfig: update Gemini defconfig
      ARM: defconfig: FRAMEBUFFER_CONSOLE can no longer be =m
      arm64: dts: rockchip: add the grf clk for dw-mipi-dsi on rk3399
      reset: Restrict RESET_HSDK to ARC_SOC_HSDK or COMPILE_TEST
      ARM: dts: da850-evm: add serial and ethernet aliases
      ARM: dts: am43xx-epos-evm: Remove extra CPSW EMAC entry
      ARM: dts: am33xx: Add spi alias to match SOC schematics
      ARM: OMAP2+: hsmmc: fix logic to call either omap_hsmmc_init or omap_hsmmc_late_init but not both
      ARM: dts: dra7: Set a default parent to mcasp3_ahclkx_mux
      ARM: OMAP2+: dra7xx: Set OPT_CLKS_IN_RESET flag for gpio1
      ARM: dts: nokia n900: drop unneeded/undocumented parts of the dts
      arm64: dts: rockchip: Correct MIPI DPHY PLL clock on rk3399
      arm64: dt marvell: Fix AP806 system controller size
      MAINTAINERS: add Macchiatobin maintainers entry
      ARC: reset: remove the misleading v1 suffix all over
      ARC: reset: add missing DT binding documentation for HSDKv1 reset driver
      ARC: reset: Only build on archs that have IOMEM
      ARM: at91: Replace uses of virt_to_phys with __pa_symbol
      ...
    42b76d0e