• Arnd Bergmann's avatar
    Merge tag 'omap-for-v4.6/defconfig-signed' of... · 4a6f791c
    Arnd Bergmann authored
    Merge tag 'omap-for-v4.6/defconfig-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/defconfig
    
    Merge "omap defconfig changes for v4.6 merge window" from Tony Lindgren:
    
    Defconfig changes for omap2plus_defconfig and multi_v7_defconfig
    for v4.6 merge window:
    
    - Enable IOMMU and omap3isp so we can enable TVP5150/1 video
      decoder
    
    - Enable at24 eeprom for revision detection on beagle-x15
    
    - Enable LP872x regulator for both omap2plus_defconfig and
      multi_v7_defconfig as it's needed at least by LG Optimus
      Black
    
    * tag 'omap-for-v4.6/defconfig-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
      ARM: multi_v7_defconfig: Enable LP872x regulator support
      ARM: omap2plus_defconfig: Enable LP872x regulator support
      ARM: omap2plus_defconfig: Enable AT24 eeprom
      ARM: omap2plus_defconfig: Enable TI TVP5150 video decoder support
      ARM: omap2plus_defconfig: Enable ISP support and dependencies
      ARM: omap2plus_defconfig: Enable OMAP IOMMU support
    4a6f791c
multi_v7_defconfig 19.2 KB