From patchwork Thu Dec 1 00:48:41 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhangfei Gao X-Patchwork-Id: 9455187 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 5B26560585 for ; Thu, 1 Dec 2016 00:51:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4D75D21050 for ; Thu, 1 Dec 2016 00:51:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4204428497; Thu, 1 Dec 2016 00:51:39 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id ACD13284B3 for ; Thu, 1 Dec 2016 00:51:38 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1cCFZn-00026W-65; Thu, 01 Dec 2016 00:50:15 +0000 Received: from mail-pf0-x236.google.com ([2607:f8b0:400e:c00::236]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1cCFZG-0001I4-15 for linux-arm-kernel@lists.infradead.org; Thu, 01 Dec 2016 00:49:45 +0000 Received: by mail-pf0-x236.google.com with SMTP id d2so42138524pfd.0 for ; Wed, 30 Nov 2016 16:49:21 -0800 (PST) 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=Qcp0L82+qsjVkwOhWTdSBxNAtoozN6qGcfQQ2if0sBs=; b=dDtnG5N9Miy/eT9vozdPW5wkItl9MIeApcx/aEOgYBE2RHeB1k/XrBB7e11/8X5QAZ TaSuz+ieQWG2B9daoPABvqbmm5PtWYIncWSB4rFT8SDZXJCkA8v11fMxLWfo9LgPiU3z KiXcjxVbSLY5KlXRCfP1IXcALz1FjHrj2qQB8= 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=Qcp0L82+qsjVkwOhWTdSBxNAtoozN6qGcfQQ2if0sBs=; b=AeXPvM4tn3ACA1XoOQc8auVuWgiLb4WCyDSy9AAEu/k1pWTzTFQTJdKvAfDwnJ5DTI NwDbSBnEvQEwclc9tnSrHGiQvUwJbpencQ+Hvp9Mys6xb4j3F017+oFc9Zzn7xgFHAgW 7aDG4rLqGP2Mu+btCEFJMO5nuOMgT1ZkGU9i/rHZ788acvQo8Vf+ht4NWe5uHLQ59u5g qMecgXADREgSqzoGxlB7aRTCxdjVTOoWFRSECk6bPW6hVc6AFbfFPh9Jd28ty5VMq39o 2jD5OTsrcL2EsppNSpP6Ks3RPtiWyBzoooAD6vZwzeOdGwKPeKsNN92vbB6+pUtgEEtD 0fjA== X-Gm-Message-State: AKaTC030G8C7lw6Y5PK7Z3CZ6rIRj1LSsJt/nhT01xp6KsMwWJmg1nFk71/++iXZ3o9fRhAv X-Received: by 10.84.216.28 with SMTP id m28mr79563265pli.107.1480553361068; Wed, 30 Nov 2016 16:49:21 -0800 (PST) Received: from localhost.localdomain ([104.237.91.22]) by smtp.gmail.com with ESMTPSA id w11sm93408530pfk.75.2016.11.30.16.49.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 30 Nov 2016 16:49:20 -0800 (PST) From: Zhangfei Gao To: Rob Herring , Philipp Zabel , Arnd Bergmann Subject: [resend V2: PATCH 2/2] reset: hisilicon: add reset-hi3660 Date: Thu, 1 Dec 2016 08:48:41 +0800 Message-Id: <1480553321-17400-3-git-send-email-zhangfei.gao@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1480553321-17400-1-git-send-email-zhangfei.gao@linaro.org> References: <1480553321-17400-1-git-send-email-zhangfei.gao@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20161130_164942_371426_4FABB82C X-CRM114-Status: GOOD ( 19.46 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Zhangfei Gao MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Add hi3660 reset driver Reset offset & bits should be listed in dts Like: iomcu_rst: iomcu_rst_controller { compatible = "hisilicon,hi3660-reset"; #reset-cells = <1>; hisi,rst-syscon = <&iomcu>; hisi,reset-bits = <0x20 0x8 /* 0: i2c0 */ 0x20 0x10 /* 1: i2c1 */ 0x20 0x20 /* 2: i2c2 */ 0x20 0x8000000>; /* 3: i2c6 */ }; Signed-off-by: Zhangfei Gao --- drivers/reset/hisilicon/Kconfig | 7 ++ drivers/reset/hisilicon/Makefile | 1 + drivers/reset/hisilicon/reset-hi3660.c | 144 +++++++++++++++++++++++++++++++++ 3 files changed, 152 insertions(+) create mode 100644 drivers/reset/hisilicon/reset-hi3660.c diff --git a/drivers/reset/hisilicon/Kconfig b/drivers/reset/hisilicon/Kconfig index 1ff8b0c..10134dc 100644 --- a/drivers/reset/hisilicon/Kconfig +++ b/drivers/reset/hisilicon/Kconfig @@ -1,3 +1,10 @@ +config COMMON_RESET_HI3660 + tristate "Hi3660 Reset Driver" + depends on ARCH_HISI || COMPILE_TEST + default ARCH_HISI + help + Build the Hisilicon Hi3660 reset driver. + config COMMON_RESET_HI6220 tristate "Hi6220 Reset Driver" depends on ARCH_HISI || COMPILE_TEST diff --git a/drivers/reset/hisilicon/Makefile b/drivers/reset/hisilicon/Makefile index c932f86..ab8a7bf 100644 --- a/drivers/reset/hisilicon/Makefile +++ b/drivers/reset/hisilicon/Makefile @@ -1 +1,2 @@ obj-$(CONFIG_COMMON_RESET_HI6220) += hi6220_reset.o +obj-$(CONFIG_COMMON_RESET_HI3660) += reset-hi3660.o diff --git a/drivers/reset/hisilicon/reset-hi3660.c b/drivers/reset/hisilicon/reset-hi3660.c new file mode 100644 index 0000000..3307252 --- /dev/null +++ b/drivers/reset/hisilicon/reset-hi3660.c @@ -0,0 +1,144 @@ +/* + * Copyright (c) 2016-2017 Linaro Ltd. + * Copyright (c) 2016-2017 HiSilicon Technologies Co., Ltd. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + */ +#include +#include +#include +#include +#include +#include +#include + +struct hi3660_reset_data { + unsigned int off; + unsigned int bits; +}; + +struct hi3660_reset_controller { + struct reset_controller_dev rst; + struct regmap *map; + const struct hi3660_reset_data *datas; +}; + +#define to_hi3660_reset_controller(_rst) \ + container_of(_rst, struct hi3660_reset_controller, rst) + +static int hi3660_reset_program_hw(struct reset_controller_dev *rcdev, + unsigned long idx, bool assert) +{ + struct hi3660_reset_controller *rc = to_hi3660_reset_controller(rcdev); + const struct hi3660_reset_data *d; + + if (idx >= rcdev->nr_resets) + return -EINVAL; + + d = &rc->datas[idx]; + + if (assert) + return regmap_write(rc->map, d->off, d->bits); + else + return regmap_write(rc->map, d->off + 4, d->bits); +} + +static int hi3660_reset_assert(struct reset_controller_dev *rcdev, + unsigned long idx) +{ + return hi3660_reset_program_hw(rcdev, idx, true); +} + +static int hi3660_reset_deassert(struct reset_controller_dev *rcdev, + unsigned long idx) +{ + return hi3660_reset_program_hw(rcdev, idx, false); +} + +static int hi3660_reset_dev(struct reset_controller_dev *rcdev, + unsigned long idx) +{ + int err; + + err = hi3660_reset_assert(rcdev, idx); + if (err) + return err; + + return hi3660_reset_deassert(rcdev, idx); +} + +static struct reset_control_ops hi3660_reset_ops = { + .reset = hi3660_reset_dev, + .assert = hi3660_reset_assert, + .deassert = hi3660_reset_deassert, +}; + +static int hi3660_reset_probe(struct platform_device *pdev) +{ + struct hi3660_reset_controller *rc; + struct device_node *np = pdev->dev.of_node; + struct device *dev = &pdev->dev; + struct hi3660_reset_data *datas; + const __be32 *list; + int size, nr, i; + + rc = devm_kzalloc(dev, sizeof(*rc), GFP_KERNEL); + if (!rc) + return -ENOMEM; + + rc->map = syscon_regmap_lookup_by_phandle(np, "hisi,rst-syscon"); + if (IS_ERR(rc->map)) { + dev_err(dev, "failed to get hi3660,rst-syscon\n"); + return PTR_ERR(rc->map); + } + + list = of_get_property(np, "hisi,reset-bits", &size); + if (!list || (size / sizeof(*list)) % 2 != 0) { + dev_err(dev, "invalid DT reset description\n"); + return -EINVAL; + } + + nr = (size / sizeof(*list)) / 2; + datas = devm_kzalloc(dev, nr * sizeof(*datas), GFP_KERNEL); + if (!datas) + return -ENOMEM; + + for (i = 0; i < nr; i++) { + datas[i].off = be32_to_cpup(list++); + datas[i].bits = be32_to_cpup(list++); + } + + rc->rst.ops = &hi3660_reset_ops, + rc->rst.of_node = np; + rc->rst.nr_resets = nr; + rc->datas = datas; + + return reset_controller_register(&rc->rst); +} + +static const struct of_device_id hi3660_reset_match[] = { + { .compatible = "hisilicon,hi3660-reset", }, + {}, +}; +MODULE_DEVICE_TABLE(of, hi3660_reset_match); + +static struct platform_driver hi3660_reset_driver = { + .probe = hi3660_reset_probe, + .driver = { + .name = "hi3660-reset", + .of_match_table = hi3660_reset_match, + }, +}; + +static int __init hi3660_reset_init(void) +{ + return platform_driver_register(&hi3660_reset_driver); +} +arch_initcall(hi3660_reset_init); + +MODULE_LICENSE("GPL"); +MODULE_ALIAS("platform:hi3660-reset"); +MODULE_DESCRIPTION("HiSilicon Hi3660 Reset Driver");