From patchwork Thu Oct 26 07:48:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kever Yang X-Patchwork-Id: 830483 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="AUS6t7Jj"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3yMzg4077jz9t3H for ; Thu, 26 Oct 2017 18:49:34 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id BF6D5C21DD0; Thu, 26 Oct 2017 07:49:30 +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_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 3278BC21D84; Thu, 26 Oct 2017 07:49:25 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id B5A56C21C73; Thu, 26 Oct 2017 07:49:23 +0000 (UTC) Received: from mail-pf0-f193.google.com (mail-pf0-f193.google.com [209.85.192.193]) by lists.denx.de (Postfix) with ESMTPS id 68A5BC21C39 for ; Thu, 26 Oct 2017 07:49:21 +0000 (UTC) Received: by mail-pf0-f193.google.com with SMTP id z11so1918617pfk.4 for ; Thu, 26 Oct 2017 00:49:21 -0700 (PDT) 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=baQnSIl5Dbjbx4eWSt+CkxWRs33bflghZjgzRQL6br8=; b=AUS6t7JjfH6fXR7IZuNHm8xBiaAAdTOk0oB4vspyJMsfVnJuNf+8YgKGbmYrzYbHz0 juNBE0ztFXGoHPuN7oMiqaUY0qh6+jFDMJALJFX4GXJxoLqGgS7fGyLGPZFShBvA7q0g yJ1YK0mox7YZ7Urtl/zY768CA4x9FBrpJEVFDxZFNDRD7Iaf8C3deidoW7q4douWgXer 2pfcPRevXeAonHFvGbI3uSU86NDemEbH7URy8bFuRjy4m0eUo3WYne9/fpIWLR/7Hep7 f7tHAE5c0Kpqncp8vNPJ/57vW9rXViph8fmIm2Pj+xbLdPLxKr7pifE1GoYKl+SlKrtu uKbw== 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=baQnSIl5Dbjbx4eWSt+CkxWRs33bflghZjgzRQL6br8=; b=f9oUmwlBN8/Ly/bwVZfA6I1asvQu5dsPMwFm2Ft9Oh59iWGwAbO4Be4A91LWak9/uj MWvZInbIQJYxaGaXnfOy6oFnxtln4OS9UaT17zlCGJ5KZEVaoKaZwxXmHXzdsOSaLimZ Sb3ugGpcL0MkBPQWEZGGAtIm+R+ap6AyFKGpQggmvtjWFjAgypEtv4+10eqWEoHlV0YM Cr3rvBOQFfBY/+ll5FTI3xUh13Fx9LwpMAzIQf0X/Wwatz8A435XwuJ1Svyo6VqjEbaJ osbZjSV7BYk2OzP0AZ5J23Srht9MHudqGpD2OoMrHusWqxVpk5p8OibpsomODVSpDio9 Hc2g== X-Gm-Message-State: AMCzsaXxM9ZMofrY2/bTAsl9X2+CbC70WiplkgsYMYgsy304J/URbpdb q5xuTvoZyCRQ8eWqaztC0HGnWQ== X-Google-Smtp-Source: ABhQp+TtT/TBgteymRHJg1EQAtsjm9vnvfnSApRaOp0W+Fa3F9C6EfV/d+HZNVN14QG0tgaTVGbhZQ== X-Received: by 10.159.234.10 with SMTP id be10mr3790717plb.386.1509004159642; Thu, 26 Oct 2017 00:49:19 -0700 (PDT) Received: from localhost.localdomain ([103.29.142.67]) by smtp.gmail.com with ESMTPSA id f24sm9146551pfk.183.2017.10.26.00.49.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 26 Oct 2017 00:49:18 -0700 (PDT) From: Kever Yang To: u-boot@lists.denx.de Date: Thu, 26 Oct 2017 15:48:57 +0800 Message-Id: <1509004138-20616-1-git-send-email-kever.yang@rock-chips.com> X-Mailer: git-send-email 1.9.1 Cc: zhangqing@rock-chips.com, Andy Yan , Wu Liang feng , William Zhang Subject: [U-Boot] [PATCH v2 1/2] rockchip: sysreset: merge into one common 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" Use a common driver for all Rockchip SOC instead of one for each SoC. Use driver_data for reg offset. Signed-off-by: Kever Yang --- Changes in v2: - use udev priv member instead of driver_data arch/arm/include/asm/arch-rockchip/clock.h | 5 +++ drivers/sysreset/Makefile | 12 +----- drivers/sysreset/sysreset_rk3036.c | 45 ---------------------- drivers/sysreset/sysreset_rk3188.c | 62 ------------------------------ drivers/sysreset/sysreset_rk322x.c | 45 ---------------------- drivers/sysreset/sysreset_rk3288.c | 47 ---------------------- drivers/sysreset/sysreset_rk3328.c | 45 ---------------------- drivers/sysreset/sysreset_rk3368.c | 62 ------------------------------ drivers/sysreset/sysreset_rk3399.c | 45 ---------------------- drivers/sysreset/sysreset_rockchip.c | 48 +++++++++++++++++++++++ drivers/sysreset/sysreset_rv1108.c | 46 ---------------------- 11 files changed, 54 insertions(+), 408 deletions(-) delete mode 100644 drivers/sysreset/sysreset_rk3036.c delete mode 100644 drivers/sysreset/sysreset_rk3188.c delete mode 100644 drivers/sysreset/sysreset_rk322x.c delete mode 100644 drivers/sysreset/sysreset_rk3288.c delete mode 100644 drivers/sysreset/sysreset_rk3328.c delete mode 100644 drivers/sysreset/sysreset_rk3368.c delete mode 100644 drivers/sysreset/sysreset_rk3399.c create mode 100644 drivers/sysreset/sysreset_rockchip.c delete mode 100644 drivers/sysreset/sysreset_rv1108.c diff --git a/arch/arm/include/asm/arch-rockchip/clock.h b/arch/arm/include/asm/arch-rockchip/clock.h index c6256c0..7deea14 100644 --- a/arch/arm/include/asm/arch-rockchip/clock.h +++ b/arch/arm/include/asm/arch-rockchip/clock.h @@ -40,6 +40,11 @@ static inline int rk_pll_id(enum rk_clk_id clk_id) return clk_id - 1; } +struct sysreset_reg { + unsigned int glb_srst_fst_value; + unsigned int glb_srst_snd_value; +}; + /** * clk_get_divisor() - Calculate the required clock divisior * diff --git a/drivers/sysreset/Makefile b/drivers/sysreset/Makefile index e3a0ab1..50a0de9 100644 --- a/drivers/sysreset/Makefile +++ b/drivers/sysreset/Makefile @@ -9,19 +9,9 @@ obj-$(CONFIG_SYSRESET_PSCI) += sysreset_psci.o obj-$(CONFIG_SYSRESET_SYSCON) += sysreset_syscon.o obj-$(CONFIG_SYSRESET_WATCHDOG) += sysreset_watchdog.o -ifndef CONFIG_SPL_BUILD -obj-$(CONFIG_ROCKCHIP_RK3036) += sysreset_rk3036.o -endif -obj-$(CONFIG_ROCKCHIP_RK3128) += sysreset_rk3128.o -obj-$(CONFIG_ROCKCHIP_RK3188) += sysreset_rk3188.o -obj-$(CONFIG_ROCKCHIP_RK322X) += sysreset_rk322x.o -obj-$(CONFIG_ROCKCHIP_RK3288) += sysreset_rk3288.o -obj-$(CONFIG_ROCKCHIP_RK3328) += sysreset_rk3328.o -obj-$(CONFIG_ROCKCHIP_RK3368) += sysreset_rk3368.o -obj-$(CONFIG_ROCKCHIP_RK3399) += sysreset_rk3399.o -obj-$(CONFIG_ROCKCHIP_RV1108) += sysreset_rv1108.o obj-$(CONFIG_SANDBOX) += sysreset_sandbox.o obj-$(CONFIG_ARCH_SNAPDRAGON) += sysreset_snapdragon.o obj-$(CONFIG_ARCH_STI) += sysreset_sti.o obj-$(CONFIG_TARGET_XTFPGA) += sysreset_xtfpga.o obj-$(CONFIG_ARCH_ASPEED) += sysreset_ast.o +obj-$(CONFIG_ARCH_ROCKCHIP) += sysreset_rockchip.o diff --git a/drivers/sysreset/sysreset_rk3036.c b/drivers/sysreset/sysreset_rk3036.c deleted file mode 100644 index b3d2113..0000000 --- a/drivers/sysreset/sysreset_rk3036.c +++ /dev/null @@ -1,45 +0,0 @@ -/* - * (C) Copyright 2015 Rockchip Electronics Co., Ltd - * - * SPDX-License-Identifier: GPL-2.0+ - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -int rk3036_sysreset_request(struct udevice *dev, enum sysreset_t type) -{ - struct rk3036_cru *cru = rockchip_get_cru(); - - if (IS_ERR(cru)) - return PTR_ERR(cru); - switch (type) { - case SYSRESET_WARM: - writel(0xeca8, &cru->cru_glb_srst_snd_value); - break; - case SYSRESET_COLD: - writel(0xfdb9, &cru->cru_glb_srst_fst_value); - break; - default: - return -EPROTONOSUPPORT; - } - - return -EINPROGRESS; -} - -static struct sysreset_ops rk3036_sysreset = { - .request = rk3036_sysreset_request, -}; - -U_BOOT_DRIVER(sysreset_rk3036) = { - .name = "rk3036_sysreset", - .id = UCLASS_SYSRESET, - .ops = &rk3036_sysreset, -}; diff --git a/drivers/sysreset/sysreset_rk3188.c b/drivers/sysreset/sysreset_rk3188.c deleted file mode 100644 index 053a634..0000000 --- a/drivers/sysreset/sysreset_rk3188.c +++ /dev/null @@ -1,62 +0,0 @@ -/* - * (C) Copyright 2015 Google, Inc - * - * SPDX-License-Identifier: GPL-2.0 - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -int rk3188_sysreset_request(struct udevice *dev, enum sysreset_t type) -{ - struct rk3188_cru *cru = rockchip_get_cru(); - struct rk3188_grf *grf; - - if (IS_ERR(cru)) - return PTR_ERR(cru); - switch (type) { - case SYSRESET_WARM: - grf = syscon_get_first_range(ROCKCHIP_SYSCON_GRF); - if (IS_ERR(grf)) - return -EPROTONOSUPPORT; - - /* - * warm-reset keeps the remap value, - * so make sure it's disabled. - */ - rk_clrsetreg(&grf->soc_con0, - NOC_REMAP_MASK << NOC_REMAP_SHIFT, - 0 << NOC_REMAP_SHIFT); - - rk_clrreg(&cru->cru_mode_con, 0xffff); - writel(0xeca8, &cru->cru_glb_srst_snd_value); - break; - case SYSRESET_COLD: - rk_clrreg(&cru->cru_mode_con, 0xffff); - writel(0xfdb9, &cru->cru_glb_srst_fst_value); - break; - default: - return -EPROTONOSUPPORT; - } - - return -EINPROGRESS; -} - -static struct sysreset_ops rk3188_sysreset = { - .request = rk3188_sysreset_request, -}; - -U_BOOT_DRIVER(sysreset_rk3188) = { - .name = "rk3188_sysreset", - .id = UCLASS_SYSRESET, - .ops = &rk3188_sysreset, -}; diff --git a/drivers/sysreset/sysreset_rk322x.c b/drivers/sysreset/sysreset_rk322x.c deleted file mode 100644 index 5fce79b..0000000 --- a/drivers/sysreset/sysreset_rk322x.c +++ /dev/null @@ -1,45 +0,0 @@ -/* - * (C) Copyright 2017 Rockchip Electronics Co., Ltd - * - * SPDX-License-Identifier: GPL-2.0+ - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -int rk322x_sysreset_request(struct udevice *dev, enum sysreset_t type) -{ - struct rk322x_cru *cru = rockchip_get_cru(); - - if (IS_ERR(cru)) - return PTR_ERR(cru); - switch (type) { - case SYSRESET_WARM: - writel(0xeca8, &cru->cru_glb_srst_snd_value); - break; - case SYSRESET_COLD: - writel(0xfdb9, &cru->cru_glb_srst_fst_value); - break; - default: - return -EPROTONOSUPPORT; - } - - return -EINPROGRESS; -} - -static struct sysreset_ops rk322x_sysreset = { - .request = rk322x_sysreset_request, -}; - -U_BOOT_DRIVER(sysreset_rk322x) = { - .name = "rk322x_sysreset", - .id = UCLASS_SYSRESET, - .ops = &rk322x_sysreset, -}; diff --git a/drivers/sysreset/sysreset_rk3288.c b/drivers/sysreset/sysreset_rk3288.c deleted file mode 100644 index 0aad1c2..0000000 --- a/drivers/sysreset/sysreset_rk3288.c +++ /dev/null @@ -1,47 +0,0 @@ -/* - * (C) Copyright 2015 Google, Inc - * - * SPDX-License-Identifier: GPL-2.0 - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -int rk3288_sysreset_request(struct udevice *dev, enum sysreset_t type) -{ - struct rk3288_cru *cru = rockchip_get_cru(); - - if (IS_ERR(cru)) - return PTR_ERR(cru); - switch (type) { - case SYSRESET_WARM: - rk_clrreg(&cru->cru_mode_con, 0xffff); - writel(0xeca8, &cru->cru_glb_srst_snd_value); - break; - case SYSRESET_COLD: - rk_clrreg(&cru->cru_mode_con, 0xffff); - writel(0xfdb9, &cru->cru_glb_srst_fst_value); - break; - default: - return -EPROTONOSUPPORT; - } - - return -EINPROGRESS; -} - -static struct sysreset_ops rk3288_sysreset = { - .request = rk3288_sysreset_request, -}; - -U_BOOT_DRIVER(sysreset_rk3288) = { - .name = "rk3288_sysreset", - .id = UCLASS_SYSRESET, - .ops = &rk3288_sysreset, -}; diff --git a/drivers/sysreset/sysreset_rk3328.c b/drivers/sysreset/sysreset_rk3328.c deleted file mode 100644 index 7b9af09..0000000 --- a/drivers/sysreset/sysreset_rk3328.c +++ /dev/null @@ -1,45 +0,0 @@ -/* - * (C) Copyright 2016 Rockchip Electronics Co., Ltd - * - * SPDX-License-Identifier: GPL-2.0 - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -int rk3328_sysreset_request(struct udevice *dev, enum sysreset_t type) -{ - struct rk3328_cru *cru = rockchip_get_cru(); - - if (IS_ERR(cru)) - return PTR_ERR(cru); - switch (type) { - case SYSRESET_WARM: - writel(0xeca8, &cru->glb_srst_snd_value); - break; - case SYSRESET_COLD: - writel(0xfdb9, &cru->glb_srst_fst_value); - break; - default: - return -EPROTONOSUPPORT; - } - - return -EINPROGRESS; -} - -static struct sysreset_ops rk3328_sysreset = { - .request = rk3328_sysreset_request, -}; - -U_BOOT_DRIVER(sysreset_rk3328) = { - .name = "rk3328_sysreset", - .id = UCLASS_SYSRESET, - .ops = &rk3328_sysreset, -}; diff --git a/drivers/sysreset/sysreset_rk3368.c b/drivers/sysreset/sysreset_rk3368.c deleted file mode 100644 index de62921..0000000 --- a/drivers/sysreset/sysreset_rk3368.c +++ /dev/null @@ -1,62 +0,0 @@ -/* - * (C) Copyright Rockchip Electronics Co., Ltd - * - * SPDX-License-Identifier: GPL-2.0 - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -static void rk3368_pll_enter_slow_mode(struct rk3368_cru *cru) -{ - struct rk3368_pll *pll; - int i; - - for (i = 0; i < 6; i++) { - pll = &cru->pll[i]; - rk_clrreg(&pll->con3, PLL_MODE_MASK); - } -} - -static int rk3368_sysreset_request(struct udevice *dev, enum sysreset_t type) -{ - struct rk3368_cru *cru = rockchip_get_cru(); - - if (IS_ERR(cru)) - return PTR_ERR(cru); - switch (type) { - case SYSRESET_WARM: - rk3368_pll_enter_slow_mode(cru); - rk_clrsetreg(&cru->glb_rst_con, PMU_GLB_SRST_CTRL_MASK, - PMU_RST_BY_SND_GLB_SRST << PMU_GLB_SRST_CTRL_SHIFT); - writel(0xeca8, &cru->glb_srst_snd_val); - break; - case SYSRESET_COLD: - rk3368_pll_enter_slow_mode(cru); - rk_clrsetreg(&cru->glb_rst_con, PMU_GLB_SRST_CTRL_MASK, - PMU_RST_BY_FST_GLB_SRST << PMU_GLB_SRST_CTRL_SHIFT); - writel(0xfdb9, &cru->glb_srst_fst_val); - break; - default: - return -EPROTONOSUPPORT; - } - - return -EINPROGRESS; -} - -static struct sysreset_ops rk3368_sysreset = { - .request = rk3368_sysreset_request, -}; - -U_BOOT_DRIVER(sysreset_rk3368) = { - .name = "rk3368_sysreset", - .id = UCLASS_SYSRESET, - .ops = &rk3368_sysreset, -}; diff --git a/drivers/sysreset/sysreset_rk3399.c b/drivers/sysreset/sysreset_rk3399.c deleted file mode 100644 index 9a55546..0000000 --- a/drivers/sysreset/sysreset_rk3399.c +++ /dev/null @@ -1,45 +0,0 @@ -/* - * (C) Copyright 2016 Rockchip Electronics Co., Ltd - * - * SPDX-License-Identifier: GPL-2.0 - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -int rk3399_sysreset_request(struct udevice *dev, enum sysreset_t type) -{ - struct rk3399_cru *cru = rockchip_get_cru(); - - if (IS_ERR(cru)) - return PTR_ERR(cru); - switch (type) { - case SYSRESET_WARM: - writel(0xeca8, &cru->glb_srst_snd_value); - break; - case SYSRESET_COLD: - writel(0xfdb9, &cru->glb_srst_fst_value); - break; - default: - return -EPROTONOSUPPORT; - } - - return -EINPROGRESS; -} - -static struct sysreset_ops rk3399_sysreset = { - .request = rk3399_sysreset_request, -}; - -U_BOOT_DRIVER(sysreset_rk3399) = { - .name = "rk3399_sysreset", - .id = UCLASS_SYSRESET, - .ops = &rk3399_sysreset, -}; diff --git a/drivers/sysreset/sysreset_rockchip.c b/drivers/sysreset/sysreset_rockchip.c new file mode 100644 index 0000000..c067aed --- /dev/null +++ b/drivers/sysreset/sysreset_rockchip.c @@ -0,0 +1,48 @@ +/* + * (C) Copyright 2017 Rockchip Electronics Co., Ltd + * + * SPDX-License-Identifier: GPL-2.0 + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +int rockchip_sysreset_request(struct udevice *dev, enum sysreset_t type) +{ + struct sysreset_reg *offset = dev_get_priv(dev); + unsigned long cru_base = (unsigned long)rockchip_get_cru(); + + if (IS_ERR_VALUE(cru_base)) + return (int)cru_base; + + switch (type) { + case SYSRESET_WARM: + writel(0xfdb9, cru_base + offset->glb_srst_fst_value); + writel(0xeca8, cru_base + offset->glb_srst_snd_value); + break; + case SYSRESET_COLD: + writel(0xfdb9, cru_base + offset->glb_srst_fst_value); + break; + default: + return -EPROTONOSUPPORT; + } + + return -EINPROGRESS; +} + +static struct sysreset_ops rockchip_sysreset = { + .request = rockchip_sysreset_request, +}; + +U_BOOT_DRIVER(sysreset_rockchip) = { + .name = "rockchip_sysreset", + .id = UCLASS_SYSRESET, + .ops = &rockchip_sysreset, +}; diff --git a/drivers/sysreset/sysreset_rv1108.c b/drivers/sysreset/sysreset_rv1108.c deleted file mode 100644 index 9d8e9f7..0000000 --- a/drivers/sysreset/sysreset_rv1108.c +++ /dev/null @@ -1,46 +0,0 @@ -/* - * (C) Copyright 2015 Rockchip Electronics Co., Ltd - * Author: Andy Yan - * SPDX-License-Identifier: GPL-2.0+ - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -int rv1108_sysreset_request(struct udevice *dev, enum sysreset_t type) -{ - struct rv1108_cru *cru = rockchip_get_cru(); - - if (IS_ERR(cru)) - return PTR_ERR(cru); - - switch (type) { - case SYSRESET_WARM: - writel(0xeca8, &cru->glb_srst_snd_val); - break; - case SYSRESET_COLD: - writel(0xfdb9, &cru->glb_srst_fst_val); - break; - default: - return -EPROTONOSUPPORT; - } - - return -EINPROGRESS; -} - -static struct sysreset_ops rv1108_sysreset = { - .request = rv1108_sysreset_request, -}; - -U_BOOT_DRIVER(sysreset_rv1108) = { - .name = "rv1108_sysreset", - .id = UCLASS_SYSRESET, - .ops = &rv1108_sysreset, -}; From patchwork Thu Oct 26 07:48:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kever Yang X-Patchwork-Id: 830484 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="C5jHnc8x"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3yMzgm2d4gz9t3H for ; Thu, 26 Oct 2017 18:50:11 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id BC7B9C21DE4; Thu, 26 Oct 2017 07:50:00 +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_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 C4370C21DDF; Thu, 26 Oct 2017 07:49:27 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 276C5C21C39; Thu, 26 Oct 2017 07:49:26 +0000 (UTC) Received: from mail-pf0-f195.google.com (mail-pf0-f195.google.com [209.85.192.195]) by lists.denx.de (Postfix) with ESMTPS id C8D9BC21C39 for ; Thu, 26 Oct 2017 07:49:24 +0000 (UTC) Received: by mail-pf0-f195.google.com with SMTP id n89so1901377pfk.11 for ; Thu, 26 Oct 2017 00:49:24 -0700 (PDT) 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=gX9Svs0X39gHRRB12LWK3tzZkbulOy+71I5wRasSlY0=; b=C5jHnc8x9jYcGa5p0Bx5BE0n91HaTnrHw/wa0UGU5yRT2EcKlk7AN/aPXiN1WpBDKT 9/LYuR65rxG3wMcbnNIz0JlDfg2qc8cY5flBHG8mdNrwbjO2B4rbvDo5549XdsVl0xc3 QMJvrW369xyTLdboPfvb7tdGfqiTOLkh9ypB34q7mpwKZwVYOpwcJZtqNN00VO/4GS0g SNEV7Evs4hxhQlrvpLhMQowWLAsQWZEqjotTwMXRrn+AYYwa8x3gzCdu+EvZ4NYvyflM TPnlEvlYlI7iRqF9aDmb5aiOOWrThh4ais2yNc4PObUZyjkBIKD8zAJg/Z4I4prhgQRR rDMQ== 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=gX9Svs0X39gHRRB12LWK3tzZkbulOy+71I5wRasSlY0=; b=Nh6UOAVOQuYn+CrF+b/vrUuEB+GymAUD8qtFy6NcAGFt6t7Km9GbFK6xXn7cZD5drN LBlDHcbSJBeVePqFvIL+USAK8H8k+joJ5saQ87X/6ryV3EvtlI7UypJmSYMdohULbwWD iSkKzAMrMky8pkMr+eafqHk/yDMuBYHmMZ09WjPG9qXhWJGHbteSz75FOpADpacXTy/X b4rpAZ5zILYIxWJOJB5AzHYo0bzZzpF7gBZf+ESOqf7JTiyuq7o/Zf7tFgOlGSHmntOo y5dTwjmVi4BgF50xEoXox8d7qYJ6eOkEoIT2GrrDZuUXicmEheqma1RueQ5mZZzPiWPK +sSg== X-Gm-Message-State: AMCzsaVi7F+QPAtkfIaZLOPWvZCIJLjpwPp9p8rvKjTOsc80Ez3Pk3/F /KrNG0Y6htlAPQlMusIvRqpGcQ== X-Google-Smtp-Source: ABhQp+Rl4nGenD14mpU0d9pHwnILoq1Qt8Oa3p8JAayaybq0rnE36rp5/XkdVCAIYUV8Lvqg6pIaAQ== X-Received: by 10.84.192.3 with SMTP id b3mr3814607pld.118.1509004163200; Thu, 26 Oct 2017 00:49:23 -0700 (PDT) Received: from localhost.localdomain ([103.29.142.67]) by smtp.gmail.com with ESMTPSA id f24sm9146551pfk.183.2017.10.26.00.49.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 26 Oct 2017 00:49:22 -0700 (PDT) From: Kever Yang To: u-boot@lists.denx.de Date: Thu, 26 Oct 2017 15:48:58 +0800 Message-Id: <1509004138-20616-2-git-send-email-kever.yang@rock-chips.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1509004138-20616-1-git-send-email-kever.yang@rock-chips.com> References: <1509004138-20616-1-git-send-email-kever.yang@rock-chips.com> Cc: Jacob Chen , zhangqing@rock-chips.com, Zhangbin Tong , David Wu , Andy Yan , William Zhang Subject: [U-Boot] [PATCH v2 2/2] rockchip: clock: update sysreset driver bingding 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" Using driver_data for new sysreset driver binding. Signed-off-by: Kever Yang --- Changes in v2: - use udev priv member instead of driver_data drivers/clk/rockchip/clk_rk3036.c | 10 ++++++++-- drivers/clk/rockchip/clk_rk3188.c | 10 ++++++++-- drivers/clk/rockchip/clk_rk322x.c | 10 ++++++++-- drivers/clk/rockchip/clk_rk3288.c | 10 ++++++++-- drivers/clk/rockchip/clk_rk3328.c | 11 +++++++++-- drivers/clk/rockchip/clk_rk3368.c | 12 +++++++++--- drivers/clk/rockchip/clk_rk3399.c | 10 ++++++++-- drivers/clk/rockchip/clk_rv1108.c | 10 ++++++++-- 8 files changed, 66 insertions(+), 17 deletions(-) diff --git a/drivers/clk/rockchip/clk_rk3036.c b/drivers/clk/rockchip/clk_rk3036.c index 83f4ae6..7d56024 100644 --- a/drivers/clk/rockchip/clk_rk3036.c +++ b/drivers/clk/rockchip/clk_rk3036.c @@ -330,11 +330,17 @@ static int rk3036_clk_probe(struct udevice *dev) static int rk3036_clk_bind(struct udevice *dev) { int ret; + struct udevice *sys_child; + struct sysreset_reg *priv = malloc(sizeof(struct sysreset_reg)); /* The reset driver does not have a device node, so bind it here */ - ret = device_bind_driver(gd->dm_root, "rk3036_sysreset", "reset", &dev); + ret = device_bind_driver(dev, "rockchip_sysreset", "sysreset", &sys_child); if (ret) - debug("Warning: No RK3036 reset driver: ret=%d\n", ret); + debug("Warning: No sysreset driver: ret=%d\n", ret); + + priv->glb_srst_fst_value = offsetof(struct rk3036_cru, cru_glb_srst_fst_value); + priv->glb_srst_snd_value = offsetof(struct rk3036_cru, cru_glb_srst_snd_value); + sys_child->priv = priv; return 0; } diff --git a/drivers/clk/rockchip/clk_rk3188.c b/drivers/clk/rockchip/clk_rk3188.c index 7bf308d..e1650a4 100644 --- a/drivers/clk/rockchip/clk_rk3188.c +++ b/drivers/clk/rockchip/clk_rk3188.c @@ -603,11 +603,17 @@ static int rk3188_clk_probe(struct udevice *dev) static int rk3188_clk_bind(struct udevice *dev) { int ret; + struct udevice *sys_child; + struct sysreset_reg *priv = malloc(sizeof(struct sysreset_reg)); /* The reset driver does not have a device node, so bind it here */ - ret = device_bind_driver(gd->dm_root, "rk3188_sysreset", "reset", &dev); + ret = device_bind_driver(dev, "rockchip_sysreset", "sysreset", &sys_child); if (ret) - debug("Warning: No rk3188 reset driver: ret=%d\n", ret); + debug("Warning: No sysreset driver: ret=%d\n", ret); + + priv->glb_srst_fst_value = offsetof(struct rk3188_cru, cru_glb_srst_fst_value); + priv->glb_srst_snd_value = offsetof(struct rk3188_cru, cru_glb_srst_snd_value); + sys_child->priv = priv; return 0; } diff --git a/drivers/clk/rockchip/clk_rk322x.c b/drivers/clk/rockchip/clk_rk322x.c index 354883a..c00b156 100644 --- a/drivers/clk/rockchip/clk_rk322x.c +++ b/drivers/clk/rockchip/clk_rk322x.c @@ -413,11 +413,17 @@ static int rk322x_clk_probe(struct udevice *dev) static int rk322x_clk_bind(struct udevice *dev) { int ret; + struct udevice *sys_child; + struct sysreset_reg *priv = malloc(sizeof(struct sysreset_reg)); /* The reset driver does not have a device node, so bind it here */ - ret = device_bind_driver(gd->dm_root, "rk322x_sysreset", "reset", &dev); + ret = device_bind_driver(dev, "rockchip_sysreset", "sysreset", &sys_child); if (ret) - debug("Warning: No RK322x reset driver: ret=%d\n", ret); + debug("Warning: No sysreset driver: ret=%d\n", ret); + + priv->glb_srst_fst_value = offsetof(struct rk322x_cru, cru_glb_srst_fst_value); + priv->glb_srst_snd_value = offsetof(struct rk322x_cru, cru_glb_srst_snd_value); + sys_child->priv = priv; return 0; } diff --git a/drivers/clk/rockchip/clk_rk3288.c b/drivers/clk/rockchip/clk_rk3288.c index 204a547..0eb8403 100644 --- a/drivers/clk/rockchip/clk_rk3288.c +++ b/drivers/clk/rockchip/clk_rk3288.c @@ -983,11 +983,17 @@ static int rk3288_clk_probe(struct udevice *dev) static int rk3288_clk_bind(struct udevice *dev) { int ret; + struct udevice *sys_child; + struct sysreset_reg *priv = malloc(sizeof(struct sysreset_reg)); /* The reset driver does not have a device node, so bind it here */ - ret = device_bind_driver(gd->dm_root, "rk3288_sysreset", "reset", &dev); + ret = device_bind_driver(dev, "rockchip_sysreset", "sysreset", &sys_child); if (ret) - debug("Warning: No RK3288 reset driver: ret=%d\n", ret); + debug("Warning: No sysreset driver: ret=%d\n", ret); + + priv->glb_srst_fst_value = offsetof(struct rk3288_cru, cru_glb_srst_fst_value); + priv->glb_srst_snd_value = offsetof(struct rk3288_cru, cru_glb_srst_snd_value); + sys_child->priv = priv; return 0; } diff --git a/drivers/clk/rockchip/clk_rk3328.c b/drivers/clk/rockchip/clk_rk3328.c index 540d910..2b58621 100644 --- a/drivers/clk/rockchip/clk_rk3328.c +++ b/drivers/clk/rockchip/clk_rk3328.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #include @@ -597,11 +598,17 @@ static int rk3328_clk_ofdata_to_platdata(struct udevice *dev) static int rk3328_clk_bind(struct udevice *dev) { int ret; + struct udevice *sys_child; + struct sysreset_reg *priv = malloc(sizeof(struct sysreset_reg)); /* The reset driver does not have a device node, so bind it here */ - ret = device_bind_driver(gd->dm_root, "rk3328_sysreset", "reset", &dev); + ret = device_bind_driver(dev, "rockchip_sysreset", "sysreset", &sys_child); if (ret) - printf("Warning: No RK3328 reset driver: ret=%d\n", ret); + debug("Warning: No sysreset driver: ret=%d\n", ret); + + priv->glb_srst_fst_value = offsetof(struct rk3328_cru, glb_srst_fst_value); + priv->glb_srst_snd_value = offsetof(struct rk3328_cru, glb_srst_snd_value); + sys_child->priv = priv; return ret; } diff --git a/drivers/clk/rockchip/clk_rk3368.c b/drivers/clk/rockchip/clk_rk3368.c index cd3ab24..89619a4 100644 --- a/drivers/clk/rockchip/clk_rk3368.c +++ b/drivers/clk/rockchip/clk_rk3368.c @@ -526,11 +526,17 @@ static int rk3368_clk_ofdata_to_platdata(struct udevice *dev) static int rk3368_clk_bind(struct udevice *dev) { int ret; + struct udevice *sys_child; + struct sysreset_reg *priv = malloc(sizeof(struct sysreset_reg)); - /* The reset driver does not have a device node, so bind it here */ - ret = device_bind_driver(gd->dm_root, "rk3368_sysreset", "reset", &dev); + ret = device_bind_driver(dev, "rockchip_sysreset", "sysreset", &sys_child); if (ret) - error("bind RK3368 reset driver failed: ret=%d\n", ret); + debug("Warning: No sysreset driver: ret=%d\n", ret); + + priv->glb_srst_fst_value = offsetof(struct rk3368_cru, glb_srst_fst_val); + priv->glb_srst_snd_value = offsetof(struct rk3368_cru, glb_srst_snd_val); + /* The reset driver does not have a device node, so bind it here */ + sys_child->priv = priv; return ret; } diff --git a/drivers/clk/rockchip/clk_rk3399.c b/drivers/clk/rockchip/clk_rk3399.c index b31446e..33918d2 100644 --- a/drivers/clk/rockchip/clk_rk3399.c +++ b/drivers/clk/rockchip/clk_rk3399.c @@ -1018,11 +1018,17 @@ static int rk3399_clk_ofdata_to_platdata(struct udevice *dev) static int rk3399_clk_bind(struct udevice *dev) { int ret; + struct udevice *sys_child; + struct sysreset_reg *priv = malloc(sizeof(struct sysreset_reg)); /* The reset driver does not have a device node, so bind it here */ - ret = device_bind_driver(gd->dm_root, "rk3399_sysreset", "reset", &dev); + ret = device_bind_driver(dev, "rockchip_sysreset", "sysreset", &sys_child); if (ret) - printf("Warning: No RK3399 reset driver: ret=%d\n", ret); + debug("Warning: No sysreset driver: ret=%d\n", ret); + + priv->glb_srst_fst_value = offsetof(struct rk3399_cru, glb_srst_fst_value); + priv->glb_srst_snd_value = offsetof(struct rk3399_cru, glb_srst_snd_value); + sys_child->priv = priv; return 0; } diff --git a/drivers/clk/rockchip/clk_rv1108.c b/drivers/clk/rockchip/clk_rv1108.c index 86e73e4..a0caf3f 100644 --- a/drivers/clk/rockchip/clk_rv1108.c +++ b/drivers/clk/rockchip/clk_rv1108.c @@ -223,11 +223,17 @@ static int rv1108_clk_probe(struct udevice *dev) static int rv1108_clk_bind(struct udevice *dev) { int ret; + struct udevice *sys_child; + struct sysreset_reg *priv = malloc(sizeof(struct sysreset_reg)); /* The reset driver does not have a device node, so bind it here */ - ret = device_bind_driver(gd->dm_root, "rv1108_sysreset", "reset", &dev); + ret = device_bind_driver(dev, "rockchip_sysreset", "sysreset", &sys_child); if (ret) - error("No Rv1108 reset driver: ret=%d\n", ret); + debug("Warning: No sysreset driver: ret=%d\n", ret); + + priv->glb_srst_fst_value = offsetof(struct rv1108_cru, glb_srst_fst_val); + priv->glb_srst_snd_value = offsetof(struct rv1108_cru, glb_srst_snd_val); + sys_child->priv = priv; return 0; }