Skip to content

Commit eaae5a8

Browse files
arndbarndb
committed
Merge tag 'reset-for-v6.5' of git://git.pengutronix.de/pza/linux into soc/drivers
Reset controller updates for v6.5 Use devm_platform_ioremap_resource() instead of platform_get_resource() and devm_ioremap_resource() in various drivers, simplify the stih407 Kconfig and use regmap_field_read_poll_timeout() instead of open-coded waiting, and use dev_err_probe() in the meson-audio-arb reset driver. With its platform gone, remove the now obsolete oxnas reset driver. Drop depends on the non-user-visible CONFIG_AUXILIARY_BUS symbol. * tag 'reset-for-v6.5' of git://git.pengutronix.de/pza/linux: reset: mpfs: select AUXILIARY_BUS reset: starfive: select AUXILIARY_BUS reset: oxnas: remove obsolete reset driver reset: sti: simplify driver's config and build reset: meson-audio-arb: Use dev_err_probe() reset: sti: rely on regmap_field_read_poll_timeout for ack wait reset: brcmstb-rescal: Use devm_platform_ioremap_resource() reset: meson: Use devm_platform_ioremap_resource() reset: reset-hsdk: Use devm_platform_ioremap_resource() reset: lpc18xx: Use devm_platform_ioremap_resource() reset: axs10x: Use devm_platform_ioremap_resource() reset: ath79: Use devm_platform_ioremap_resource() Link: https://lore.kernel.org/r/20230511133235.874566-1-p.zabel@pengutronix.de Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 2336ce7 + afb39e2 commit eaae5a8

15 files changed

Lines changed: 18 additions & 198 deletions

File tree

‎Documentation/devicetree/bindings/reset/oxnas,reset.txt‎

Lines changed: 0 additions & 32 deletions
This file was deleted.

‎drivers/reset/Kconfig‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -143,9 +143,6 @@ config RESET_NPCM
143143
This enables the reset controller driver for Nuvoton NPCM
144144
BMC SoCs.
145145

146-
config RESET_OXNAS
147-
bool
148-
149146
config RESET_PISTACHIO
150147
bool "Pistachio Reset Driver"
151148
depends on MIPS || COMPILE_TEST
@@ -154,7 +151,8 @@ config RESET_PISTACHIO
154151

155152
config RESET_POLARFIRE_SOC
156153
bool "Microchip PolarFire SoC (MPFS) Reset Driver"
157-
depends on AUXILIARY_BUS && MCHP_CLK_MPFS
154+
depends on MCHP_CLK_MPFS
155+
select AUXILIARY_BUS
158156
default MCHP_CLK_MPFS
159157
help
160158
This driver supports peripheral reset for the Microchip PolarFire SoC

‎drivers/reset/Makefile‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ obj-$(CONFIG_RESET_MCHP_SPARX5) += reset-microchip-sparx5.o
2121
obj-$(CONFIG_RESET_MESON) += reset-meson.o
2222
obj-$(CONFIG_RESET_MESON_AUDIO_ARB) += reset-meson-audio-arb.o
2323
obj-$(CONFIG_RESET_NPCM) += reset-npcm.o
24-
obj-$(CONFIG_RESET_OXNAS) += reset-oxnas.o
2524
obj-$(CONFIG_RESET_PISTACHIO) += reset-pistachio.o
2625
obj-$(CONFIG_RESET_POLARFIRE_SOC) += reset-mpfs.o
2726
obj-$(CONFIG_RESET_QCOM_AOSS) += reset-qcom-aoss.o

‎drivers/reset/reset-ath79.c‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@ static int ath79_reset_restart_handler(struct notifier_block *nb,
8686
static int ath79_reset_probe(struct platform_device *pdev)
8787
{
8888
struct ath79_reset *ath79_reset;
89-
struct resource *res;
9089
int err;
9190

9291
ath79_reset = devm_kzalloc(&pdev->dev,
@@ -96,8 +95,7 @@ static int ath79_reset_probe(struct platform_device *pdev)
9695

9796
platform_set_drvdata(pdev, ath79_reset);
9897

99-
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
100-
ath79_reset->base = devm_ioremap_resource(&pdev->dev, res);
98+
ath79_reset->base = devm_platform_ioremap_resource(pdev, 0);
10199
if (IS_ERR(ath79_reset->base))
102100
return PTR_ERR(ath79_reset->base);
103101

‎drivers/reset/reset-axs10x.c‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,12 @@ static const struct reset_control_ops axs10x_reset_ops = {
4444
static int axs10x_reset_probe(struct platform_device *pdev)
4545
{
4646
struct axs10x_rst *rst;
47-
struct resource *mem;
4847

4948
rst = devm_kzalloc(&pdev->dev, sizeof(*rst), GFP_KERNEL);
5049
if (!rst)
5150
return -ENOMEM;
5251

53-
mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
54-
rst->regs_rst = devm_ioremap_resource(&pdev->dev, mem);
52+
rst->regs_rst = devm_platform_ioremap_resource(pdev, 0);
5553
if (IS_ERR(rst->regs_rst))
5654
return PTR_ERR(rst->regs_rst);
5755

‎drivers/reset/reset-brcmstb-rescal.c‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,14 +66,12 @@ static const struct reset_control_ops brcm_rescal_reset_ops = {
6666
static int brcm_rescal_reset_probe(struct platform_device *pdev)
6767
{
6868
struct brcm_rescal_reset *data;
69-
struct resource *res;
7069

7170
data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL);
7271
if (!data)
7372
return -ENOMEM;
7473

75-
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
76-
data->base = devm_ioremap_resource(&pdev->dev, res);
74+
data->base = devm_platform_ioremap_resource(pdev, 0);
7775
if (IS_ERR(data->base))
7876
return PTR_ERR(data->base);
7977

‎drivers/reset/reset-hsdk.c‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -92,19 +92,16 @@ static const struct reset_control_ops hsdk_reset_ops = {
9292
static int hsdk_reset_probe(struct platform_device *pdev)
9393
{
9494
struct hsdk_rst *rst;
95-
struct resource *mem;
9695

9796
rst = devm_kzalloc(&pdev->dev, sizeof(*rst), GFP_KERNEL);
9897
if (!rst)
9998
return -ENOMEM;
10099

101-
mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
102-
rst->regs_ctl = devm_ioremap_resource(&pdev->dev, mem);
100+
rst->regs_ctl = devm_platform_ioremap_resource(pdev, 0);
103101
if (IS_ERR(rst->regs_ctl))
104102
return PTR_ERR(rst->regs_ctl);
105103

106-
mem = platform_get_resource(pdev, IORESOURCE_MEM, 1);
107-
rst->regs_rst = devm_ioremap_resource(&pdev->dev, mem);
104+
rst->regs_rst = devm_platform_ioremap_resource(pdev, 1);
108105
if (IS_ERR(rst->regs_rst))
109106
return PTR_ERR(rst->regs_rst);
110107

‎drivers/reset/reset-lpc18xx.c‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -139,16 +139,14 @@ static const struct reset_control_ops lpc18xx_rgu_ops = {
139139
static int lpc18xx_rgu_probe(struct platform_device *pdev)
140140
{
141141
struct lpc18xx_rgu_data *rc;
142-
struct resource *res;
143142
u32 fcclk, firc;
144143
int ret;
145144

146145
rc = devm_kzalloc(&pdev->dev, sizeof(*rc), GFP_KERNEL);
147146
if (!rc)
148147
return -ENOMEM;
149148

150-
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
151-
rc->base = devm_ioremap_resource(&pdev->dev, res);
149+
rc->base = devm_platform_ioremap_resource(pdev, 0);
152150
if (IS_ERR(rc->base))
153151
return PTR_ERR(rc->base);
154152

‎drivers/reset/reset-meson-audio-arb.c‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -151,11 +151,8 @@ static int meson_audio_arb_probe(struct platform_device *pdev)
151151
platform_set_drvdata(pdev, arb);
152152

153153
arb->clk = devm_clk_get(dev, NULL);
154-
if (IS_ERR(arb->clk)) {
155-
if (PTR_ERR(arb->clk) != -EPROBE_DEFER)
156-
dev_err(dev, "failed to get clock\n");
157-
return PTR_ERR(arb->clk);
158-
}
154+
if (IS_ERR(arb->clk))
155+
return dev_err_probe(dev, PTR_ERR(arb->clk), "failed to get clock\n");
159156

160157
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
161158
arb->regs = devm_ioremap_resource(dev, res);

‎drivers/reset/reset-meson.c‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,14 +116,12 @@ MODULE_DEVICE_TABLE(of, meson_reset_dt_ids);
116116
static int meson_reset_probe(struct platform_device *pdev)
117117
{
118118
struct meson_reset *data;
119-
struct resource *res;
120119

121120
data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL);
122121
if (!data)
123122
return -ENOMEM;
124123

125-
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
126-
data->reg_base = devm_ioremap_resource(&pdev->dev, res);
124+
data->reg_base = devm_platform_ioremap_resource(pdev, 0);
127125
if (IS_ERR(data->reg_base))
128126
return PTR_ERR(data->reg_base);
129127

0 commit comments

Comments
 (0)