Skip to content

Commit c38ae95

Browse files
jbrun3tpH5
jbrun3t
authored and
pH5
committed
reset: amlogic: split the device core and platform probe
To prepare the addition of the auxiliary device support, split out the device coomon functions from the probe of the platform device. The device core function will be common to both the platform and auxiliary driver. Signed-off-by: Jerome Brunet <jbrunet@baylibre.com> Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org> Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de> Link: https://lore.kernel.org/r/20240910-meson-rst-aux-v5-8-60be62635d3e@baylibre.com Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
1 parent 2c138ee commit c38ae95

File tree

5 files changed

+167
-108
lines changed

5 files changed

+167
-108
lines changed

‎drivers/reset/amlogic/Kconfig

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
1+
config RESET_MESON_COMMON
2+
tristate
3+
select REGMAP
4+
15
config RESET_MESON
26
tristate "Meson Reset Driver"
37
depends on ARCH_MESON || COMPILE_TEST
48
default ARCH_MESON
59
select REGMAP_MMIO
10+
select RESET_MESON_COMMON
611
help
7-
This enables the reset driver for Amlogic Meson SoCs.
12+
This enables the reset driver for Amlogic SoCs.
813

914
config RESET_MESON_AUDIO_ARB
1015
tristate "Meson Audio Memory Arbiter Reset Driver"

‎drivers/reset/amlogic/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
obj-$(CONFIG_RESET_MESON) += reset-meson.o
2+
obj-$(CONFIG_RESET_MESON_COMMON) += reset-meson-common.o
23
obj-$(CONFIG_RESET_MESON_AUDIO_ARB) += reset-meson-audio-arb.o

‎drivers/reset/amlogic/reset-meson-common.c

Lines changed: 121 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,121 @@
1+
// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
2+
/*
3+
* Amlogic Meson Reset core functions
4+
*
5+
* Copyright (c) 2016-2024 BayLibre, SAS.
6+
* Authors: Neil Armstrong <narmstrong@baylibre.com>
7+
* Jerome Brunet <jbrunet@baylibre.com>
8+
*/
9+
10+
#include <linux/device.h>
11+
#include <linux/module.h>
12+
#include <linux/regmap.h>
13+
#include <linux/reset-controller.h>
14+
15+
#include "reset-meson.h"
16+
17+
struct meson_reset {
18+
const struct meson_reset_param *param;
19+
struct reset_controller_dev rcdev;
20+
struct regmap *map;
21+
};
22+
23+
static void meson_reset_offset_and_bit(struct meson_reset *data,
24+
unsigned long id,
25+
unsigned int *offset,
26+
unsigned int *bit)
27+
{
28+
unsigned int stride = regmap_get_reg_stride(data->map);
29+
30+
*offset = (id / (stride * BITS_PER_BYTE)) * stride;
31+
*bit = id % (stride * BITS_PER_BYTE);
32+
}
33+
34+
static int meson_reset_reset(struct reset_controller_dev *rcdev,
35+
unsigned long id)
36+
{
37+
struct meson_reset *data =
38+
container_of(rcdev, struct meson_reset, rcdev);
39+
unsigned int offset, bit;
40+
41+
meson_reset_offset_and_bit(data, id, &offset, &bit);
42+
offset += data->param->reset_offset;
43+
44+
return regmap_write(data->map, offset, BIT(bit));
45+
}
46+
47+
static int meson_reset_level(struct reset_controller_dev *rcdev,
48+
unsigned long id, bool assert)
49+
{
50+
struct meson_reset *data =
51+
container_of(rcdev, struct meson_reset, rcdev);
52+
unsigned int offset, bit;
53+
54+
meson_reset_offset_and_bit(data, id, &offset, &bit);
55+
offset += data->param->level_offset;
56+
assert ^= data->param->level_low_reset;
57+
58+
return regmap_update_bits(data->map, offset,
59+
BIT(bit), assert ? BIT(bit) : 0);
60+
}
61+
62+
static int meson_reset_status(struct reset_controller_dev *rcdev,
63+
unsigned long id)
64+
{
65+
struct meson_reset *data =
66+
container_of(rcdev, struct meson_reset, rcdev);
67+
unsigned int val, offset, bit;
68+
69+
meson_reset_offset_and_bit(data, id, &offset, &bit);
70+
offset += data->param->level_offset;
71+
72+
regmap_read(data->map, offset, &val);
73+
val = !!(BIT(bit) & val);
74+
75+
return val ^ data->param->level_low_reset;
76+
}
77+
78+
static int meson_reset_assert(struct reset_controller_dev *rcdev,
79+
unsigned long id)
80+
{
81+
return meson_reset_level(rcdev, id, true);
82+
}
83+
84+
static int meson_reset_deassert(struct reset_controller_dev *rcdev,
85+
unsigned long id)
86+
{
87+
return meson_reset_level(rcdev, id, false);
88+
}
89+
90+
static const struct reset_control_ops meson_reset_ops = {
91+
.reset = meson_reset_reset,
92+
.assert = meson_reset_assert,
93+
.deassert = meson_reset_deassert,
94+
.status = meson_reset_status,
95+
};
96+
97+
int meson_reset_controller_register(struct device *dev, struct regmap *map,
98+
const struct meson_reset_param *param)
99+
{
100+
struct meson_reset *data;
101+
102+
data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL);
103+
if (!data)
104+
return -ENOMEM;
105+
106+
data->param = param;
107+
data->map = map;
108+
data->rcdev.owner = dev->driver->owner;
109+
data->rcdev.nr_resets = param->reset_num;
110+
data->rcdev.ops = &meson_reset_ops;
111+
data->rcdev.of_node = dev->of_node;
112+
113+
return devm_reset_controller_register(dev, &data->rcdev);
114+
}
115+
EXPORT_SYMBOL_NS_GPL(meson_reset_controller_register, MESON_RESET);
116+
117+
MODULE_DESCRIPTION("Amlogic Meson Reset Core function");
118+
MODULE_AUTHOR("Neil Armstrong <narmstrong@baylibre.com>");
119+
MODULE_AUTHOR("Jerome Brunet <jbrunet@baylibre.com>");
120+
MODULE_LICENSE("Dual BSD/GPL");
121+
MODULE_IMPORT_NS(MESON_RESET);

‎drivers/reset/amlogic/reset-meson.c

Lines changed: 15 additions & 107 deletions
Original file line numberDiff line numberDiff line change
@@ -2,106 +2,20 @@
22
/*
33
* Amlogic Meson Reset Controller driver
44
*
5-
* Copyright (c) 2016 BayLibre, SAS.
6-
* Author: Neil Armstrong <narmstrong@baylibre.com>
5+
* Copyright (c) 2016-2024 BayLibre, SAS.
6+
* Authors: Neil Armstrong <narmstrong@baylibre.com>
7+
* Jerome Brunet <jbrunet@baylibre.com>
78
*/
9+
810
#include <linux/err.h>
9-
#include <linux/init.h>
1011
#include <linux/io.h>
1112
#include <linux/of.h>
1213
#include <linux/module.h>
1314
#include <linux/platform_device.h>
1415
#include <linux/regmap.h>
1516
#include <linux/reset-controller.h>
16-
#include <linux/slab.h>
17-
#include <linux/types.h>
18-
19-
struct meson_reset_param {
20-
unsigned int reset_num;
21-
unsigned int reset_offset;
22-
unsigned int level_offset;
23-
bool level_low_reset;
24-
};
25-
26-
struct meson_reset {
27-
const struct meson_reset_param *param;
28-
struct reset_controller_dev rcdev;
29-
struct regmap *map;
30-
};
31-
32-
static void meson_reset_offset_and_bit(struct meson_reset *data,
33-
unsigned long id,
34-
unsigned int *offset,
35-
unsigned int *bit)
36-
{
37-
unsigned int stride = regmap_get_reg_stride(data->map);
38-
39-
*offset = (id / (stride * BITS_PER_BYTE)) * stride;
40-
*bit = id % (stride * BITS_PER_BYTE);
41-
}
42-
43-
static int meson_reset_reset(struct reset_controller_dev *rcdev,
44-
unsigned long id)
45-
{
46-
struct meson_reset *data =
47-
container_of(rcdev, struct meson_reset, rcdev);
48-
unsigned int offset, bit;
49-
50-
meson_reset_offset_and_bit(data, id, &offset, &bit);
51-
offset += data->param->reset_offset;
52-
53-
return regmap_write(data->map, offset, BIT(bit));
54-
}
55-
56-
static int meson_reset_level(struct reset_controller_dev *rcdev,
57-
unsigned long id, bool assert)
58-
{
59-
struct meson_reset *data =
60-
container_of(rcdev, struct meson_reset, rcdev);
61-
unsigned int offset, bit;
62-
63-
meson_reset_offset_and_bit(data, id, &offset, &bit);
64-
offset += data->param->level_offset;
65-
assert ^= data->param->level_low_reset;
6617

67-
return regmap_update_bits(data->map, offset,
68-
BIT(bit), assert ? BIT(bit) : 0);
69-
}
70-
71-
static int meson_reset_status(struct reset_controller_dev *rcdev,
72-
unsigned long id)
73-
{
74-
struct meson_reset *data =
75-
container_of(rcdev, struct meson_reset, rcdev);
76-
unsigned int val, offset, bit;
77-
78-
meson_reset_offset_and_bit(data, id, &offset, &bit);
79-
offset += data->param->level_offset;
80-
81-
regmap_read(data->map, offset, &val);
82-
val = !!(BIT(bit) & val);
83-
84-
return val ^ data->param->level_low_reset;
85-
}
86-
87-
static int meson_reset_assert(struct reset_controller_dev *rcdev,
88-
unsigned long id)
89-
{
90-
return meson_reset_level(rcdev, id, true);
91-
}
92-
93-
static int meson_reset_deassert(struct reset_controller_dev *rcdev,
94-
unsigned long id)
95-
{
96-
return meson_reset_level(rcdev, id, false);
97-
}
98-
99-
static const struct reset_control_ops meson_reset_ops = {
100-
.reset = meson_reset_reset,
101-
.assert = meson_reset_assert,
102-
.deassert = meson_reset_deassert,
103-
.status = meson_reset_status,
104-
};
18+
#include "reset-meson.h"
10519

10620
static const struct meson_reset_param meson8b_param = {
10721
.reset_num = 256,
@@ -151,33 +65,25 @@ static const struct regmap_config regmap_config = {
15165

15266
static int meson_reset_probe(struct platform_device *pdev)
15367
{
68+
const struct meson_reset_param *param;
15469
struct device *dev = &pdev->dev;
155-
struct meson_reset *data;
70+
struct regmap *map;
15671
void __iomem *base;
15772

158-
data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL);
159-
if (!data)
160-
return -ENOMEM;
161-
16273
base = devm_platform_ioremap_resource(pdev, 0);
16374
if (IS_ERR(base))
16475
return PTR_ERR(base);
16576

166-
data->param = device_get_match_data(dev);
167-
if (!data->param)
77+
param = device_get_match_data(dev);
78+
if (!param)
16879
return -ENODEV;
16980

170-
data->map = devm_regmap_init_mmio(dev, base, &regmap_config);
171-
if (IS_ERR(data->map))
172-
return dev_err_probe(dev, PTR_ERR(data->map),
81+
map = devm_regmap_init_mmio(dev, base, &regmap_config);
82+
if (IS_ERR(map))
83+
return dev_err_probe(dev, PTR_ERR(map),
17384
"can't init regmap mmio region\n");
17485

175-
data->rcdev.owner = THIS_MODULE;
176-
data->rcdev.nr_resets = data->param->reset_num;
177-
data->rcdev.ops = &meson_reset_ops;
178-
data->rcdev.of_node = dev->of_node;
179-
180-
return devm_reset_controller_register(dev, &data->rcdev);
86+
return meson_reset_controller_register(dev, map, param);
18187
}
18288

18389
static struct platform_driver meson_reset_driver = {
@@ -191,4 +97,6 @@ module_platform_driver(meson_reset_driver);
19197

19298
MODULE_DESCRIPTION("Amlogic Meson Reset Controller driver");
19399
MODULE_AUTHOR("Neil Armstrong <narmstrong@baylibre.com>");
100+
MODULE_AUTHOR("Jerome Brunet <jbrunet@baylibre.com>");
194101
MODULE_LICENSE("Dual BSD/GPL");
102+
MODULE_IMPORT_NS(MESON_RESET);

‎drivers/reset/amlogic/reset-meson.h

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */
2+
/*
3+
* Copyright (c) 2024 BayLibre, SAS.
4+
* Author: Jerome Brunet <jbrunet@baylibre.com>
5+
*/
6+
7+
#ifndef __MESON_RESET_H
8+
#define __MESON_RESET_H
9+
10+
#include <linux/module.h>
11+
#include <linux/regmap.h>
12+
#include <linux/reset-controller.h>
13+
14+
struct meson_reset_param {
15+
unsigned int reset_num;
16+
unsigned int reset_offset;
17+
unsigned int level_offset;
18+
bool level_low_reset;
19+
};
20+
21+
int meson_reset_controller_register(struct device *dev, struct regmap *map,
22+
const struct meson_reset_param *param);
23+
24+
#endif /* __MESON_RESET_H */

0 commit comments

Comments
 (0)