linux-kernel - [PATCH v3 4/4] reset: hisilicon: Add hi6220 media subsystem reset support

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Mon, 20 Jun 2016 11:50:07 +0800
From:	Xinliang Liu <xinliang.liu@...aro.org>
To:	p.zabel@...gutronix.de
Cc:	linux-kernel@...r.kernel.org, robh+dt@...nel.org,
	xuwei5@...ilicon.com, puck.chen@...ilicon.com,
	saberlily.xia@...ilicon.com, kong.kongxinwei@...ilicon.com,
	guodong.xu@...aro.org, Xinliang Liu <xinliang.liu@...aro.org>
Subject: [PATCH v3 4/4] reset: hisilicon: Add hi6220 media subsystem reset support

Add hi6220 media subsystem reset controller.

Signed-off-by: Chen Feng <puck.chen@...ilicon.com>
Signed-off-by: Xia Qing <saberlily.xia@...ilicon.com>
Signed-off-by: Xinliang Liu <xinliang.liu@...aro.org>
---
 drivers/reset/hisilicon/hi6220_reset.c | 49 ++++++++++++++++++++++++++++++++--
 1 file changed, 47 insertions(+), 2 deletions(-)

diff --git a/drivers/reset/hisilicon/hi6220_reset.c b/drivers/reset/hisilicon/hi6220_reset.c
index 686fea9e2c54..35ce53edabf9 100644
--- a/drivers/reset/hisilicon/hi6220_reset.c
+++ b/drivers/reset/hisilicon/hi6220_reset.c
@@ -27,8 +27,17 @@
 #define PERIPH_DEASSERT_OFFSET    0x304
 #define PERIPH_MAX_INDEX          0x509
 
+#define SC_MEDIA_RSTEN            0x052C
+#define SC_MEDIA_RSTDIS           0x0530
+#define MEDIA_MAX_INDEX           8
+
 #define to_reset_data(x) container_of(x, struct hi6220_reset_data, rc_dev)
 
+enum hi6220_reset_ctrl_type {
+	PERIPHERAL,
+	MEDIA,
+};
+
 struct hi6220_reset_data {
 	struct reset_controller_dev rc_dev;
 	struct regmap *regmap;
@@ -63,10 +72,34 @@ static const struct reset_control_ops hi6220_peripheral_reset_ops = {
 	.deassert = hi6220_peripheral_deassert,
 };
 
+static int hi6220_media_assert(struct reset_controller_dev *rc_dev,
+			       unsigned long idx)
+{
+	struct hi6220_reset_data *data = to_reset_data(rc_dev);
+	struct regmap *regmap = data->regmap;
+
+	return regmap_write(regmap, SC_MEDIA_RSTEN, BIT(idx));
+}
+
+static int hi6220_media_deassert(struct reset_controller_dev *rc_dev,
+				 unsigned long idx)
+{
+	struct hi6220_reset_data *data = to_reset_data(rc_dev);
+	struct regmap *regmap = data->regmap;
+
+	return regmap_write(regmap, SC_MEDIA_RSTDIS, BIT(idx));
+}
+
+static const struct reset_control_ops hi6220_media_reset_ops = {
+	.assert = hi6220_media_assert,
+	.deassert = hi6220_media_deassert,
+};
+
 static int hi6220_reset_probe(struct platform_device *pdev)
 {
 	struct device_node *np = pdev->dev.of_node;
 	struct device *dev = &pdev->dev;
+	enum hi6220_reset_ctrl_type type;
 	struct hi6220_reset_data *data;
 	struct regmap *regmap;
 
@@ -74,6 +107,8 @@ static int hi6220_reset_probe(struct platform_device *pdev)
 	if (!data)
 		return -ENOMEM;
 
+	type = (enum hi6220_reset_ctrl_type)of_device_get_match_data(dev);
+
 	regmap = syscon_node_to_regmap(np);
 	if (IS_ERR(regmap)) {
 		dev_err(dev, "failed to get reset controller regmap\n");
@@ -82,8 +117,13 @@ static int hi6220_reset_probe(struct platform_device *pdev)
 
 	data->regmap = regmap;
 	data->rc_dev.of_node = np;
-	data->rc_dev.ops = &hi6220_peripheral_reset_ops;
-	data->rc_dev.nr_resets = PERIPH_MAX_INDEX;
+	if (type == MEDIA) {
+		data->rc_dev.ops = &hi6220_media_reset_ops;
+		data->rc_dev.nr_resets = MEDIA_MAX_INDEX;
+	} else {
+		data->rc_dev.ops = &hi6220_peripheral_reset_ops;
+		data->rc_dev.nr_resets = PERIPH_MAX_INDEX;
+	}
 
 	return reset_controller_register(&data->rc_dev);
 }
@@ -91,6 +131,11 @@ static int hi6220_reset_probe(struct platform_device *pdev)
 static const struct of_device_id hi6220_reset_match[] = {
 	{
 		.compatible = "hisilicon,hi6220-sysctrl",
+		.data = (void *)PERIPHERAL,
+	},
+	{
+		.compatible = "hisilicon,hi6220-mediactrl",
+		.data = (void *)MEDIA,
 	},
 	{ /* sentinel */ },
 };
-- 
2.8.3