@@ -10,6 +10,7 @@
#include <linux/minmax.h>
#include <linux/module.h>
#include <linux/platform_device.h>
+#include <linux/reset-controller.h>
#include "ccu_common.h"
#include "ccu_pll.h"
@@ -134,8 +135,26 @@ struct spacemit_ccu_clk {
struct clk_hw *hw;
};
+struct ccu_reset_data {
+ u32 offset;
+ u32 assert_mask;
+ u32 deassert_mask;
+};
+
+struct ccu_reset_controller_data {
+ u32 count;
+ const struct ccu_reset_data *data; /* array */
+};
+
struct spacemit_ccu_data {
struct spacemit_ccu_clk *clk; /* array with sentinel */
+ const struct ccu_reset_controller_data *reset_data;
+};
+
+struct ccu_reset_controller {
+ struct regmap *regmap;
+ const struct ccu_reset_controller_data *data;
+ struct reset_controller_dev rcdev;
};
/* APBS clocks start */
@@ -1630,6 +1649,39 @@ static const struct spacemit_ccu_data k1_ccu_apmu_data = {
.clk = k1_ccu_apmu_clks,
};
+static int spacemit_reset_update(struct reset_controller_dev *rcdev,
+ unsigned long id, bool assert)
+{
+ struct ccu_reset_controller *controller;
+ const struct ccu_reset_data *data;
+ u32 mask;
+ u32 val;
+
+ controller = container_of(rcdev, struct ccu_reset_controller, rcdev);
+ data = &controller->data->data[id];
+ mask = data->assert_mask | data->deassert_mask;
+ val = assert ? data->assert_mask : data->deassert_mask;
+
+ return regmap_update_bits(controller->regmap, data->offset, mask, val);
+}
+
+static int spacemit_reset_assert(struct reset_controller_dev *rcdev,
+ unsigned long id)
+{
+ return spacemit_reset_update(rcdev, id, true);
+}
+
+static int spacemit_reset_deassert(struct reset_controller_dev *rcdev,
+ unsigned long id)
+{
+ return spacemit_reset_update(rcdev, id, false);
+}
+
+static const struct reset_control_ops spacemit_reset_control_ops = {
+ .assert = spacemit_reset_assert,
+ .deassert = spacemit_reset_deassert,
+};
+
static int spacemit_ccu_register(struct device *dev,
struct regmap *regmap, struct regmap *lock_regmap,
struct spacemit_ccu_clk *clks)
@@ -1675,6 +1727,33 @@ static int spacemit_ccu_register(struct device *dev,
return ret;
}
+static int spacemit_reset_controller_register(struct device *dev,
+ struct regmap *regmap,
+ const struct ccu_reset_controller_data *data)
+{
+ struct ccu_reset_controller *controller;
+ struct reset_controller_dev *rcdev;
+
+ /* Resets are optional */
+ if (!data)
+ return 0;
+
+ controller = devm_kzalloc(dev, sizeof(*controller), GFP_KERNEL);
+ if (!controller)
+ return -ENOMEM;
+
+ controller->regmap = regmap;
+ controller->data = data;
+
+ rcdev = &controller->rcdev;
+ rcdev->ops = &spacemit_reset_control_ops;
+ rcdev->owner = THIS_MODULE;
+ rcdev->of_node = dev->of_node;
+ rcdev->nr_resets = data->count;
+
+ return devm_reset_controller_register(dev, rcdev);
+}
+
static int k1_ccu_probe(struct platform_device *pdev)
{
struct regmap *base_regmap, *lock_regmap = NULL;
@@ -1708,6 +1787,10 @@ static int k1_ccu_probe(struct platform_device *pdev)
if (ret)
return dev_err_probe(dev, ret, "failed to register clocks\n");
+ ret = spacemit_reset_controller_register(dev, base_regmap, data->reset_data);
+ if (ret)
+ return dev_err_probe(dev, ret, "failed to register reset controller\n");
+
return 0;
}
Define ccu_reset_data as a structure that contains the constant register offset and bitmasks used to assert and deassert a reset control on a SpacemiT K1 CCU. Define ccu_reset_controller_data as a structure that contains the address of an array of those structures and a count of the number of elements in the array. Add a pointer to a ccu_reset_controller_data structure to the spacemit_ccu_data structure. Reset support is optional for SpacemiT CCUs; the new pointer field will be null for CCUs without any resets. Finally, define a new ccu_reset_controller structure, which (for a CCU with resets) contains a pointer to the constant reset data, the regmap to be used for the controller, and an embedded a reset controller structure. Each reset control is asserted or deasserted by updating bits in a register. The bits used are defined by an assert mask and a deassert mask. In some cases, one (non-zero) mask asserts reset and a different (non-zero) mask deasserts it. Otherwise one mask is nonzero, and the other is zero. Either way, the bits in both masks are cleared, then either the assert mask or the deassert mask is set in a register to affect the state of a reset control. Signed-off-by: Alex Elder <elder@riscstar.com> --- v2: - Use regmap_update_bits() to safely update a register - Symbols are named RESET* and reset* rather than RST* and rst* - Reordered some assignments in the registration function - Allowed some longs to exceed 80 column width drivers/clk/spacemit/ccu-k1.c | 83 +++++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+)