Commit 4fb84183 authored by Samuel Holland's avatar Samuel Holland Committed by Greg Kroah-Hartman

soc: sunxi: Fix missing dependency on REGMAP_MMIO

commit a84014e1 upstream.

When enabling ARCH_SUNXI from allnoconfig, SUNXI_SRAM is enabled, but
not REGMAP_MMIO, so the kernel fails to link with an undefined reference
to __devm_regmap_init_mmio_clk. Select REGMAP_MMIO, as suggested in
drivers/base/regmap/Kconfig.

This creates the following dependency loop:

  drivers/of/Kconfig:68:                symbol OF_IRQ depends on IRQ_DOMAIN
  kernel/irq/Kconfig:63:                symbol IRQ_DOMAIN is selected by REGMAP
  drivers/base/regmap/Kconfig:7:        symbol REGMAP default is visible depending on REGMAP_MMIO
  drivers/base/regmap/Kconfig:39:       symbol REGMAP_MMIO is selected by SUNXI_SRAM
  drivers/soc/sunxi/Kconfig:4:          symbol SUNXI_SRAM is selected by USB_MUSB_SUNXI
  drivers/usb/musb/Kconfig:63:          symbol USB_MUSB_SUNXI depends on GENERIC_PHY
  drivers/phy/Kconfig:7:                symbol GENERIC_PHY is selected by PHY_BCM_NS_USB3
  drivers/phy/broadcom/Kconfig:29:      symbol PHY_BCM_NS_USB3 depends on MDIO_BUS
  drivers/net/phy/Kconfig:12:           symbol MDIO_BUS default is visible depending on PHYLIB
  drivers/net/phy/Kconfig:181:          symbol PHYLIB is selected by ARC_EMAC_CORE
  drivers/net/ethernet/arc/Kconfig:18:  symbol ARC_EMAC_CORE is selected by ARC_EMAC
  drivers/net/ethernet/arc/Kconfig:24:  symbol ARC_EMAC depends on OF_IRQ

To fix the circular dependency, make USB_MUSB_SUNXI select GENERIC_PHY
instead of depending on it. This matches the use of GENERIC_PHY by all
but two other drivers.

Cc: <stable@vger.kernel.org> # 4.19
Fixes: 5828729b ("soc: sunxi: export a regmap for EMAC clock reg on A64")
Signed-off-by: default avatarSamuel Holland <samuel@sholland.org>
Acked-by: default avatarMaxime Ripard <maxime.ripard@bootlin.com>
Signed-off-by: default avatarBin Liu <b-liu@ti.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent cebdbdda
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
config SUNXI_SRAM config SUNXI_SRAM
bool bool
default ARCH_SUNXI default ARCH_SUNXI
select REGMAP_MMIO
help help
Say y here to enable the SRAM controller support. This Say y here to enable the SRAM controller support. This
device is responsible on mapping the SRAM in the sunXi SoCs device is responsible on mapping the SRAM in the sunXi SoCs
......
...@@ -67,7 +67,7 @@ config USB_MUSB_SUNXI ...@@ -67,7 +67,7 @@ config USB_MUSB_SUNXI
depends on NOP_USB_XCEIV depends on NOP_USB_XCEIV
depends on PHY_SUN4I_USB depends on PHY_SUN4I_USB
depends on EXTCON depends on EXTCON
depends on GENERIC_PHY select GENERIC_PHY
select SUNXI_SRAM select SUNXI_SRAM
config USB_MUSB_DAVINCI config USB_MUSB_DAVINCI
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment