From patchwork Mon Mar 18 19:38:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Griffin X-Patchwork-Id: 160508 Delivered-To: patches@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp3029511jad; Mon, 18 Mar 2019 12:40:59 -0700 (PDT) X-Received: by 2002:adf:fb05:: with SMTP id c5mr13064437wrr.297.1552938059084; Mon, 18 Mar 2019 12:40:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1552938059; cv=none; d=google.com; s=arc-20160816; b=S02g1xZpb8o9d96s50hSArSdjRYXYvcUtjSKz5p/fG6DONhHT8usLkeGyQUNGvvh8A IsZ08OFpkFV1sb6C0CHgYfQGQz7mK48xEA73g0JChBxv+kQBHHCS7k4/ogs3UTudkPaD KQVPhtS+Y/gl1EYHWdxELOY9iXpTD8d1lJ3Wfs4sQF63CuVpcIhXbtqhmjBliyukdisy 16W4lhBU0NdJ99LGomlAc55ilOBB7wehBh+akh1FNTa2UywlxuWxgy57kqTH6OzpNPob F28rjy8fLcF/m5GwGqb/rRfFPw6EfPfgJjtiktfzgRw/L0v1rP1peltgVB8Iguk2LJA9 t0lA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=mCYuzjXjAhAdmGCTChMacQlApx18wWBt60iN6MyaJRQ=; b=fwQQAZ7bUheOQZjfWrIwZNtt8LlA8+86MlF3b3YVStQ/9noL3xG6KCO78r3znSwhdQ 1ayQRFwHxE7KiksFc0N2EK7lZxOEz6fG3gqVRFSIF/e3SsryqdaA3yKIEsEL27QlxDEC t57ZnCJJG3MdBrjy2ZDLaepjMTZEg7lRF3AvtfLhzKBhgT8sL65sWI6TSBZ+ssdql8uA 42tGt49IEUr2EQtablxyHkv4qG8/ZadXE6WtgVX7zg3tYp3dItL5Gut7NiQAbVTlK7L+ Z3abyin7cEnIPscHc57a/a7FzhynYvyMo3u6gbECnj2AFmToQfYKF4noQq66+Sg7XLfE 71DQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Hzvfasmh; spf=pass (google.com: domain of peter.griffin@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=peter.griffin@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id z131sor201669wmc.12.2019.03.18.12.40.58 for (Google Transport Security); Mon, 18 Mar 2019 12:40:59 -0700 (PDT) Received-SPF: pass (google.com: domain of peter.griffin@linaro.org designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Hzvfasmh; spf=pass (google.com: domain of peter.griffin@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=peter.griffin@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org 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=mCYuzjXjAhAdmGCTChMacQlApx18wWBt60iN6MyaJRQ=; b=HzvfasmhXnx4JtwlIbiPWvb50HOkNd7QnQnXq9U/+ESG1TejnfmEDg90Pc/oz36xGF 3FSmmSmVBKgE++CMgTIp8QW5g5gcHWd7kvj4GAeLCLOdKbtbjGOK//MgjviiqWJxbOBS W1sIbjiPH+oUPWgpFovf9d7XNbVAkChWDuSYDGNFYuAFnpM0fUHfuAUZYuCDI76YIITj LuwAxB/14vsrp9U6YqS1qFMou5f/wHNbFs4t6Hvf8Kx4OsPFjT/b3w20mPWpKpUF/HI9 Asnz4uFGvVG6eu6B+3MEFCUdYf5M19qG2hA1797dOk+6YQXG/F+Fjzp8bvbxhcBuF9v+ tLAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=mCYuzjXjAhAdmGCTChMacQlApx18wWBt60iN6MyaJRQ=; b=Nb9H1jtt1kSreE3e9JDbVM1D5JGZKSFvQFRqpDpUBQmvHXhTt/fQ0AOSZS55gCtFWI p3xZZ8NIuT1BMBMchAkvX3ARBQzKq2F6PufojgNMGWwxw5XC04tpS48PxLhYaZyahj0O E9leGC81X4Pu38i0hQZwHNUx4x0EuzGydsBlUYtmBHGgGcq8bL/xBZoNYrt2r5H4GGbZ HwtV25fqmSA5PNP6ZVcrEtbRuX9AttIkW/y6wjiYcZ6VCthKV1hPcF+4SZ+Y6SP4t573 Tacig8MQByr8DQj5oDJ26qxngtdxZ+iQrrsU8SAaZatGaS+Y0ydbiGjjUhSqdpEA+o2P gzHw== X-Gm-Message-State: APjAAAV/hxy/n4xPN7S38/u6AT87Y3DFfredYVvYFH0xyaN33+0ior2k TZbfYKw7Tp1cj7hgOo7+Fp+1IwKu X-Google-Smtp-Source: APXvYqzhTusUZxAZX+UKsouiPFztVANdEtEHZhoPKs/a4eIOoxpW2MoOwRrgddVlTUDXw8v7v30Evg== X-Received: by 2002:a1c:7517:: with SMTP id o23mr435554wmc.9.1552938058758; Mon, 18 Mar 2019 12:40:58 -0700 (PDT) Return-Path: Received: from localhost.localdomain (cpc89244-aztw30-2-0-cust4998.18-1.cable.virginm.net. [86.31.179.135]) by smtp.gmail.com with ESMTPSA id s10sm4583941wrv.56.2019.03.18.12.40.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 18 Mar 2019 12:40:57 -0700 (PDT) From: Peter Griffin To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, airlied@linux.ie, daniel@ffwll.ch, robh+dt@kernel.org, mark.rutland@arm.com, p.zabel@pengutronix.de, xuwei5@hisilicon.com, mturquette@baylibre.com, sboyd@kernel.org Cc: john.stultz@linaro.org, dri-devel@lists.freedesktop.org, devicetree@vger.kernel.org, linux-clk@vger.kernel.org, yuq825@gmail.com Subject: [PATCH v1 4/6] reset: hi6220: Add support for AO reset controller Date: Mon, 18 Mar 2019 19:38:49 +0000 Message-Id: <1552937931-23050-5-git-send-email-peter.griffin@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1552937931-23050-1-git-send-email-peter.griffin@linaro.org> References: <1552937931-23050-1-git-send-email-peter.griffin@linaro.org> This is required to bring Mali450 gpu out of reset. Signed-off-by: Peter Griffin --- drivers/reset/hisilicon/hi6220_reset.c | 51 +++++++++++++++++++++++++++++++++- 1 file changed, 50 insertions(+), 1 deletion(-) -- 2.7.4 diff --git a/drivers/reset/hisilicon/hi6220_reset.c b/drivers/reset/hisilicon/hi6220_reset.c index d5e5229..0cd5f92 100644 --- a/drivers/reset/hisilicon/hi6220_reset.c +++ b/drivers/reset/hisilicon/hi6220_reset.c @@ -36,6 +36,7 @@ enum hi6220_reset_ctrl_type { PERIPHERAL, MEDIA, + AO, }; struct hi6220_reset_data { @@ -95,6 +96,47 @@ static const struct reset_control_ops hi6220_media_reset_ops = { .deassert = hi6220_media_deassert, }; +#define AO_SCTRL_SC_PW_CLKEN0 0x800 +#define AO_SCTRL_SC_PW_CLKDIS0 0x804 + +#define AO_SCTRL_SC_PW_RSTEN0 0x810 +#define AO_SCTRL_SC_PW_RSTDIS0 0x814 + +#define AO_SCTRL_SC_PW_ISOEN0 0x820 +#define AO_SCTRL_SC_PW_ISODIS0 0x824 +#define AO_MAX_INDEX 12 + +static int hi6220_ao_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; + int ret; + + ret = regmap_write(regmap, AO_SCTRL_SC_PW_RSTEN0, BIT(idx)); + ret |= regmap_write(regmap, AO_SCTRL_SC_PW_ISOEN0, BIT(idx)); + ret |= regmap_write(regmap, AO_SCTRL_SC_PW_CLKDIS0, BIT(idx)); + return ret; +} + +static int hi6220_ao_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; + int ret; + + ret = regmap_write(regmap, AO_SCTRL_SC_PW_RSTDIS0, BIT(idx)); + ret |= regmap_write(regmap, AO_SCTRL_SC_PW_ISODIS0, BIT(idx)); + ret |= regmap_write(regmap, AO_SCTRL_SC_PW_CLKEN0, BIT(idx)); + return ret; +} + +static const struct reset_control_ops hi6220_ao_reset_ops = { + .assert = hi6220_ao_assert, + .deassert = hi6220_ao_deassert, +}; + static int hi6220_reset_probe(struct platform_device *pdev) { struct device_node *np = pdev->dev.of_node; @@ -120,9 +162,12 @@ static int hi6220_reset_probe(struct platform_device *pdev) if (type == MEDIA) { data->rc_dev.ops = &hi6220_media_reset_ops; data->rc_dev.nr_resets = MEDIA_MAX_INDEX; - } else { + } else if (type == PERIPHERAL) { data->rc_dev.ops = &hi6220_peripheral_reset_ops; data->rc_dev.nr_resets = PERIPH_MAX_INDEX; + } else { + data->rc_dev.ops = &hi6220_ao_reset_ops; + data->rc_dev.nr_resets = AO_MAX_INDEX; } return reset_controller_register(&data->rc_dev); @@ -137,6 +182,10 @@ static const struct of_device_id hi6220_reset_match[] = { .compatible = "hisilicon,hi6220-mediactrl", .data = (void *)MEDIA, }, + { + .compatible = "hisilicon,hi6220-aoctrl", + .data = (void *)AO, + }, { /* sentinel */ }, }; MODULE_DEVICE_TABLE(of, hi6220_reset_match);