[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20220713084010.168720-1-p.zabel@pengutronix.de>
Date: Wed, 13 Jul 2022 10:40:10 +0200
From: Philipp Zabel <p.zabel@...gutronix.de>
To: linux-kernel@...r.kernel.org
Cc: linux-arm-kernel@...ts.infradead.org,
Lars Povlsen <lars.povlsen@...rochip.com>,
Michael Walle <michael@...le.cc>,
Steen Hegelund <Steen.Hegelund@...rochip.com>,
Clément Léger <clement.leger@...tlin.com>,
Philipp Zabel <p.zabel@...gutronix.de>
Subject: [PATCH] Revert "reset: microchip-sparx5: allow building as a module"
This reverts commit b6b9585876da018bdde2d5f15d206a689c0d70f3.
This breaks MDIO on kswitch-d10, presumably because the global switch
reset is not released early enough anymore.
Reported-by: Michael Walle <michael@...le.cc>
Cc: Clément Léger <clement.leger@...tlin.com>
Signed-off-by: Philipp Zabel <p.zabel@...gutronix.de>
---
drivers/reset/Kconfig | 2 +-
drivers/reset/reset-microchip-sparx5.c | 8 ++++++--
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/drivers/reset/Kconfig b/drivers/reset/Kconfig
index d9a08ec343e2..f9a7cee01659 100644
--- a/drivers/reset/Kconfig
+++ b/drivers/reset/Kconfig
@@ -115,7 +115,7 @@ config RESET_LPC18XX
This enables the reset controller driver for NXP LPC18xx/43xx SoCs.
config RESET_MCHP_SPARX5
- tristate "Microchip Sparx5 reset driver"
+ bool "Microchip Sparx5 reset driver"
depends on ARCH_SPARX5 || SOC_LAN966 || COMPILE_TEST
default y if SPARX5_SWITCH
select MFD_SYSCON
diff --git a/drivers/reset/reset-microchip-sparx5.c b/drivers/reset/reset-microchip-sparx5.c
index 3d54dda3593e..00b612a0effa 100644
--- a/drivers/reset/reset-microchip-sparx5.c
+++ b/drivers/reset/reset-microchip-sparx5.c
@@ -149,7 +149,6 @@ static const struct of_device_id mchp_sparx5_reset_of_match[] = {
},
{ }
};
-MODULE_DEVICE_TABLE(of, mchp_sparx5_reset_of_match);
static struct platform_driver mchp_sparx5_reset_driver = {
.probe = mchp_sparx5_reset_probe,
@@ -159,7 +158,12 @@ static struct platform_driver mchp_sparx5_reset_driver = {
},
};
-module_platform_driver(mchp_sparx5_reset_driver);
+static int __init mchp_sparx5_reset_init(void)
+{
+ return platform_driver_register(&mchp_sparx5_reset_driver);
+}
+
+postcore_initcall(mchp_sparx5_reset_init);
MODULE_DESCRIPTION("Microchip Sparx5 switch reset driver");
MODULE_AUTHOR("Steen Hegelund <steen.hegelund@...rochip.com>");
--
2.30.2
Powered by blists - more mailing lists