From patchwork Tue Nov 28 07:02:28 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kever Yang X-Patchwork-Id: 841995 X-Patchwork-Delegate: philipp.tomsich@theobroma-systems.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="A5w9HYhh"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3ymF3p0vSlz9rxj for ; Tue, 28 Nov 2017 18:02:46 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id C0CB6C21DBA; Tue, 28 Nov 2017 07:02:44 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 75946C21D56; Tue, 28 Nov 2017 07:02:40 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 4D847C21D56; Tue, 28 Nov 2017 07:02:39 +0000 (UTC) Received: from mail-pl0-f65.google.com (mail-pl0-f65.google.com [209.85.160.65]) by lists.denx.de (Postfix) with ESMTPS id 72637C21C4C for ; Tue, 28 Nov 2017 07:02:38 +0000 (UTC) Received: by mail-pl0-f65.google.com with SMTP id s10so10122919plj.5 for ; Mon, 27 Nov 2017 23:02:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id; bh=YeZvj92UGjZoLYL8Zzp6fD9SfRSmikWMUswJpiA6qNU=; b=A5w9HYhhZN6GcSjb4qc8TiRbVX+19pd/GhQAAvnYNNbpRNqn69NhiVBbZj+696LWrE OMoq3BZ60SFO0jbYgkcGOcVZIuJSzfYY3wz75jvXQEM2ZIx4m7A8OFLJCeTeyDfm2Oo9 JuA6kSwgef6YbrFn5xQ9074JmciVSIaSsE6BC/0c8b7ThRwUORa0JZ/yxnf6IlrCLqgA tdNQFcBpmiZ9ynCWqzNHXSMffSlWMQ1eAWkwwvYeG6SIJraHBBNl4Qu/2Tqe3ZC46oeU 6PEFKJRShWidwbFQwdy2X99ORHK6qcwRiOq3bkMQxmp7PF8fqWF33iiymJq3FB3DFRhA wYLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=YeZvj92UGjZoLYL8Zzp6fD9SfRSmikWMUswJpiA6qNU=; b=FaYjMYnfuB6q0KU3mUUrj2C9wlDpdcCaSxsO90FOEnPxK7qWsfpXGSTM5LhFA49RAY f07+amNF5izRQkXD0u46LzHihqSPrORDrLDZYTvtQ1k4HkPiFsMxjtwf/u8F6tWIoLEK hdBzWpj8CPSlU9MEF8NhmmBsu0A9qy5Hu62Mqp80uJp3l1NEMjle7S3T9ZT9HX1FXqGh QzrLk25wXuHIqPVIfo8cwRLApo/H4gyxqCKLf02XlIi5VWfheSkwamf06D8NCjU6rXjc yA2cJYE0CjXk6maNfh2xlb8DZ/ngLQwI5rkd23yVXf0YwYnd1x4iau8ZFgvhd1IU5qaZ xvog== X-Gm-Message-State: AJaThX5sDVSUGrpT1M2m9P723m2TNIH0Pm5/3wv1/jtz/FNmXpjlCDHX uiLTJuX4o8/sHqVCG16XafPLFw== X-Google-Smtp-Source: AGs4zMYaJyRMtZ77mk1by1+vqhsadhdlRtATBF6GhvvfDZVQ2JkidmYgjmkILfljPH0rkMLljLam3g== X-Received: by 10.84.179.165 with SMTP id b34mr3945674plc.372.1511852556410; Mon, 27 Nov 2017 23:02:36 -0800 (PST) Received: from localhost.localdomain ([103.29.142.67]) by smtp.gmail.com with ESMTPSA id i11sm52473488pfk.25.2017.11.27.23.02.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 27 Nov 2017 23:02:35 -0800 (PST) From: Kever Yang To: u-boot@lists.denx.de Date: Tue, 28 Nov 2017 15:02:28 +0800 Message-Id: <1511852549-15752-1-git-send-email-kever.yang@rock-chips.com> X-Mailer: git-send-email 1.9.1 Cc: Elaine Zhang Subject: [U-Boot] [PATCH v2 1/2] drivers/reset: support rockchip reset drivers X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" From: Elaine Zhang Create driver to support all Rockchip SoCs soft reset. Example of usage: i2c driver: ret = reset_get_by_name(dev, "i2c", &reset_ctl); if (ret) { error("reset_get_by_name() failed: %d\n", ret); } reset_assert(&reset_ctl); udelay(50); reset_deassert(&reset_ctl); i2c dts node: resets = <&cru SRST_P_I2C1>, <&cru SRST_I2C1>; reset-names = "p_i2c", "i2c"; Signed-off-by: Elaine Zhang Signed-off-by: Kever Yang Acked-by: Philipp Tomsich Reviewed-by: Philipp Tomsich --- Changes in v2: - fix Kconfig more than 80 length - use MACRO for reset bits in one reg - use rkclr/set_reg for reg access - add rockchip_reset_bind() - use dev_read_addr_size() instead of fdtdec_ drivers/reset/Kconfig | 9 +++ drivers/reset/Makefile | 1 + drivers/reset/reset-rockchip.c | 133 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 143 insertions(+) create mode 100644 drivers/reset/reset-rockchip.c diff --git a/drivers/reset/Kconfig b/drivers/reset/Kconfig index ce46e27..97a78d7 100644 --- a/drivers/reset/Kconfig +++ b/drivers/reset/Kconfig @@ -74,4 +74,13 @@ config AST2500_RESET resets that are supported by watchdog. The main limitation though is that some reset signals, like I2C or MISC reset multiple devices. +config RESET_ROCKCHIP + bool "Reset controller driver for Rockchip SoCs" + depends on DM_RESET && CLK + default y + help + Support for reset controller on rockchip SoC. The main limitation + though is that some reset signals, like I2C or MISC reset multiple + devices. + endmenu diff --git a/drivers/reset/Makefile b/drivers/reset/Makefile index 252cefe..7d7e080 100644 --- a/drivers/reset/Makefile +++ b/drivers/reset/Makefile @@ -12,3 +12,4 @@ obj-$(CONFIG_TEGRA186_RESET) += tegra186-reset.o obj-$(CONFIG_RESET_BCM6345) += reset-bcm6345.o obj-$(CONFIG_RESET_UNIPHIER) += reset-uniphier.o obj-$(CONFIG_AST2500_RESET) += ast2500-reset.o +obj-$(CONFIG_RESET_ROCKCHIP) += reset-rockchip.o diff --git a/drivers/reset/reset-rockchip.c b/drivers/reset/reset-rockchip.c new file mode 100644 index 0000000..01047a2 --- /dev/null +++ b/drivers/reset/reset-rockchip.c @@ -0,0 +1,133 @@ +/* + * (C) Copyright 2017 Rockchip Electronics Co., Ltd + * + * SPDX-License-Identifier: GPL-2.0 + */ + +#include +#include +#include +#include +#include +#include +/* + * Each reg has 16 bits reset signal for devices + * Note: Not including rk2818 and older SoCs + */ +#define ROCKCHIP_RESET_NUM_IN_REG 16 + +struct rockchip_reset_priv { + void __iomem *base; + /* Rockchip reset reg locate at cru controller */ + u32 reset_reg_offset; + /* Rockchip reset reg number */ + u32 reset_reg_num; +}; + +static int rockchip_reset_request(struct reset_ctl *reset_ctl) +{ + struct rockchip_reset_priv *priv = dev_get_priv(reset_ctl->dev); + + debug("%s(reset_ctl=%p) (dev=%p, id=%lu) (reg_num=%d)\n", __func__, + reset_ctl, reset_ctl->dev, reset_ctl->id, priv->reset_reg_num); + + if (reset_ctl->id / ROCKCHIP_RESET_NUM_IN_REG >= priv->reset_reg_num) + return -EINVAL; + + return 0; +} + +static int rockchip_reset_free(struct reset_ctl *reset_ctl) +{ + debug("%s(reset_ctl=%p) (dev=%p, id=%lu)\n", __func__, reset_ctl, + reset_ctl->dev, reset_ctl->id); + + return 0; +} + +static int rockchip_reset_assert(struct reset_ctl *reset_ctl) +{ + struct rockchip_reset_priv *priv = dev_get_priv(reset_ctl->dev); + int bank = reset_ctl->id / ROCKCHIP_RESET_NUM_IN_REG; + int offset = reset_ctl->id % ROCKCHIP_RESET_NUM_IN_REG; + + debug("%s(reset_ctl=%p) (dev=%p, id=%lu) (reg_addr=%p)\n", __func__, + reset_ctl, reset_ctl->dev, reset_ctl->id, + priv->base + (bank * 4)); + + rk_setreg(priv->base + (bank * 4), BIT(offset)); + + return 0; +} + +static int rockchip_reset_deassert(struct reset_ctl *reset_ctl) +{ + struct rockchip_reset_priv *priv = dev_get_priv(reset_ctl->dev); + int bank = reset_ctl->id / ROCKCHIP_RESET_NUM_IN_REG; + int offset = reset_ctl->id % ROCKCHIP_RESET_NUM_IN_REG; + + debug("%s(reset_ctl=%p) (dev=%p, id=%lu) (reg_addr=%p)\n", __func__, + reset_ctl, reset_ctl->dev, reset_ctl->id, + priv->base + (bank * 4)); + + rk_clrreg(priv->base + (bank * 4), BIT(offset)); + + return 0; +} + +struct reset_ops rockchip_reset_ops = { + .request = rockchip_reset_request, + .free = rockchip_reset_free, + .rst_assert = rockchip_reset_assert, + .rst_deassert = rockchip_reset_deassert, +}; + +static int rockchip_reset_probe(struct udevice *dev) +{ + struct rockchip_reset_priv *priv = dev_get_priv(dev); + fdt_addr_t addr; + fdt_size_t size; + + addr = dev_read_addr_size(dev, "reg", &size); + if (addr == FDT_ADDR_T_NONE) + return -EINVAL; + + if ((priv->reset_reg_offset == 0) && (priv->reset_reg_num == 0)) + return -EINVAL; + + addr += priv->reset_reg_offset; + priv->base = ioremap(addr, size); + + debug("%s(base=%p) (reg_offset=%x, reg_num=%d)\n", __func__, + priv->base, priv->reset_reg_offset, priv->reset_reg_num); + + return 0; +} + +int rockchip_reset_bind(struct udevice *pdev, u32 reg_offset, u32 reg_number) +{ + struct udevice *rst_dev; + struct rockchip_reset_priv *priv; + int ret; + + ret = device_bind_driver_to_node(pdev, "rockchip_reset", "reset", + dev_ofnode(pdev), &rst_dev); + if (ret) { + debug("Warning: No rockchip reset driver: ret=%d\n", ret); + return ret; + } + priv = malloc(sizeof(struct rockchip_reset_priv)); + priv->reset_reg_offset = reg_offset; + priv->reset_reg_num = reg_number; + rst_dev->priv = priv; + + return 0; +} + +U_BOOT_DRIVER(rockchip_reset) = { + .name = "rockchip_reset", + .id = UCLASS_RESET, + .probe = rockchip_reset_probe, + .ops = &rockchip_reset_ops, + .priv_auto_alloc_size = sizeof(struct rockchip_reset_priv), +}; From patchwork Tue Nov 28 07:02:29 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kever Yang X-Patchwork-Id: 841996 X-Patchwork-Delegate: philipp.tomsich@theobroma-systems.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="kPvJl5Fv"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3ymF4Z2s4Cz9sxR for ; Tue, 28 Nov 2017 18:03:25 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 97E8AC21DE7; Tue, 28 Nov 2017 07:03:04 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 6AE40C21DCA; Tue, 28 Nov 2017 07:02:51 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 5093AC21DA1; Tue, 28 Nov 2017 07:02:47 +0000 (UTC) Received: from mail-pf0-f194.google.com (mail-pf0-f194.google.com [209.85.192.194]) by lists.denx.de (Postfix) with ESMTPS id 296C5C21DDA for ; Tue, 28 Nov 2017 07:02:42 +0000 (UTC) Received: by mail-pf0-f194.google.com with SMTP id r14so12040285pfl.11 for ; Mon, 27 Nov 2017 23:02:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=zZnpeEKMSTX4dXzz5NpLvrTgjV6Rg0sfb25KLCpwJRA=; b=kPvJl5FvOYHLQpiSjPU9W9w4kYo8ifvFYTVBP9KzXU3vUal/Dojcp/WoEw7Qm6XARF PjxbmI9rDKxwrvpU2qHwtC9rwVzqVwNQd1C1iZ78xxUfjazdyoxFunUymyLERzPpqsRb B6iyTVA84JFjc0lHlCMLgJFwlP5WocyTyfDxNXF5Ep03drsPQQIEKb2w3b0bzqeZFCmP hn8KEn/M25+Qbsv89DrsfaB2Hea/w9P2gFI3aJq82zvtngQe1j2+6uUSsieqZBQFbVuh v/85Bw0qhUE6aOqPsCocJWZGSwHpDk+/2pdZqAu7/XQeDdqcSK8+Ks7WI78v91ITioOD kjpQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=zZnpeEKMSTX4dXzz5NpLvrTgjV6Rg0sfb25KLCpwJRA=; b=nnHdVO/wdQt+luxriHZ49MUoGjTYBXqovc9WJ9c/cECgELXBaS31fOyRu01+SVuPqD C0QrRu01wHEbn6GntIu3gpJFL0gm/wdO6HgMNfjrBQWqYjcLjbgie5zJv4W6ZKVmdFKw ek1Ug97gXQdbDxCpCV/qYcpUR1am73Scf9pFRTBAMoEA3KR+gu0Wql7s+2pSbKtWDYmM 4XJgwCdDrlxqricI9akS4qjqYQ5jJNLtSU8WXY/SoxvDxYSJdCQEii0PzW1GNwjflXo2 PuruZo1B/ffDiHQNDb+kObxBiUiEmLAzcbaPA8KkQQwfveh8npxGgWOVC/xA5zkwBNu3 mx0Q== X-Gm-Message-State: AJaThX54oW276VOXaX5cuhBdfbO5dm9gU5mlYhruxlfca2K0u6KdZkEn EVzxDYocZfr+NPiQDVcuVUhWrg== X-Google-Smtp-Source: AGs4zMZYccQJauTYzcBDRtBFc1txRbMkOXAtyhAhrbXAqYQgj4hhqHjjxfqOssVu+W3ZcTVAtZ2tqQ== X-Received: by 10.99.0.86 with SMTP id 83mr39735162pga.326.1511852560282; Mon, 27 Nov 2017 23:02:40 -0800 (PST) Received: from localhost.localdomain ([103.29.142.67]) by smtp.gmail.com with ESMTPSA id i11sm52473488pfk.25.2017.11.27.23.02.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 27 Nov 2017 23:02:39 -0800 (PST) From: Kever Yang To: u-boot@lists.denx.de Date: Tue, 28 Nov 2017 15:02:29 +0800 Message-Id: <1511852549-15752-2-git-send-email-kever.yang@rock-chips.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1511852549-15752-1-git-send-email-kever.yang@rock-chips.com> References: <1511852549-15752-1-git-send-email-kever.yang@rock-chips.com> Cc: Elaine Zhang , David Wu , Andy Yan , William Zhang Subject: [U-Boot] [PATCH v2 2/2] rockchip: clk: bind reset driver X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" From: Elaine Zhang Bind rockchip reset to clock-controller with rockchip_reset_bind(). Signed-off-by: Elaine Zhang Signed-off-by: Kever Yang Acked-by: Philipp Tomsich Reviewed-by: Philipp Tomsich --- Changes in v2: - use rockchip_reset_bind() to bind reset driver. arch/arm/include/asm/arch-rockchip/clock.h | 10 ++++++++++ drivers/clk/rockchip/clk_rk3036.c | 6 ++++++ drivers/clk/rockchip/clk_rk3188.c | 6 ++++++ drivers/clk/rockchip/clk_rk322x.c | 6 ++++++ drivers/clk/rockchip/clk_rk3288.c | 6 ++++++ drivers/clk/rockchip/clk_rk3328.c | 6 ++++++ drivers/clk/rockchip/clk_rk3368.c | 6 ++++++ drivers/clk/rockchip/clk_rk3399.c | 19 +++++++++++++++++++ drivers/clk/rockchip/clk_rv1108.c | 6 ++++++ 9 files changed, 71 insertions(+) diff --git a/arch/arm/include/asm/arch-rockchip/clock.h b/arch/arm/include/asm/arch-rockchip/clock.h index 736b260..5264111 100644 --- a/arch/arm/include/asm/arch-rockchip/clock.h +++ b/arch/arm/include/asm/arch-rockchip/clock.h @@ -85,4 +85,14 @@ void rk3288_clk_configure_cpu(struct rk3288_cru *cru, struct rk3288_grf *grf); int rockchip_get_clk(struct udevice **devp); +/* + * rockchip_reset_bind() - Bind soft reset device as child of clock device + * + * @pdev: clock udevice + * @reg_offset: the first offset in cru for softreset registers + * @reg_number: the reg numbers of softreset registers + * @return 0 success, or error value + */ +int rockchip_reset_bind(struct udevice *pdev, u32 reg_offset, u32 reg_number); + #endif diff --git a/drivers/clk/rockchip/clk_rk3036.c b/drivers/clk/rockchip/clk_rk3036.c index 280ebb9..a718a08 100644 --- a/drivers/clk/rockchip/clk_rk3036.c +++ b/drivers/clk/rockchip/clk_rk3036.c @@ -332,6 +332,7 @@ static int rk3036_clk_bind(struct udevice *dev) int ret; struct udevice *sys_child; struct sysreset_reg *priv; + u32 offset; /* The reset driver does not have a device node, so bind it here */ ret = device_bind_driver(dev, "rockchip_sysreset", "sysreset", @@ -347,6 +348,11 @@ static int rk3036_clk_bind(struct udevice *dev) sys_child->priv = priv; } + offset = offsetof(struct rk3036_cru, cru_softrst_con[0]); + ret = rockchip_reset_bind(dev, offset, 9); + if (ret) + debug("Warning: software reset driver bind faile\n"); + return 0; } diff --git a/drivers/clk/rockchip/clk_rk3188.c b/drivers/clk/rockchip/clk_rk3188.c index fca6899..6f24538 100644 --- a/drivers/clk/rockchip/clk_rk3188.c +++ b/drivers/clk/rockchip/clk_rk3188.c @@ -575,6 +575,7 @@ static int rk3188_clk_bind(struct udevice *dev) int ret; struct udevice *sys_child; struct sysreset_reg *priv; + u32 offset; /* The reset driver does not have a device node, so bind it here */ ret = device_bind_driver(dev, "rockchip_sysreset", "sysreset", @@ -590,6 +591,11 @@ static int rk3188_clk_bind(struct udevice *dev) sys_child->priv = priv; } + offset = offsetof(struct rk3188_cru, cru_softrst_con[0]); + ret = rockchip_reset_bind(dev, offset, 9); + if (ret) + debug("Warning: software reset driver bind faile\n"); + return 0; } diff --git a/drivers/clk/rockchip/clk_rk322x.c b/drivers/clk/rockchip/clk_rk322x.c index ff52b55..1fc4e9e 100644 --- a/drivers/clk/rockchip/clk_rk322x.c +++ b/drivers/clk/rockchip/clk_rk322x.c @@ -387,6 +387,7 @@ static int rk322x_clk_bind(struct udevice *dev) int ret; struct udevice *sys_child; struct sysreset_reg *priv; + u32 offset; /* The reset driver does not have a device node, so bind it here */ ret = device_bind_driver(dev, "rockchip_sysreset", "sysreset", @@ -402,6 +403,11 @@ static int rk322x_clk_bind(struct udevice *dev) sys_child->priv = priv; } + offset = offsetof(struct rk322x_cru, cru_softrst_con[0]); + ret = rockchip_reset_bind(dev, offset, 9); + if (ret) + debug("Warning: software reset driver bind faile\n"); + return 0; } diff --git a/drivers/clk/rockchip/clk_rk3288.c b/drivers/clk/rockchip/clk_rk3288.c index ac53239..e456bd0 100644 --- a/drivers/clk/rockchip/clk_rk3288.c +++ b/drivers/clk/rockchip/clk_rk3288.c @@ -861,6 +861,7 @@ static int rk3288_clk_bind(struct udevice *dev) int ret; struct udevice *sys_child; struct sysreset_reg *priv; + u32 offset; /* The reset driver does not have a device node, so bind it here */ ret = device_bind_driver(dev, "rockchip_sysreset", "sysreset", @@ -876,6 +877,11 @@ static int rk3288_clk_bind(struct udevice *dev) sys_child->priv = priv; } + offset = offsetof(struct rk3288_cru, cru_softrst_con[0]); + ret = rockchip_reset_bind(dev, offset, 12); + if (ret) + debug("Warning: software reset driver bind faile\n"); + return 0; } diff --git a/drivers/clk/rockchip/clk_rk3328.c b/drivers/clk/rockchip/clk_rk3328.c index 4d522a7..8563c72 100644 --- a/drivers/clk/rockchip/clk_rk3328.c +++ b/drivers/clk/rockchip/clk_rk3328.c @@ -599,6 +599,7 @@ static int rk3328_clk_bind(struct udevice *dev) int ret; struct udevice *sys_child; struct sysreset_reg *priv; + u32 offset; /* The reset driver does not have a device node, so bind it here */ ret = device_bind_driver(dev, "rockchip_sysreset", "sysreset", @@ -614,6 +615,11 @@ static int rk3328_clk_bind(struct udevice *dev) sys_child->priv = priv; } + offset = offsetof(struct rk3328_cru, softrst_con[0]); + ret = rockchip_reset_bind(dev, offset, 12); + if (ret) + debug("Warning: software reset driver bind faile\n"); + return ret; } diff --git a/drivers/clk/rockchip/clk_rk3368.c b/drivers/clk/rockchip/clk_rk3368.c index bfeef39..c9449ed 100644 --- a/drivers/clk/rockchip/clk_rk3368.c +++ b/drivers/clk/rockchip/clk_rk3368.c @@ -528,6 +528,7 @@ static int rk3368_clk_bind(struct udevice *dev) int ret; struct udevice *sys_child; struct sysreset_reg *priv; + u32 offset; /* The reset driver does not have a device node, so bind it here */ ret = device_bind_driver(dev, "rockchip_sysreset", "sysreset", @@ -543,6 +544,11 @@ static int rk3368_clk_bind(struct udevice *dev) sys_child->priv = priv; } + offset = offsetof(struct rk3368_cru, softrst_con[0]); + ret = rockchip_reset_bind(dev, offset, 15); + if (ret) + debug("Warning: software reset driver bind faile\n"); + return ret; } diff --git a/drivers/clk/rockchip/clk_rk3399.c b/drivers/clk/rockchip/clk_rk3399.c index 2e85ac7..97d2fcc 100644 --- a/drivers/clk/rockchip/clk_rk3399.c +++ b/drivers/clk/rockchip/clk_rk3399.c @@ -1031,6 +1031,7 @@ static int rk3399_clk_bind(struct udevice *dev) int ret; struct udevice *sys_child; struct sysreset_reg *priv; + u32 offset; /* The reset driver does not have a device node, so bind it here */ ret = device_bind_driver(dev, "rockchip_sysreset", "sysreset", @@ -1046,6 +1047,11 @@ static int rk3399_clk_bind(struct udevice *dev) sys_child->priv = priv; } + offset = offsetof(struct rk3399_cru, softrst_con[0]); + ret = rockchip_reset_bind(dev, offset, 21); + if (ret) + debug("Warning: software reset driver bind faile\n"); + return 0; } @@ -1221,6 +1227,18 @@ static int rk3399_pmuclk_ofdata_to_platdata(struct udevice *dev) return 0; } +static int rk3399_pmuclk_bind(struct udevice *dev) +{ + int ret = 0; + + offset = offsetof(struct rk3399_pmucru, pmucru_softrst_con[0]); + ret = rockchip_reset_bind(dev, offset, 2); + if (ret) + debug("Warning: software reset driver bind faile\n"); + + return 0; +} + static const struct udevice_id rk3399_pmuclk_ids[] = { { .compatible = "rockchip,rk3399-pmucru" }, { } @@ -1234,6 +1252,7 @@ U_BOOT_DRIVER(rockchip_rk3399_pmuclk) = { .ofdata_to_platdata = rk3399_pmuclk_ofdata_to_platdata, .ops = &rk3399_pmuclk_ops, .probe = rk3399_pmuclk_probe, + .bind = rk3399_pmuclk_bind, #if CONFIG_IS_ENABLED(OF_PLATDATA) .platdata_auto_alloc_size = sizeof(struct rk3399_pmuclk_plat), #endif diff --git a/drivers/clk/rockchip/clk_rv1108.c b/drivers/clk/rockchip/clk_rv1108.c index a119548..0f0a18f 100644 --- a/drivers/clk/rockchip/clk_rv1108.c +++ b/drivers/clk/rockchip/clk_rv1108.c @@ -225,6 +225,7 @@ static int rv1108_clk_bind(struct udevice *dev) int ret; struct udevice *sys_child; struct sysreset_reg *priv; + u32 offset; /* The reset driver does not have a device node, so bind it here */ ret = device_bind_driver(dev, "rockchip_sysreset", "sysreset", @@ -240,6 +241,11 @@ static int rv1108_clk_bind(struct udevice *dev) sys_child->priv = priv; } + offset = offsetof(struct rk3368_cru, softrst_con[0]); + ret = rockchip_reset_bind(dev, offset, 13); + if (ret) + debug("Warning: software reset driver bind faile\n"); + return 0; }