To use auxiliary bus interface:
- Add a probe function inside reset-mediatek-sysclk.c.
- Revise the auxiliary table name because the rule for this
table is `KBUILD_MODNAME.device_name`
- Remove mtk_reset_init_with_dev() because we should use aux bus
interface directly.
Suggested-by: Stephen Boyd <[email protected]>
Signed-off-by: Bo-Chen Chen <[email protected]>
---
drivers/reset/mediatek/Kconfig | 1 +
.../reset/mediatek/reset-mediatek-sysclk.c | 67 ++++++++++---------
include/linux/reset/reset-mediatek-sysclk.h | 1 -
3 files changed, 35 insertions(+), 34 deletions(-)
diff --git a/drivers/reset/mediatek/Kconfig b/drivers/reset/mediatek/Kconfig
index a416cb938753..b5b671017d34 100644
--- a/drivers/reset/mediatek/Kconfig
+++ b/drivers/reset/mediatek/Kconfig
@@ -1,5 +1,6 @@
# SPDX-License-Identifier: GPL-2.0-only
config RESET_MEDIATEK_SYSCLK
tristate "MediaTek System Clock Reset Driver"
+ depends on AUXILIARY_BUS
help
This enables the system clock reset driver for MediaTek SoCs.
diff --git a/drivers/reset/mediatek/reset-mediatek-sysclk.c b/drivers/reset/mediatek/reset-mediatek-sysclk.c
index 9cf115e66a4d..79d58bc728b2 100644
--- a/drivers/reset/mediatek/reset-mediatek-sysclk.c
+++ b/drivers/reset/mediatek/reset-mediatek-sysclk.c
@@ -3,6 +3,7 @@
* Copyright (c) 2022 MediaTek Inc.
*/
+#include <linux/auxiliary_bus.h>
#include <linux/mfd/syscon.h>
#include <linux/module.h>
#include <linux/of.h>
@@ -213,78 +214,73 @@ static int register_rst_ctrl_with_dev(struct device *dev, struct mtk_clk_rst_dat
return 0;
}
-struct mtk_rst_id {
- char name[32];
- u32 driver_data;
-};
-
-static struct mtk_rst_id mtk_sysclk_reset_ids[] = {
+static struct auxiliary_device_id mtk_sysclk_reset_ids[] = {
{
- .name = "mt2701-eth-rst",
+ .name = "clk_mt2701_eth.mt2701-eth-rst",
.driver_data = MTK_RST_ID_MT2701_ETH,
},
{
- .name = "mt2701-g3d-rst",
+ .name = "clk_mt2701_g3d.mt2701-g3d-rst",
.driver_data = MTK_RST_ID_MT2701_G3D,
},
{
- .name = "mt2701-hif-rst",
+ .name = "clk_mt2701_hif.mt2701-hif-rst",
.driver_data = MTK_RST_ID_MT2701_HIF,
},
{
- .name = "mt2701-infrasys-rst",
+ .name = "clk_mt2701.mt2701-infrasys-rst",
.driver_data = MTK_RST_ID_MT2701_INFRASYS,
},
{
- .name = "mt2701-pericfg-rst",
+ .name = "clk_mt2701.mt2701-pericfg-rst",
.driver_data = MTK_RST_ID_MT2701_PERICFG,
},
{
- .name = "mt2712-infra-rst",
+ .name = "clk_mt2712.mt2712-infra-rst",
.driver_data = MTK_RST_ID_MT2712_INFRA,
},
{
- .name = "mt2712-peri-rst",
+ .name = "clk_mt2712.mt2712-peri-rst",
.driver_data = MTK_RST_ID_MT2712_PERI,
},
{
- .name = "mt6795-ifa",
+ .name = "clk_mt6795_infracfg.mt6795-ifa",
.driver_data = MTK_RST_ID_MT6795_INFRA,
},
{
- .name = "mt6795-peri",
+ .name = "clk_mt6795_pericfg.mt6795-peri",
.driver_data = MTK_RST_ID_MT6795_PERI,
},
{
- .name = "mt7622-eth-rst",
+ .name = "clk_mt7622_eth.mt7622-eth-rst",
.driver_data = MTK_RST_ID_MT7622_ETH,
},
{
- .name = "mt7622-usb-rst",
+ .name = "clk_mt7622_hif.mt7622-usb-rst",
.driver_data = MTK_RST_ID_MT7622_SSUSBSYS,
},
{
- .name = "mt7622-pcie-rst",
+ .name = "clk_mt7622_hif.mt7622-pcie-rst",
.driver_data = MTK_RST_ID_MT7622_PCIESYS,
},
{
- .name = "mt7622-infrasys-rst",
+ .name = "clk_mt7622.mt7622-infrasys-rst",
.driver_data = MTK_RST_ID_MT7622_INFRASYS,
},
{
- .name = "mt7622-pericfg-rst",
+ .name = "clk_mt7622.mt7622-pericfg-rst",
.driver_data = MTK_RST_ID_MT7622_PERICFG,
},
{
- .name = "mt7629-ethsys-rst",
+ .name = "clk_mt7629_eth.mt7629-ethsys-rst",
.driver_data = MTK_RST_ID_MT7629_ETHSYS,
},
{
- .name = "mt7629-usb-rst",
+ .name = "clk_mt7629_hif.mt7629-usb-rst",
.driver_data = MTK_RST_ID_MT7629_SSUSBSYS,
},
{
- .name = "mt7629-pcie-rst",
+ .name = "clk_mt7629_hif.mt7629-pcie-rst",
.driver_data = MTK_RST_ID_MT7629_PCIESYS,
},
{
@@ -304,24 +300,25 @@ static struct mtk_rst_id mtk_sysclk_reset_ids[] = {
.driver_data = MTK_RST_ID_MT8173_PERICFG,
},
{
- .name = "mt8183-infra-rst",
+ .name = "clk_mt8183.mt8183-infra-rst",
.driver_data = MTK_RST_ID_MT8183_INFRA,
},
{
- .name = "mt8186-infra-ao-rst",
+ .name = "clk_mtk.mt8186-infra-ao-rst",
.driver_data = MTK_RST_ID_MT8186_INFRA_AO,
},
{
- .name = "mt8192-infra-rst",
+ .name = "clk_mt8192.mt8192-infra-rst",
.driver_data = MTK_RST_ID_MT8192_INFRA,
},
{
- .name = "mt8195-infra-ao-rst",
+ .name = "clk_mtk.mt8195-infra-ao-rst",
.driver_data = MTK_RST_ID_MT8195_INFRA_AO,
},
{
},
};
+MODULE_DEVICE_TABLE(auxiliary, mtk_sysclk_reset_ids);
/* reset data pointer */
struct mtk_clk_rst_data *p_clk_rst_data[MTK_RST_ID_MAX];
@@ -372,16 +369,20 @@ void mtk_rst_remove_with_node(struct device_node *np, const char *name)
}
EXPORT_SYMBOL_GPL(mtk_rst_remove_with_node);
-int mtk_reset_init_with_dev(struct device *dev, const char *name)
+static int mtk_sysclk_reset_probe(struct auxiliary_device *adev,
+ const struct auxiliary_device_id *id)
{
- struct mtk_clk_rst_data *data = find_rst_data(name);
-
- if (!dev || !data)
+ if (id->driver_data >= MTK_RST_ID_MAX)
return -EINVAL;
- return register_rst_ctrl_with_dev(dev, data);
+ return register_rst_ctrl_with_dev(adev->dev.parent, p_clk_rst_data[id->driver_data]);
}
-EXPORT_SYMBOL_GPL(mtk_reset_init_with_dev);
+
+static struct auxiliary_driver mtk_sysclk_reset_driver = {
+ .probe = mtk_sysclk_reset_probe,
+ .id_table = mtk_sysclk_reset_ids,
+};
+module_auxiliary_driver(mtk_sysclk_reset_driver);
MODULE_DESCRIPTION("MediaTek System Clock Reset Driver");
MODULE_AUTHOR("Bo-Chen Chen <[email protected]>");
diff --git a/include/linux/reset/reset-mediatek-sysclk.h b/include/linux/reset/reset-mediatek-sysclk.h
index 26f7573e46a6..6f5f15d12edd 100644
--- a/include/linux/reset/reset-mediatek-sysclk.h
+++ b/include/linux/reset/reset-mediatek-sysclk.h
@@ -93,6 +93,5 @@ struct mtk_clk_rst_data {
int mtk_rst_register_clk_rst_data(u32 index, struct mtk_clk_rst_data *data);
int mtk_reset_init_with_node(struct device_node *np, const char *name);
void mtk_rst_remove_with_node(struct device_node *np, const char *name);
-int mtk_reset_init_with_dev(struct device *dev, const char *name);
#endif /* __LINUX_RESET_MEDIATEK_SYSCLK_H__ */
--
2.18.0