Skip to content

Commit 3eb8f76

Browse files
khayash1pH5
khayash1
authored and
pH5
committed
reset: uniphier-usb3: Rename to reset-uniphier-glue
This driver works for controlling the reset lines including USB3 glue layer, however, this can be applied to other glue layers. Now this patch renames the driver from "reset-uniphier-usb3" to "reset-uniphier-glue". At the same time, this changes CONFIG_RESET_UNIPHIER_USB3 to CONFIG_RESET_UNIPHIER_GLUE. Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
1 parent 21b2213 commit 3eb8f76

File tree

3 files changed

+25
-25
lines changed

3 files changed

+25
-25
lines changed

‎drivers/reset/Kconfig

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -171,15 +171,15 @@ config RESET_UNIPHIER
171171
Say Y if you want to control reset signals provided by System Control
172172
block, Media I/O block, Peripheral Block.
173173

174-
config RESET_UNIPHIER_USB3
175-
tristate "USB3 reset driver for UniPhier SoCs"
174+
config RESET_UNIPHIER_GLUE
175+
tristate "Reset driver in glue layer for UniPhier SoCs"
176176
depends on (ARCH_UNIPHIER || COMPILE_TEST) && OF
177177
default ARCH_UNIPHIER
178178
select RESET_SIMPLE
179179
help
180-
Support for the USB3 core reset on UniPhier SoCs.
181-
Say Y if you want to control reset signals provided by
182-
USB3 glue layer.
180+
Support for peripheral core reset included in its own glue layer
181+
on UniPhier SoCs. Say Y if you want to control reset signals
182+
provided by the glue layer.
183183

184184
config RESET_ZYNQ
185185
bool "ZYNQ Reset Driver" if COMPILE_TEST

‎drivers/reset/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@ obj-$(CONFIG_RESET_SUNXI) += reset-sunxi.o
2424
obj-$(CONFIG_RESET_TI_SCI) += reset-ti-sci.o
2525
obj-$(CONFIG_RESET_TI_SYSCON) += reset-ti-syscon.o
2626
obj-$(CONFIG_RESET_UNIPHIER) += reset-uniphier.o
27-
obj-$(CONFIG_RESET_UNIPHIER_USB3) += reset-uniphier-usb3.o
27+
obj-$(CONFIG_RESET_UNIPHIER_GLUE) += reset-uniphier-glue.o
2828
obj-$(CONFIG_RESET_ZYNQ) += reset-zynq.o
2929

‎drivers/reset/reset-uniphier-usb3.c renamed to ‎drivers/reset/reset-uniphier-glue.c

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// SPDX-License-Identifier: GPL-2.0
22
//
3-
// reset-uniphier-usb3.c - USB3 reset driver for UniPhier
3+
// reset-uniphier-glue.c - Glue layer reset driver for UniPhier
44
// Copyright 2018 Socionext Inc.
55
// Author: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
66

@@ -15,24 +15,24 @@
1515
#define MAX_CLKS 2
1616
#define MAX_RSTS 2
1717

18-
struct uniphier_usb3_reset_soc_data {
18+
struct uniphier_glue_reset_soc_data {
1919
int nclks;
2020
const char * const *clock_names;
2121
int nrsts;
2222
const char * const *reset_names;
2323
};
2424

25-
struct uniphier_usb3_reset_priv {
25+
struct uniphier_glue_reset_priv {
2626
struct clk_bulk_data clk[MAX_CLKS];
2727
struct reset_control *rst[MAX_RSTS];
2828
struct reset_simple_data rdata;
29-
const struct uniphier_usb3_reset_soc_data *data;
29+
const struct uniphier_glue_reset_soc_data *data;
3030
};
3131

32-
static int uniphier_usb3_reset_probe(struct platform_device *pdev)
32+
static int uniphier_glue_reset_probe(struct platform_device *pdev)
3333
{
3434
struct device *dev = &pdev->dev;
35-
struct uniphier_usb3_reset_priv *priv;
35+
struct uniphier_glue_reset_priv *priv;
3636
struct resource *res;
3737
resource_size_t size;
3838
const char *name;
@@ -100,9 +100,9 @@ static int uniphier_usb3_reset_probe(struct platform_device *pdev)
100100
return ret;
101101
}
102102

103-
static int uniphier_usb3_reset_remove(struct platform_device *pdev)
103+
static int uniphier_glue_reset_remove(struct platform_device *pdev)
104104
{
105-
struct uniphier_usb3_reset_priv *priv = platform_get_drvdata(pdev);
105+
struct uniphier_glue_reset_priv *priv = platform_get_drvdata(pdev);
106106
int i;
107107

108108
for (i = 0; i < priv->data->nrsts; i++)
@@ -117,7 +117,7 @@ static const char * const uniphier_pro4_clock_reset_names[] = {
117117
"gio", "link",
118118
};
119119

120-
static const struct uniphier_usb3_reset_soc_data uniphier_pro4_data = {
120+
static const struct uniphier_glue_reset_soc_data uniphier_pro4_data = {
121121
.nclks = ARRAY_SIZE(uniphier_pro4_clock_reset_names),
122122
.clock_names = uniphier_pro4_clock_reset_names,
123123
.nrsts = ARRAY_SIZE(uniphier_pro4_clock_reset_names),
@@ -128,14 +128,14 @@ static const char * const uniphier_pxs2_clock_reset_names[] = {
128128
"link",
129129
};
130130

131-
static const struct uniphier_usb3_reset_soc_data uniphier_pxs2_data = {
131+
static const struct uniphier_glue_reset_soc_data uniphier_pxs2_data = {
132132
.nclks = ARRAY_SIZE(uniphier_pxs2_clock_reset_names),
133133
.clock_names = uniphier_pxs2_clock_reset_names,
134134
.nrsts = ARRAY_SIZE(uniphier_pxs2_clock_reset_names),
135135
.reset_names = uniphier_pxs2_clock_reset_names,
136136
};
137137

138-
static const struct of_device_id uniphier_usb3_reset_match[] = {
138+
static const struct of_device_id uniphier_glue_reset_match[] = {
139139
{
140140
.compatible = "socionext,uniphier-pro4-usb3-reset",
141141
.data = &uniphier_pro4_data,
@@ -154,18 +154,18 @@ static const struct of_device_id uniphier_usb3_reset_match[] = {
154154
},
155155
{ /* Sentinel */ }
156156
};
157-
MODULE_DEVICE_TABLE(of, uniphier_usb3_reset_match);
157+
MODULE_DEVICE_TABLE(of, uniphier_glue_reset_match);
158158

159-
static struct platform_driver uniphier_usb3_reset_driver = {
160-
.probe = uniphier_usb3_reset_probe,
161-
.remove = uniphier_usb3_reset_remove,
159+
static struct platform_driver uniphier_glue_reset_driver = {
160+
.probe = uniphier_glue_reset_probe,
161+
.remove = uniphier_glue_reset_remove,
162162
.driver = {
163-
.name = "uniphier-usb3-reset",
164-
.of_match_table = uniphier_usb3_reset_match,
163+
.name = "uniphier-glue-reset",
164+
.of_match_table = uniphier_glue_reset_match,
165165
},
166166
};
167-
module_platform_driver(uniphier_usb3_reset_driver);
167+
module_platform_driver(uniphier_glue_reset_driver);
168168

169169
MODULE_AUTHOR("Kunihiko Hayashi <hayashi.kunihiko@socionext.com>");
170-
MODULE_DESCRIPTION("UniPhier USB3 Reset Driver");
170+
MODULE_DESCRIPTION("UniPhier Glue layer reset driver");
171171
MODULE_LICENSE("GPL");

0 commit comments

Comments
 (0)