• Philipp Zabel's avatar
    modpost: fix module autoloading for OF devices with generic compatible property · acbef7b7
    Philipp Zabel authored
    Since the wildcard at the end of OF module aliases is gone, autoloading
    of modules that don't match a device's last (most generic) compatible
    value fails.
    
    For example the CODA960 VPU on i.MX6Q has the SoC specific compatible
    "fsl,imx6q-vpu" and the generic compatible "cnm,coda960".  Since the
    driver currently only works with knowledge about the SoC specific
    integration, it doesn't list "cnm,cod960" in the module device table.
    
    This results in the device compatible
    "of:NvpuT<NULL>Cfsl,imx6q-vpuCcnm,coda960" not matching the module alias
    "of:N*T*Cfsl,imx6q-vpu" anymore, whereas before commit 2f632369
    ("modpost: don't add a trailing wildcard for OF module aliases") it
    matched the module alias "of:N*T*Cfsl,imx6q-vpu*".
    
    This patch adds two module aliases for each compatible, one without the
    wildcard and one with "C*" appended.
    
      $ modinfo coda | grep imx6q
      alias:          of:N*T*Cfsl,imx6q-vpuC*
      alias:          of:N*T*Cfsl,imx6q-vpu
    
    Fixes: 2f632369 ("modpost: don't add a trailing wildcard for OF module aliases")
    Link: http://lkml.kernel.org/r/1462203339-15340-1-git-send-email-p.zabel@pengutronix.deSigned-off-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
    Cc: Javier Martinez Canillas <javier@osg.samsung.com>
    Cc: Brian Norris <computersforpeace@gmail.com>
    Cc: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
    Cc: Rusty Russell <rusty@rustcorp.com.au>
    Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Cc: <stable@vger.kernel.org>	[4.5+]
    Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
    Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
    acbef7b7
file2alias.c 40.5 KB