Skip to content

Commit 096e772

Browse files
committed
Revert "reset: microchip-sparx5: allow building as a module"
This reverts commit b6b9585. This breaks MDIO on kswitch-d10, presumably because the global switch reset is not released early enough anymore. Reported-by: Michael Walle <michael@walle.cc> Cc: Clément Léger <clement.leger@bootlin.com> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> Tested-by: Michael Walle <michael@walle.cc> Link: https://lore.kernel.org/r/20220713084010.168720-1-p.zabel@pengutronix.de
1 parent af19f19 commit 096e772

2 files changed

Lines changed: 7 additions & 3 deletions

File tree

drivers/reset/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ config RESET_LPC18XX
115115
This enables the reset controller driver for NXP LPC18xx/43xx SoCs.
116116

117117
config RESET_MCHP_SPARX5
118-
tristate "Microchip Sparx5 reset driver"
118+
bool "Microchip Sparx5 reset driver"
119119
depends on ARCH_SPARX5 || SOC_LAN966 || COMPILE_TEST
120120
default y if SPARX5_SWITCH
121121
select MFD_SYSCON

drivers/reset/reset-microchip-sparx5.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,6 @@ static const struct of_device_id mchp_sparx5_reset_of_match[] = {
149149
},
150150
{ }
151151
};
152-
MODULE_DEVICE_TABLE(of, mchp_sparx5_reset_of_match);
153152

154153
static struct platform_driver mchp_sparx5_reset_driver = {
155154
.probe = mchp_sparx5_reset_probe,
@@ -159,7 +158,12 @@ static struct platform_driver mchp_sparx5_reset_driver = {
159158
},
160159
};
161160

162-
module_platform_driver(mchp_sparx5_reset_driver);
161+
static int __init mchp_sparx5_reset_init(void)
162+
{
163+
return platform_driver_register(&mchp_sparx5_reset_driver);
164+
}
165+
166+
postcore_initcall(mchp_sparx5_reset_init);
163167

164168
MODULE_DESCRIPTION("Microchip Sparx5 switch reset driver");
165169
MODULE_AUTHOR("Steen Hegelund <steen.hegelund@microchip.com>");

0 commit comments

Comments
 (0)