From patchwork Mon Jan 28 12:38:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 1031893 X-Patchwork-Delegate: monstr@monstr.eu 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=xilinx.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=monstr-eu.20150623.gappssmtp.com header.i=@monstr-eu.20150623.gappssmtp.com header.b="yLANLoI4"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43p8Lp2kHWz9s3q for ; Mon, 28 Jan 2019 23:38:42 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id E60B9C21E6A; Mon, 28 Jan 2019 12:38:37 +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 CC5C4C21D8E; Mon, 28 Jan 2019 12:38:35 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id E61A3C21D8E; Mon, 28 Jan 2019 12:38:33 +0000 (UTC) Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by lists.denx.de (Postfix) with ESMTPS id 947E9C21BE5 for ; Mon, 28 Jan 2019 12:38:33 +0000 (UTC) Received: by mail-wr1-f65.google.com with SMTP id u4so17875477wrp.3 for ; Mon, 28 Jan 2019 04:38:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monstr-eu.20150623.gappssmtp.com; s=20150623; h=sender:from:to:subject:date:message-id; bh=dRA2sPBtKOfiasrq9Ba13/ZsFEWJBFGYGo+KfF5LhvI=; b=yLANLoI4+q2l16OuxNFYVKxg9U2hHWUqw9yJb2E5Zsb8zc+fYi3fsgopiWwKo7h0Vk D4quETJJ+rTagRCBQ/RDQ3MtWRYNe/oFZ9qZl174sdslBfFCV2Lz68ecmdbkAEWxM8Z8 rcPAON7501g2MlCKuz1BWNB4onav/oydof1QdJZGoHVr5/tVlsccmIotmuJ+2fmSbY6l IaMRAfu5l291s3IFrWHT56gly8ImxbOYMsoAsX57bAM7070udU/oClUdYNJYTBzyK5Jo GNKSZV9ePzvzcmqTYpX3xTvqiOnftEmQM2FJiBMQOy3EvLKJ0/ybNOJy9XIErNQi/ZnS hFYA== 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:subject:date:message-id; bh=dRA2sPBtKOfiasrq9Ba13/ZsFEWJBFGYGo+KfF5LhvI=; b=XhX9D6SNCURkq2BJcTMTzNOlxLJWXBEi8hWmqO9Al5ANu9aGaXkcxoXGkR0anDL7yR yCksN7oWCrO8NK5g60GyuNsujPoSSKGdPnb+AhQPERW5iaDFr0DnvJAlusowCXGdnfqy Pvo+KPI2uqL7ha+siC1BGqD+U5CK+D6lFGSmHlNtGPPbAAkXEg4cQIx7kEGHfBlzH++Y QdSjjNlgLyqVDDC+7kMmQzViHICb8boa9w5Q6L7b+fxMvll4Kq2MBzlNt6eOdz5IcsmV Ewmzq1G1PWCkmIebNq8eFAMaaNO/eCfSm6sMYtEDcITfPcJ1Ktg7/UNRgYlMmA9FGO6B NS/g== X-Gm-Message-State: AJcUukcdZdHS6Ri9FtFq+Fpjy0cynlkFtTQugoVm8VLUyiUTGglcUpy2 WBp9UxEetvw5NbHo3a+UgnKu5DwI30VWtQ== X-Google-Smtp-Source: ALg8bN6WjTpiWH1kS8Y+VexBNylcqqRfE2F5j2Dlbxpmi4ziZP1zxVE3rpiO64yCLHWsV08KVHIx/g== X-Received: by 2002:adf:a4d9:: with SMTP id h25mr20443817wrb.167.1548679112851; Mon, 28 Jan 2019 04:38:32 -0800 (PST) Received: from localhost (nat-35.starnet.cz. [178.255.168.35]) by smtp.gmail.com with ESMTPSA id 200sm78982334wmw.31.2019.01.28.04.38.31 for (version=TLS1_2 cipher=AES128-SHA bits=128/128); Mon, 28 Jan 2019 04:38:32 -0800 (PST) From: Michal Simek To: u-boot@lists.denx.de Date: Mon, 28 Jan 2019 13:38:31 +0100 Message-Id: <2084200353778fdb1bed0d95d21ff82f52087f3c.1548679109.git.michal.simek@xilinx.com> X-Mailer: git-send-email 1.9.1 Subject: [U-Boot] [PATCH] arm64: versal: Remove one level of indentation in board_early_init_r() 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" Simplify code indentation. Signed-off-by: Michal Simek --- board/xilinx/versal/board.c | 73 +++++++++++++++++++++++---------------------- 1 file changed, 37 insertions(+), 36 deletions(-) diff --git a/board/xilinx/versal/board.c b/board/xilinx/versal/board.c index 2b3a40b73a5f..fe61125d92a8 100644 --- a/board/xilinx/versal/board.c +++ b/board/xilinx/versal/board.c @@ -21,42 +21,43 @@ int board_init(void) int board_early_init_r(void) { - if (current_el() == 3) { - u32 val; - - writel(IOU_SWITCH_CTRL_CLKACT_BIT | - (0x20 << IOU_SWITCH_CTRL_DIVISOR0_SHIFT), - &crlapb_base->iou_switch_ctrl); - - /* Global timer init - Program time stamp reference clk */ - val = readl(&crlapb_base->timestamp_ref_ctrl); - val |= CRL_APB_TIMESTAMP_REF_CTRL_CLKACT_BIT; - writel(val, &crlapb_base->timestamp_ref_ctrl); - - debug("ref ctrl 0x%x\n", - readl(&crlapb_base->timestamp_ref_ctrl)); - - /* Clear reset of timestamp reg */ - writel(0, &crlapb_base->rst_timestamp); - - /* - * Program freq register in System counter and - * enable system counter. - */ - writel(COUNTER_FREQUENCY, - &iou_scntr_secure->base_frequency_id_register); - - debug("counter val 0x%x\n", - readl(&iou_scntr_secure->base_frequency_id_register)); - - writel(IOU_SCNTRS_CONTROL_EN, - &iou_scntr_secure->counter_control_register); - - debug("scntrs control 0x%x\n", - readl(&iou_scntr_secure->counter_control_register)); - debug("timer 0x%llx\n", get_ticks()); - debug("timer 0x%llx\n", get_ticks()); - } + u32 val; + + if (current_el() != 3) + return 0; + + writel(IOU_SWITCH_CTRL_CLKACT_BIT | + (0x20 << IOU_SWITCH_CTRL_DIVISOR0_SHIFT), + &crlapb_base->iou_switch_ctrl); + + /* Global timer init - Program time stamp reference clk */ + val = readl(&crlapb_base->timestamp_ref_ctrl); + val |= CRL_APB_TIMESTAMP_REF_CTRL_CLKACT_BIT; + writel(val, &crlapb_base->timestamp_ref_ctrl); + + debug("ref ctrl 0x%x\n", + readl(&crlapb_base->timestamp_ref_ctrl)); + + /* Clear reset of timestamp reg */ + writel(0, &crlapb_base->rst_timestamp); + + /* + * Program freq register in System counter and + * enable system counter. + */ + writel(COUNTER_FREQUENCY, + &iou_scntr_secure->base_frequency_id_register); + + debug("counter val 0x%x\n", + readl(&iou_scntr_secure->base_frequency_id_register)); + + writel(IOU_SCNTRS_CONTROL_EN, + &iou_scntr_secure->counter_control_register); + + debug("scntrs control 0x%x\n", + readl(&iou_scntr_secure->counter_control_register)); + debug("timer 0x%llx\n", get_ticks()); + debug("timer 0x%llx\n", get_ticks()); return 0; }