From patchwork Mon Jun 20 03:50:07 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xinliang Liu X-Patchwork-Id: 70402 Delivered-To: patch@linaro.org Received: by 10.140.28.4 with SMTP id 4csp1321063qgy; Sun, 19 Jun 2016 20:52:03 -0700 (PDT) X-Received: by 10.107.53.233 with SMTP id k102mr19407509ioo.134.1466394710098; Sun, 19 Jun 2016 20:51:50 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id c133si30517130pfc.145.2016.06.19.20.51.49; Sun, 19 Jun 2016 20:51:50 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752713AbcFTDvU (ORCPT + 30 others); Sun, 19 Jun 2016 23:51:20 -0400 Received: from mail-pf0-f172.google.com ([209.85.192.172]:33547 "EHLO mail-pf0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752572AbcFTDun (ORCPT ); Sun, 19 Jun 2016 23:50:43 -0400 Received: by mail-pf0-f172.google.com with SMTP id i123so45752366pfg.0 for ; Sun, 19 Jun 2016 20:50:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=dKpMTXnwHFY4Si9V5CwgtCy3zZYjOS9JXsuY1Yi65B4=; b=M99S4icmz3q9Fp485UoFdXTRtAUjkweRcG8M9YqQppmOZVo7Pqf8JOXHL0eh1h2DA6 hi08ST41qrj/J2t65smq1rF2bmt+01eJBTXXnHhLYJgSkJY7IVq2cOVGkcyU2gVMhYBZ f+nA05U4pZNEkiZu+BVPAF1Ccb1cFDumVQqxM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=dKpMTXnwHFY4Si9V5CwgtCy3zZYjOS9JXsuY1Yi65B4=; b=mLhSal1BsIVWps5Ie8AerX1hD32E+n7xD2kP0+DRa4OEnTRrUKX3yuBKQgHUpE/Zdx 1YtD1oc4iunk2v6qu8IaBklptseHx20FN9FpDenNXwUBSxZUSiTqg8M52wMnP0J37aXT KQd7XC9nQd52KvVDGEB60iWFxGcj1bLiOKT9+R6ck1XMwFE1QPYd96xsNFcgeWO+HXsv l4yFThlRZI+08MANpHOp8O1luTOlIHQkkKceMCCFuUVpCG96ayNXsw+asqO48MePu07N Gc6x96VTAeko/8wWYfeQ9fo/i69jtxhjGtguUxUDMP2lrz3S+LYkLq1qnKXwZ203u3jI yGqg== X-Gm-Message-State: ALyK8tL0vTZhBs1m9sOiQJseujHYHkuQqPO4Xa+WzGXdi8JtnAUeGyw1uvHxiMUNexsvTucv X-Received: by 10.98.158.206 with SMTP id f75mr19298240pfk.164.1466394642292; Sun, 19 Jun 2016 20:50:42 -0700 (PDT) Received: from HTSAT-OPENLAB-SERVER.localdomain ([14.154.190.136]) by smtp.gmail.com with ESMTPSA id i187sm50990403pfc.62.2016.06.19.20.50.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 19 Jun 2016 20:50:41 -0700 (PDT) From: Xinliang Liu To: p.zabel@pengutronix.de Cc: linux-kernel@vger.kernel.org, robh+dt@kernel.org, xuwei5@hisilicon.com, puck.chen@hisilicon.com, saberlily.xia@hisilicon.com, kong.kongxinwei@hisilicon.com, guodong.xu@linaro.org, Xinliang Liu Subject: [PATCH v3 4/4] reset: hisilicon: Add hi6220 media subsystem reset support Date: Mon, 20 Jun 2016 11:50:07 +0800 Message-Id: <20160620035007.229629-5-xinliang.liu@linaro.org> X-Mailer: git-send-email 2.8.3 In-Reply-To: <20160620035007.229629-1-xinliang.liu@linaro.org> References: <20160620035007.229629-1-xinliang.liu@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add hi6220 media subsystem reset controller. Signed-off-by: Chen Feng Signed-off-by: Xia Qing Signed-off-by: Xinliang Liu --- drivers/reset/hisilicon/hi6220_reset.c | 49 ++++++++++++++++++++++++++++++++-- 1 file changed, 47 insertions(+), 2 deletions(-) -- 2.8.3 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 */ }, };