• Arnd Bergmann's avatar
    Merge tag 'omap-for-v4.17/defconfig-signed' of... · 8045f297
    Arnd Bergmann authored
    Merge tag 'omap-for-v4.17/defconfig-signed' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc
    
    Pull "Defconfig updates for omap variants for v4.17 merge window"
    from Tony Lindgren:
    
    We need to enable MMC_SDHCI option in both omap2plus_defconfig and
    multi_v7_defconfig so systems are able to mount root when the dts files
    get updated for sdhci.
    
    Then let's update omap2plus_defconfig so we can patch it easier. And as
    Arnd noticed earlier, just running make savedefconfig will accidentally
    drop few Kconfig options. This is happening because some options are no
    longer available as loadable modules like LIRC. Or new dependencies have
    been added such as SND_OSSEMUL for selecting SOUND_OSS_CORE.
    
    So we first move the unchanged options around to their make savedefconfig
    suggested place, then update the options to prevent make savedefconfig
    dropping some options accidentally, and then finally drop the unused
    options.
    
    And after that we enable options DRM_OMAP and 8250_OMAP. These both have
    been around for years now. And we do have 8250_OMAP warn about console
    being redirected with SERIAL_8250_OMAP_TTYO_FIXUP option that is enabled
    by default. Some users may need to update their inittab to use ttyS*
    instead of ttyO* though. If this turns out to be a problem, we may want
    to introduce a separate compatible for 8250-omap. But I think we're good
    to go with the SERIAL_8250_OMAP_TTYO_FIXUP warning now. Let's not update
    multi_v7_defconfig yet though and first see how 8250_OMAP change plays
    out.
    
    We also enable few new options for PM on am335x and am437x, and CEC in
    omap2plus_defconfig. Naturally similar options can be later on added to
    multi_v7_defconfig, but in this series we only enable OTG, MUSB and the
    related PHYs in multi_v7_defconfig to make it more usable for distros.
    
    * tag 'omap-for-v4.17/defconfig-signed' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
      ARM: multi_v7_defconfig: Enable USB gadget configfs as loadable module
      ARM: multi_v7_defconfig: Enable various USB PHYs found on omap variants
      ARM: multi_v7_defconfig: Enable OTG and MUSB as loadable modules
      ARM: omap2plus_defconfig: Enable 8250_OMAP
      ARM: omap2plus_defconfig: Switch to use omapdrm by default
      ARM: omap2plus_defconfig: Enable CEC
      ARM: omap2plus_defconfig: Enable am335x and am437x PM options
      ARM: omap2plus_defconfig: Drop unneeded options
      ARM: omap2plus_defconfig: Add SND_OSSEMUL
      ARM: omap2plus_defconfig: Update LIRC options
      ARM: omap2plus_defconfig: Select MFD_TI_LMU
      ARM: omap2plus_defconfig: Add SERIAL_DEV for bluetooth
      ARM: omap2plus_defconfig: Update for moved options
      ARM: omap2plus_defconfig: Enable CONFIG_MMC_SDHCI_OMAP
      ARM: multi_v7_defconfig: Enable CONFIG_MMC_SDHCI_OMAP
    Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
    8045f297
multi_v7_defconfig 23.6 KB