tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
reset: amlogic: add auxiliary reset driver support
Add support for the reset controller present in the audio clock
controller of the g12 and sm1 SoC families, using the auxiliary bus.
This is expected to replace the driver currently present directly
within the related clock driver.
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de>
Link: https://lore.kernel.org/r/20240910-meson-rst-aux-v5-9-60be62635d3e@baylibre.com
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
authored by
Jerome Brunet
and committed by
Philipp Zabel
fb4c3158
c38ae95c
+198
-2
+8
drivers/reset/amlogic/Kconfig
+8
drivers/reset/amlogic/Kconfig
···
11
11
help
12
12
This enables the reset driver for Amlogic SoCs.
13
13
14
+
config RESET_MESON_AUX
15
+
tristate "Meson Reset Auxiliary Driver"
16
+
depends on ARCH_MESON || COMPILE_TEST
17
+
select AUXILIARY_BUS
18
+
select RESET_MESON_COMMON
19
+
help
20
+
This enables the reset auxiliary driver for Amlogic SoCs.
21
+
14
22
config RESET_MESON_AUDIO_ARB
15
23
tristate "Meson Audio Memory Arbiter Reset Driver"
16
24
depends on ARCH_MESON || COMPILE_TEST
+1
drivers/reset/amlogic/Makefile
+1
drivers/reset/amlogic/Makefile
+136
drivers/reset/amlogic/reset-meson-aux.c
+136
drivers/reset/amlogic/reset-meson-aux.c
···
1
+
// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
2
+
/*
3
+
* Amlogic Meson Reset Auxiliary driver
4
+
*
5
+
* Copyright (c) 2024 BayLibre, SAS.
6
+
* Author: Jerome Brunet <jbrunet@baylibre.com>
7
+
*/
8
+
9
+
#include <linux/err.h>
10
+
#include <linux/module.h>
11
+
#include <linux/auxiliary_bus.h>
12
+
#include <linux/regmap.h>
13
+
#include <linux/reset-controller.h>
14
+
#include <linux/slab.h>
15
+
16
+
#include "reset-meson.h"
17
+
#include <soc/amlogic/reset-meson-aux.h>
18
+
19
+
static DEFINE_IDA(meson_rst_aux_ida);
20
+
21
+
struct meson_reset_adev {
22
+
struct auxiliary_device adev;
23
+
struct regmap *map;
24
+
};
25
+
26
+
#define to_meson_reset_adev(_adev) \
27
+
container_of((_adev), struct meson_reset_adev, adev)
28
+
29
+
static const struct meson_reset_param meson_g12a_audio_param = {
30
+
.reset_ops = &meson_reset_toggle_ops,
31
+
.reset_num = 26,
32
+
.level_offset = 0x24,
33
+
};
34
+
35
+
static const struct meson_reset_param meson_sm1_audio_param = {
36
+
.reset_ops = &meson_reset_toggle_ops,
37
+
.reset_num = 39,
38
+
.level_offset = 0x28,
39
+
};
40
+
41
+
static const struct auxiliary_device_id meson_reset_aux_ids[] = {
42
+
{
43
+
.name = "axg-audio-clkc.rst-g12a",
44
+
.driver_data = (kernel_ulong_t)&meson_g12a_audio_param,
45
+
}, {
46
+
.name = "axg-audio-clkc.rst-sm1",
47
+
.driver_data = (kernel_ulong_t)&meson_sm1_audio_param,
48
+
}, {}
49
+
};
50
+
MODULE_DEVICE_TABLE(auxiliary, meson_reset_aux_ids);
51
+
52
+
static int meson_reset_aux_probe(struct auxiliary_device *adev,
53
+
const struct auxiliary_device_id *id)
54
+
{
55
+
const struct meson_reset_param *param =
56
+
(const struct meson_reset_param *)(id->driver_data);
57
+
struct meson_reset_adev *raux =
58
+
to_meson_reset_adev(adev);
59
+
60
+
return meson_reset_controller_register(&adev->dev, raux->map, param);
61
+
}
62
+
63
+
static struct auxiliary_driver meson_reset_aux_driver = {
64
+
.probe = meson_reset_aux_probe,
65
+
.id_table = meson_reset_aux_ids,
66
+
};
67
+
module_auxiliary_driver(meson_reset_aux_driver);
68
+
69
+
static void meson_rst_aux_release(struct device *dev)
70
+
{
71
+
struct auxiliary_device *adev = to_auxiliary_dev(dev);
72
+
struct meson_reset_adev *raux =
73
+
to_meson_reset_adev(adev);
74
+
75
+
ida_free(&meson_rst_aux_ida, adev->id);
76
+
kfree(raux);
77
+
}
78
+
79
+
static void meson_rst_aux_unregister_adev(void *_adev)
80
+
{
81
+
struct auxiliary_device *adev = _adev;
82
+
83
+
auxiliary_device_delete(adev);
84
+
auxiliary_device_uninit(adev);
85
+
}
86
+
87
+
int devm_meson_rst_aux_register(struct device *dev,
88
+
struct regmap *map,
89
+
const char *adev_name)
90
+
{
91
+
struct meson_reset_adev *raux;
92
+
struct auxiliary_device *adev;
93
+
int ret;
94
+
95
+
raux = kzalloc(sizeof(*raux), GFP_KERNEL);
96
+
if (!raux)
97
+
return -ENOMEM;
98
+
99
+
ret = ida_alloc(&meson_rst_aux_ida, GFP_KERNEL);
100
+
if (ret < 0)
101
+
goto raux_free;
102
+
103
+
raux->map = map;
104
+
105
+
adev = &raux->adev;
106
+
adev->id = ret;
107
+
adev->name = adev_name;
108
+
adev->dev.parent = dev;
109
+
adev->dev.release = meson_rst_aux_release;
110
+
device_set_of_node_from_dev(&adev->dev, dev);
111
+
112
+
ret = auxiliary_device_init(adev);
113
+
if (ret)
114
+
goto ida_free;
115
+
116
+
ret = __auxiliary_device_add(adev, dev->driver->name);
117
+
if (ret) {
118
+
auxiliary_device_uninit(adev);
119
+
return ret;
120
+
}
121
+
122
+
return devm_add_action_or_reset(dev, meson_rst_aux_unregister_adev,
123
+
adev);
124
+
125
+
ida_free:
126
+
ida_free(&meson_rst_aux_ida, adev->id);
127
+
raux_free:
128
+
kfree(raux);
129
+
return ret;
130
+
}
131
+
EXPORT_SYMBOL_GPL(devm_meson_rst_aux_register);
132
+
133
+
MODULE_DESCRIPTION("Amlogic Meson Reset Auxiliary driver");
134
+
MODULE_AUTHOR("Jerome Brunet <jbrunet@baylibre.com>");
135
+
MODULE_LICENSE("Dual BSD/GPL");
136
+
MODULE_IMPORT_NS(MESON_RESET);
+23
-2
drivers/reset/amlogic/reset-meson-common.c
+23
-2
drivers/reset/amlogic/reset-meson-common.c
···
87
87
return meson_reset_level(rcdev, id, false);
88
88
}
89
89
90
-
static const struct reset_control_ops meson_reset_ops = {
90
+
static int meson_reset_level_toggle(struct reset_controller_dev *rcdev,
91
+
unsigned long id)
92
+
{
93
+
int ret;
94
+
95
+
ret = meson_reset_assert(rcdev, id);
96
+
if (ret)
97
+
return ret;
98
+
99
+
return meson_reset_deassert(rcdev, id);
100
+
}
101
+
102
+
const struct reset_control_ops meson_reset_ops = {
91
103
.reset = meson_reset_reset,
92
104
.assert = meson_reset_assert,
93
105
.deassert = meson_reset_deassert,
94
106
.status = meson_reset_status,
95
107
};
108
+
EXPORT_SYMBOL_NS_GPL(meson_reset_ops, MESON_RESET);
109
+
110
+
const struct reset_control_ops meson_reset_toggle_ops = {
111
+
.reset = meson_reset_level_toggle,
112
+
.assert = meson_reset_assert,
113
+
.deassert = meson_reset_deassert,
114
+
.status = meson_reset_status,
115
+
};
116
+
EXPORT_SYMBOL_NS_GPL(meson_reset_toggle_ops, MESON_RESET);
96
117
97
118
int meson_reset_controller_register(struct device *dev, struct regmap *map,
98
119
const struct meson_reset_param *param)
···
128
107
data->map = map;
129
108
data->rcdev.owner = dev->driver->owner;
130
109
data->rcdev.nr_resets = param->reset_num;
131
-
data->rcdev.ops = &meson_reset_ops;
110
+
data->rcdev.ops = data->param->reset_ops;
132
111
data->rcdev.of_node = dev->of_node;
133
112
134
113
return devm_reset_controller_register(dev, &data->rcdev);
+3
drivers/reset/amlogic/reset-meson.c
+3
drivers/reset/amlogic/reset-meson.c
···
18
18
#include "reset-meson.h"
19
19
20
20
static const struct meson_reset_param meson8b_param = {
21
+
.reset_ops = &meson_reset_ops,
21
22
.reset_num = 256,
22
23
.reset_offset = 0x0,
23
24
.level_offset = 0x7c,
···
26
25
};
27
26
28
27
static const struct meson_reset_param meson_a1_param = {
28
+
.reset_ops = &meson_reset_ops,
29
29
.reset_num = 96,
30
30
.reset_offset = 0x0,
31
31
.level_offset = 0x40,
···
34
32
};
35
33
36
34
static const struct meson_reset_param meson_s4_param = {
35
+
.reset_ops = &meson_reset_ops,
37
36
.reset_num = 192,
38
37
.reset_offset = 0x0,
39
38
.level_offset = 0x40,
+4
drivers/reset/amlogic/reset-meson.h
+4
drivers/reset/amlogic/reset-meson.h
···
12
12
#include <linux/reset-controller.h>
13
13
14
14
struct meson_reset_param {
15
+
const struct reset_control_ops *reset_ops;
15
16
unsigned int reset_num;
16
17
unsigned int reset_offset;
17
18
unsigned int level_offset;
···
21
20
22
21
int meson_reset_controller_register(struct device *dev, struct regmap *map,
23
22
const struct meson_reset_param *param);
23
+
24
+
extern const struct reset_control_ops meson_reset_ops;
25
+
extern const struct reset_control_ops meson_reset_toggle_ops;
24
26
25
27
#endif /* __MESON_RESET_H */
+23
include/soc/amlogic/reset-meson-aux.h
+23
include/soc/amlogic/reset-meson-aux.h
···
1
+
/* SPDX-License-Identifier: GPL-2.0 */
2
+
#ifndef __SOC_RESET_MESON_AUX_H
3
+
#define __SOC_RESET_MESON_AUX_H
4
+
5
+
#include <linux/err.h>
6
+
7
+
struct device;
8
+
struct regmap;
9
+
10
+
#if IS_ENABLED(CONFIG_RESET_MESON_AUX)
11
+
int devm_meson_rst_aux_register(struct device *dev,
12
+
struct regmap *map,
13
+
const char *adev_name);
14
+
#else
15
+
static inline int devm_meson_rst_aux_register(struct device *dev,
16
+
struct regmap *map,
17
+
const char *adev_name)
18
+
{
19
+
return 0;
20
+
}
21
+
#endif
22
+
23
+
#endif /* __SOC_RESET_MESON_AUX_H */