From patchwork Wed Nov 28 02:04:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kever Yang X-Patchwork-Id: 1004148 X-Patchwork-Delegate: ykai007@gmail.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; dmarc=none (p=none dis=none) header.from=rock-chips.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="hVQq/OCS"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 434P9F370Bz9s4s for ; Wed, 28 Nov 2018 13:04:29 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 0E1FEC2216B; Wed, 28 Nov 2018 02:04:24 +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 72E2EC21FBA; Wed, 28 Nov 2018 02:04:22 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 0C3ABC21FAA; Wed, 28 Nov 2018 02:04:20 +0000 (UTC) Received: from mail-pl1-f194.google.com (mail-pl1-f194.google.com [209.85.214.194]) by lists.denx.de (Postfix) with ESMTPS id 50F03C21F77 for ; Wed, 28 Nov 2018 02:04:20 +0000 (UTC) Received: by mail-pl1-f194.google.com with SMTP id p8so6272405plo.2 for ; Tue, 27 Nov 2018 18:04:20 -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=Mc20XqNqdRFGNb1qmh3AG0WN04KBn4/mTktdyojI14c=; b=hVQq/OCScqCn41Y7GIGLWGm+VaLYNOpnfHYhCqrpbOOyQQun37Hv5od+HVhmCuUZw0 uDp8hhg159+VgjVi+Y/gyBLG2imdxgNoOhc4qCigCVvHfbMamebnP5uDjrrTw/Jew9A7 G4L5TH6Cn7/oM6M462lRp+BlxpjyZfMir7is2dXSN+/Xlp/56LN7q/uZZ2/UMdrjijzF /F7y38sgNirthg4nnt5tXjxohwQPsauqX7iukGI4mQxx5mOIaAzz0nWF3KdMUUgCzgie xR3Dr8Va0C94ZJCLewZK29a2iiOD75QHLQvhADCp2uxd4IhqpY3P9qDntLvY98ld/aYT sCDg== 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=Mc20XqNqdRFGNb1qmh3AG0WN04KBn4/mTktdyojI14c=; b=lVY2s1WGRQfVMlNX7Nzp73NHpHvBAhUyw2fS1TnHQxUIY+S1URFRnOya1fluEd1l30 TJdgXRXHcpRLXHQlG+8FThsO/OxCotwcvLCtv8NQ46zaxVsxzej6Uh4zIhblJlJ9uGNs 38R2BM6eVdGK6+h05I+5De7yyg/cJlzc/SXjcq6CDbQXZ/kSxrezYrC+faVfF4EcLcFW bmelAoW2Nx66wAuX6eQJSfsnLjNV8q2VAdyou3VryFBQywLqxE4ITHFQlkxAsf3Ob7qY HnpWboVDILPHSngNNSZzlhrTicS0KLGeNv6YAL5kQb94iFPBBC9IZ07adsydMLvUj80g kM8Q== X-Gm-Message-State: AA+aEWYxUFIZSr9ciG/cQySns1Viu1rB8j9qFDtKj9Lv08wAQ2u5nEsP EkjwKc6V6q1AFsALX/csDBHwuOAA X-Google-Smtp-Source: AFSGD/VoNT1wHkjTMwmf04Hh9gnof+tOmijETOQh0nYt8seqDjWdPl/sL0uE/WEzW6i/RwZFhACXDw== X-Received: by 2002:a17:902:bf0c:: with SMTP id bi12mr7880460plb.0.1543370658136; Tue, 27 Nov 2018 18:04:18 -0800 (PST) Received: from localhost.localdomain ([103.29.142.67]) by smtp.gmail.com with ESMTPSA id l5-v6sm6272512pfl.73.2018.11.27.18.04.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 27 Nov 2018 18:04:16 -0800 (PST) From: Kever Yang To: u-boot@lists.denx.de Date: Wed, 28 Nov 2018 10:04:05 +0800 Message-Id: <20181128020406.17577-1-kever.yang@rock-chips.com> X-Mailer: git-send-email 2.18.0 Subject: [U-Boot] [RESENT PATCH 1/2] rockchip: rk3128: use ROCKCHIP_BOOT_MODE_REG to update reboot flag 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 ROCKCHIP_BOOT_MODE_REG instead of grf structure so that we can re-use the source code later. Signed-off-by: Kever Yang --- arch/arm/mach-rockchip/Kconfig | 1 + arch/arm/mach-rockchip/rk3128-board.c | 5 +---- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig index 145d96b1f0..94a03e2a38 100644 --- a/arch/arm/mach-rockchip/Kconfig +++ b/arch/arm/mach-rockchip/Kconfig @@ -179,6 +179,7 @@ config TPL_ROCKCHIP_BACK_TO_BROM config ROCKCHIP_BOOT_MODE_REG hex "Rockchip boot mode flag register address" default 0x200081c8 if ROCKCHIP_RK3036 + default 0x100a0038 if ROCKCHIP_RK3128 default 0x20004040 if ROCKCHIP_RK3188 default 0x110005c8 if ROCKCHIP_RK322X default 0xff730094 if ROCKCHIP_RK3288 diff --git a/arch/arm/mach-rockchip/rk3128-board.c b/arch/arm/mach-rockchip/rk3128-board.c index 7fd667a0b8..f64ccc51a0 100644 --- a/arch/arm/mach-rockchip/rk3128-board.c +++ b/arch/arm/mach-rockchip/rk3128-board.c @@ -114,12 +114,9 @@ int board_usb_cleanup(int index, enum usb_init_type init) #if CONFIG_IS_ENABLED(FASTBOOT) int fastboot_set_reboot_flag(void) { - struct rk3128_grf *grf; - printf("Setting reboot to fastboot flag ...\n"); - grf = syscon_get_first_range(ROCKCHIP_SYSCON_GRF); /* Set boot mode to fastboot */ - writel(BOOT_FASTBOOT, &grf->os_reg[0]); + writel(BOOT_FASTBOOT, CONFIG_ROCKCHIP_BOOT_MODE_REG); return 0; } From patchwork Wed Nov 28 02:04:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kever Yang X-Patchwork-Id: 1004149 X-Patchwork-Delegate: ykai007@gmail.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; dmarc=none (p=none dis=none) header.from=rock-chips.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="T7uuuLj6"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 434P9w2FHcz9s4s for ; Wed, 28 Nov 2018 13:05:08 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id F2755C220AF; Wed, 28 Nov 2018 02:04:41 +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 19D34C2212E; Wed, 28 Nov 2018 02:04:31 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 7A89AC2218E; Wed, 28 Nov 2018 02:04:25 +0000 (UTC) Received: from mail-pl1-f193.google.com (mail-pl1-f193.google.com [209.85.214.193]) by lists.denx.de (Postfix) with ESMTPS id 5E735C21F77 for ; Wed, 28 Nov 2018 02:04:22 +0000 (UTC) Received: by mail-pl1-f193.google.com with SMTP id 101so10272762pld.6 for ; Tue, 27 Nov 2018 18:04:22 -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=+gIMfX8waZ8PFEbqxBfpm3lySD8xjg5yPp0dZHxRxuA=; b=T7uuuLj68yqCVnVWf5PpvUiy/zTZL+uceijhEuRVMe7xoKp5OsxMdLz8sh8RO9YU+b hx2soaYjkuScB/ZzyNpu6MovrZ6bGIeU+zeFaACHME1zWaeSl02uKa7yHgHors4Xg7bF nxwOKMSl2+fgWjeqIkVcSdrLLuNvGHDkL4g4fXBkLXlDDEWItmPZ38auhUluEUrWkh6O bavfn5L/wu+qafuDuFm1hb8SAf9R7GvW5XxtMs7YK7xgWCAcOCDm25oqNPccyZJNwSQu FNNIX22uug+MijIxXF3ZayEZqSOVy+lL2Oqk7xV+P6mQsUUXrNaEu0EHXVysgDU+6Eqm RD7w== 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=+gIMfX8waZ8PFEbqxBfpm3lySD8xjg5yPp0dZHxRxuA=; b=G05xvIRn5SmQp4xq3c0anRQWXThw+MEEXKfuNr0nGruGwO9WAR6aRgdDVXGUEOzdxW HnahUgy3I/p7A7GrEZt0NTJNsz38BeJ+HjQQ4z2s/H411NRC6jY4wM1o98aQTYvgGp1q V8nzBZ5siFQTLdA7gO8+tDLicf7rmvZIPMlTkPlqux4MsglBTstk46toh20kMDuxckyy FSarH8H7nUWXM6rp1WNXss5DePScRmdoyUx4YEkvaj4DjNTpnowDk/bq1Z5z1R7ANClC dikP+zNlxDai0X5vVQ0oYFhgIVNfnVFZnV8/mq3LHH/24VFPyTG5y7i8mIm1rgWl7jRQ 6BoA== X-Gm-Message-State: AA+aEWZcuhk2V7zA/eVDF22RsYMHyKD6H03npz/dEmRWzeJRmX4z1hoa JmmnJjMxPx6Xj42Ks+T+G2PXmAdL X-Google-Smtp-Source: AFSGD/VZmzCT0JbxYvdX9zhJkbY73l0B+BoI7XKVp/pjBXeW44SVixhNmBZj5ZY37kOK7r0oMmx0mg== X-Received: by 2002:a17:902:e012:: with SMTP id ca18mr34970468plb.218.1543370660583; Tue, 27 Nov 2018 18:04:20 -0800 (PST) Received: from localhost.localdomain ([103.29.142.67]) by smtp.gmail.com with ESMTPSA id l5-v6sm6272512pfl.73.2018.11.27.18.04.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 27 Nov 2018 18:04:19 -0800 (PST) From: Kever Yang To: u-boot@lists.denx.de Date: Wed, 28 Nov 2018 10:04:06 +0800 Message-Id: <20181128020406.17577-2-kever.yang@rock-chips.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20181128020406.17577-1-kever.yang@rock-chips.com> References: <20181128020406.17577-1-kever.yang@rock-chips.com> Subject: [U-Boot] [RESENT PATCH 2/2] rockchip: rk322x: use ROCKCHIP_BOOT_MODE_REG to update reboot flag 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 ROCKCHIP_BOOT_MODE_REG instead of grf structure so that we can re-use the source code later. Signed-off-by: Kever Yang --- arch/arm/mach-rockchip/rk322x-board.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/arch/arm/mach-rockchip/rk322x-board.c b/arch/arm/mach-rockchip/rk322x-board.c index 7366d45ab6..61863d7424 100644 --- a/arch/arm/mach-rockchip/rk322x-board.c +++ b/arch/arm/mach-rockchip/rk322x-board.c @@ -142,12 +142,9 @@ int board_usb_cleanup(int index, enum usb_init_type init) #if CONFIG_IS_ENABLED(FASTBOOT) int fastboot_set_reboot_flag(void) { - struct rk322x_grf *grf; - printf("Setting reboot to fastboot flag ...\n"); - grf = syscon_get_first_range(ROCKCHIP_SYSCON_GRF); /* Set boot mode to fastboot */ - writel(BOOT_FASTBOOT, &grf->os_reg[0]); + writel(BOOT_FASTBOOT, CONFIG_ROCKCHIP_BOOT_MODE_REG); return 0; }