Skip to content
  • Linus Torvalds's avatar
    Merge tag 'armsoc-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · a771151a
    Linus Torvalds authored
    Pull ARM SoC cleanups from Arnd Bergmann:
     "The cleanups for v4.9 are a little larger that usual, but thankfully
      that is almost exclusively due to removing a significant number of
      files that have become obsolete after the still ongoing conversion of
      old board files to devicetree.
    
       - for mach-omap2, which is still the largest platform in arch/arm/,
         the conversion to DT is finally complete after the Nokia N900 is
         now fully supported there, along with the omap3 LDP, and we can
         remove those two board files. If no regressions are found, another
         large cleanup for the platform will happen as a follow-up, removing
         dead code and restructuring the platform based on being DT-only.
    
       - In mach-imx, similar work is ongoing, but has not come that far.
         This time, we remove the obsolete board file for the i.MX1
         generation, which like i.MX25, i.MX5, i.MX6, and i.MX7 is now
         DT-only. The remaining board files are for i.MX2 and i.MX3 machines
         based on old ARM926 or ARM1136 cores that should work with DT in
         principle.
    
       - realview has just been converted from board files to DT, and a lot
         of code gets removed in the process. This is the last
         ARM/Keil/Versatile derived platform that was still using board
         files, the other ones being integrator, versatile and vexpress. We
         can probably merge the remaining code into a single directory in
         the near future.
    
       - clps711x had completed the conversion in v4.8, but we accidentally
         left the files in place that should have been deleted then"
    
    * tag 'armsoc-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (21 commits)
      ARM: select PCI_DOMAINS config from ARCH_MULTIPLATFORM
      ARM: stop *MIGHT_HAVE_PCI* config from being selected redundantly
      ARM: imx: (trivial) fix typo and grammar
      ARM: clps711x: remove extraneous files
      ARM: imx: use IS_ENABLED() instead of checking for built-in or module
      ARM: OMAP2+: use IS_ENABLED() instead of checking for built-in or module
      ARM: OMAP1: use IS_ENABLED() instead of checking for built-in or module
      ARM: imx: remove platform-mxc_rnga
      ARM: realview: imply device tree boot
      ARM: realview: no need to select SMP_ON_UP explicitly
      ARM: realview: delete the RealView board files
      ARM: imx: no need to select SMP_ON_UP explicitly
      ARM: i.MX: Move SOC_IMX1 into 'Device tree only'
      ARM: i.MX: Remove i.MX1 non-DT support
      ARM: i.MX: Remove i.MX1 Synertronixx SCB9328 board support
      ARM: i.MX: Remove i.MX1 Armadeus APF9328 board support
      ARM: mxs: remove obsolete startup code for TX28
      ARM: i.MX31 iomux: remove duplicates with alternate name
      ARM: i.MX31 iomux: remove plain duplicates
      ARM: OMAP2+: Drop legacy board file for LDP
      ...
    a771151a