Commit 0333103e authored by Emil Renner Berthing's avatar Emil Renner Berthing Committed by Conor Dooley

reset: starfive: Rename "jh7100" to "jh71x0" for the common code

For the common code will be shared with the StarFive JH7110 SoC.
Tested-by: default avatarTommaso Merciai <tomm.merciai@gmail.com>
Reviewed-by: default avatarConor Dooley <conor.dooley@microchip.com>
Reviewed-by: default avatarEmil Renner Berthing <emil.renner.berthing@canonical.com>
Signed-off-by: default avatarEmil Renner Berthing <kernel@esmil.dk>
Signed-off-by: default avatarHal Feng <hal.feng@starfivetech.com>
Signed-off-by: default avatarConor Dooley <conor.dooley@microchip.com>
parent ed36fcd1
...@@ -51,7 +51,7 @@ static int __init jh7100_reset_probe(struct platform_device *pdev) ...@@ -51,7 +51,7 @@ static int __init jh7100_reset_probe(struct platform_device *pdev)
if (IS_ERR(base)) if (IS_ERR(base))
return PTR_ERR(base); return PTR_ERR(base);
return reset_starfive_jh7100_register(&pdev->dev, pdev->dev.of_node, return reset_starfive_jh71x0_register(&pdev->dev, pdev->dev.of_node,
base + JH7100_RESET_ASSERT0, base + JH7100_RESET_ASSERT0,
base + JH7100_RESET_STATUS0, base + JH7100_RESET_STATUS0,
jh7100_reset_asserted, jh7100_reset_asserted,
......
// SPDX-License-Identifier: GPL-2.0-or-later // SPDX-License-Identifier: GPL-2.0-or-later
/* /*
* Reset driver for the StarFive JH7100 SoC * Reset driver for the StarFive JH71X0 SoCs
* *
* Copyright (C) 2021 Emil Renner Berthing <kernel@esmil.dk> * Copyright (C) 2021 Emil Renner Berthing <kernel@esmil.dk>
*/ */
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
#include "reset-starfive-jh71x0.h" #include "reset-starfive-jh71x0.h"
struct jh7100_reset { struct jh71x0_reset {
struct reset_controller_dev rcdev; struct reset_controller_dev rcdev;
/* protect registers against concurrent read-modify-write */ /* protect registers against concurrent read-modify-write */
spinlock_t lock; spinlock_t lock;
...@@ -24,16 +24,16 @@ struct jh7100_reset { ...@@ -24,16 +24,16 @@ struct jh7100_reset {
const u64 *asserted; const u64 *asserted;
}; };
static inline struct jh7100_reset * static inline struct jh71x0_reset *
jh7100_reset_from(struct reset_controller_dev *rcdev) jh71x0_reset_from(struct reset_controller_dev *rcdev)
{ {
return container_of(rcdev, struct jh7100_reset, rcdev); return container_of(rcdev, struct jh71x0_reset, rcdev);
} }
static int jh7100_reset_update(struct reset_controller_dev *rcdev, static int jh71x0_reset_update(struct reset_controller_dev *rcdev,
unsigned long id, bool assert) unsigned long id, bool assert)
{ {
struct jh7100_reset *data = jh7100_reset_from(rcdev); struct jh71x0_reset *data = jh71x0_reset_from(rcdev);
unsigned long offset = BIT_ULL_WORD(id); unsigned long offset = BIT_ULL_WORD(id);
u64 mask = BIT_ULL_MASK(id); u64 mask = BIT_ULL_MASK(id);
void __iomem *reg_assert = data->assert + offset * sizeof(u64); void __iomem *reg_assert = data->assert + offset * sizeof(u64);
...@@ -62,34 +62,34 @@ static int jh7100_reset_update(struct reset_controller_dev *rcdev, ...@@ -62,34 +62,34 @@ static int jh7100_reset_update(struct reset_controller_dev *rcdev,
return ret; return ret;
} }
static int jh7100_reset_assert(struct reset_controller_dev *rcdev, static int jh71x0_reset_assert(struct reset_controller_dev *rcdev,
unsigned long id) unsigned long id)
{ {
return jh7100_reset_update(rcdev, id, true); return jh71x0_reset_update(rcdev, id, true);
} }
static int jh7100_reset_deassert(struct reset_controller_dev *rcdev, static int jh71x0_reset_deassert(struct reset_controller_dev *rcdev,
unsigned long id) unsigned long id)
{ {
return jh7100_reset_update(rcdev, id, false); return jh71x0_reset_update(rcdev, id, false);
} }
static int jh7100_reset_reset(struct reset_controller_dev *rcdev, static int jh71x0_reset_reset(struct reset_controller_dev *rcdev,
unsigned long id) unsigned long id)
{ {
int ret; int ret;
ret = jh7100_reset_assert(rcdev, id); ret = jh71x0_reset_assert(rcdev, id);
if (ret) if (ret)
return ret; return ret;
return jh7100_reset_deassert(rcdev, id); return jh71x0_reset_deassert(rcdev, id);
} }
static int jh7100_reset_status(struct reset_controller_dev *rcdev, static int jh71x0_reset_status(struct reset_controller_dev *rcdev,
unsigned long id) unsigned long id)
{ {
struct jh7100_reset *data = jh7100_reset_from(rcdev); struct jh71x0_reset *data = jh71x0_reset_from(rcdev);
unsigned long offset = BIT_ULL_WORD(id); unsigned long offset = BIT_ULL_WORD(id);
u64 mask = BIT_ULL_MASK(id); u64 mask = BIT_ULL_MASK(id);
void __iomem *reg_status = data->status + offset * sizeof(u64); void __iomem *reg_status = data->status + offset * sizeof(u64);
...@@ -98,25 +98,25 @@ static int jh7100_reset_status(struct reset_controller_dev *rcdev, ...@@ -98,25 +98,25 @@ static int jh7100_reset_status(struct reset_controller_dev *rcdev,
return !((value ^ data->asserted[offset]) & mask); return !((value ^ data->asserted[offset]) & mask);
} }
static const struct reset_control_ops jh7100_reset_ops = { static const struct reset_control_ops jh71x0_reset_ops = {
.assert = jh7100_reset_assert, .assert = jh71x0_reset_assert,
.deassert = jh7100_reset_deassert, .deassert = jh71x0_reset_deassert,
.reset = jh7100_reset_reset, .reset = jh71x0_reset_reset,
.status = jh7100_reset_status, .status = jh71x0_reset_status,
}; };
int reset_starfive_jh7100_register(struct device *dev, struct device_node *of_node, int reset_starfive_jh71x0_register(struct device *dev, struct device_node *of_node,
void __iomem *assert, void __iomem *status, void __iomem *assert, void __iomem *status,
const u64 *asserted, unsigned int nr_resets, const u64 *asserted, unsigned int nr_resets,
struct module *owner) struct module *owner)
{ {
struct jh7100_reset *data; struct jh71x0_reset *data;
data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL); data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL);
if (!data) if (!data)
return -ENOMEM; return -ENOMEM;
data->rcdev.ops = &jh7100_reset_ops; data->rcdev.ops = &jh71x0_reset_ops;
data->rcdev.owner = owner; data->rcdev.owner = owner;
data->rcdev.nr_resets = nr_resets; data->rcdev.nr_resets = nr_resets;
data->rcdev.dev = dev; data->rcdev.dev = dev;
...@@ -129,4 +129,4 @@ int reset_starfive_jh7100_register(struct device *dev, struct device_node *of_no ...@@ -129,4 +129,4 @@ int reset_starfive_jh7100_register(struct device *dev, struct device_node *of_no
return devm_reset_controller_register(dev, &data->rcdev); return devm_reset_controller_register(dev, &data->rcdev);
} }
EXPORT_SYMBOL_GPL(reset_starfive_jh7100_register); EXPORT_SYMBOL_GPL(reset_starfive_jh71x0_register);
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
#ifndef __RESET_STARFIVE_JH71X0_H #ifndef __RESET_STARFIVE_JH71X0_H
#define __RESET_STARFIVE_JH71X0_H #define __RESET_STARFIVE_JH71X0_H
int reset_starfive_jh7100_register(struct device *dev, struct device_node *of_node, int reset_starfive_jh71x0_register(struct device *dev, struct device_node *of_node,
void __iomem *assert, void __iomem *status, void __iomem *assert, void __iomem *status,
const u64 *asserted, unsigned int nr_resets, const u64 *asserted, unsigned int nr_resets,
struct module *owner); struct module *owner);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment