From patchwork Tue Dec 1 16:05:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 1408908 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.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.a=rsa-sha256 header.s=20150623 header.b=maEVsX6L; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Cln4q5h50z9sRK for ; Wed, 2 Dec 2020 03:05:31 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 85CE0826CA; Tue, 1 Dec 2020 17:05:24 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=xilinx.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; 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="maEVsX6L"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B2715826AB; Tue, 1 Dec 2020 17:05:22 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-ed1-x542.google.com (mail-ed1-x542.google.com [IPv6:2a00:1450:4864:20::542]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id C021E826AB for ; Tue, 1 Dec 2020 17:05:19 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=xilinx.com Authentication-Results: phobos.denx.de; spf=none smtp.mailfrom=monstr@monstr.eu Received: by mail-ed1-x542.google.com with SMTP id d18so4005647edt.7 for ; Tue, 01 Dec 2020 08:05:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monstr-eu.20150623.gappssmtp.com; s=20150623; h=sender:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=kFuLHC4pCdBaJ3ze4zO7NUBMQOeGs37A0Q6fJ8D1aFQ=; b=maEVsX6LNM5lvtDCosp4xfW7yAVtNG5YYzr2pkztSIK1ZO565IXa1Ky8WybHCwcec2 Udx1dfmLdFTYQot0iDKJ2ZYXYFCMIuoWJXfKouKKPndfDdRGBFWfOmZVmZSjtQIfD74A hY3Cbs00yzokrhtLk2rQHmYazXEDQJ+YzoSzSkehNmZHmAX5D05kAFL2ETmepaz3IP92 +ywDzcF3Azpf3ENV155TiIehmsHKroJoiTu26EGaUbOt0yO6i5x5yuIQqAu3wro+ufFp m8u7N2ezCOgIaIYKwz6S4vhJC9stuNXLO3+wicDtH5Q7AT3zhVONYdvgpW+DMkpsW4Kg zJOA== 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 :mime-version:content-transfer-encoding; bh=kFuLHC4pCdBaJ3ze4zO7NUBMQOeGs37A0Q6fJ8D1aFQ=; b=hQBFNY/MzvxcbnK1MB0e48004WCwZZGuyqXpKpN1r+Hb53nMV9PTyB3LREo7Wo8jns Qw0MDYK8Pwr3zfhiV1T66TeMov9KWkz514BTJKMzGhwDoZs/zSxoNRv7XEo5Po7b3DUB pwCOfqdzEVNEsQhZoFckuhI759b75C9azfT2m6OwXpeM3pwfB0DSN6jR1QGMkVM0YPyF CIPj0S1dbazu0Ey+XQvvyI4n+Us+dKQNzvMquT/aRtYYJnIZc2xKg+2WQ5qsmC0UJ1Jq Ybe36OJb0IejTSvWvaudaWT2XfLdCxzWzLnqiuIHjB+/12cuAB/snS+xOprELmGsinBk 256w== X-Gm-Message-State: AOAM532Unfzh2FHZv3vZJmVGXqex2ZmKu93x1zstdWEFGRJv+roLlmdu SwDBhW9X42adT5HXR6Eekn81+0kIvAJwC72E X-Google-Smtp-Source: ABdhPJz2+FiW7nz6b7DoBysc9YwgCPuYWYQeCgsNVqoCwavWiBYx0L8JhH5wckRctRbk9/POgAaVNA== X-Received: by 2002:a05:6402:a51:: with SMTP id bt17mr3731207edb.328.1606838719106; Tue, 01 Dec 2020 08:05:19 -0800 (PST) Received: from localhost (nat-35.starnet.cz. [178.255.168.35]) by smtp.gmail.com with ESMTPSA id s6sm76518ejb.122.2020.12.01.08.05.18 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 01 Dec 2020 08:05:18 -0800 (PST) From: Michal Simek To: u-boot@lists.denx.de, git@xilinx.com Cc: Ashok Reddy Soma , Daniel Schwierzeck , Heinrich Schuchardt , Jisheng Zhang , Nava kishore Manne , Rob Herring , Robert Richter , Simon Glass , Wei Xu Subject: [PATCH v2 1/2] cmd: load: Fix code indentation Date: Tue, 1 Dec 2020 17:05:16 +0100 Message-Id: <61881e257b3a508c62766428373bca1214fa1c25.1606838715.git.michal.simek@xilinx.com> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean Reported by smatch like: cmd/load.c:228 read_record() warn: inconsistent indenting Signed-off-by: Michal Simek --- Changes in v2: - One } was missing. Get it back. arch/arm/dts/zynqmp.dtsi | 48 ++++++++-------------------------------- cmd/load.c | 9 ++++---- 2 files changed, 13 insertions(+), 44 deletions(-) diff --git a/arch/arm/dts/zynqmp.dtsi b/arch/arm/dts/zynqmp.dtsi index 1634af0bd896..d5840ab8737e 100644 --- a/arch/arm/dts/zynqmp.dtsi +++ b/arch/arm/dts/zynqmp.dtsi @@ -672,6 +672,15 @@ power-domains = <&zynqmp_firmware PD_QSPI>; }; + psgtr: phy@fd400000 { + compatible = "xlnx,zynqmp-psgtr-v1.1"; + status = "disabled"; + reg = <0x0 0xfd400000 0x0 0x40000>, + <0x0 0xfd3d0000 0x0 0x1000>; + reg-names = "serdes", "siou"; + #phy-cells = <4>; + }; + rtc: rtc@ffa60000 { compatible = "xlnx,zynqmp-rtc"; status = "disabled"; @@ -682,45 +691,6 @@ calibration = <0x8000>; }; - serdes: zynqmp_phy@fd400000 { - compatible = "xlnx,zynqmp-psgtr"; - status = "disabled"; - reg = <0x0 0xfd400000 0x0 0x40000>, - <0x0 0xfd3d0000 0x0 0x1000>, - <0x0 0xff5e0000 0x0 0x1000>; - reg-names = "serdes", "siou", "lpd"; - nvmem-cells = <&soc_revision>; - nvmem-cell-names = "soc_revision"; - resets = <&zynqmp_reset ZYNQMP_RESET_SATA>, - <&zynqmp_reset ZYNQMP_RESET_USB0_CORERESET>, - <&zynqmp_reset ZYNQMP_RESET_USB1_CORERESET>, - <&zynqmp_reset ZYNQMP_RESET_USB0_HIBERRESET>, - <&zynqmp_reset ZYNQMP_RESET_USB1_HIBERRESET>, - <&zynqmp_reset ZYNQMP_RESET_USB0_APB>, - <&zynqmp_reset ZYNQMP_RESET_USB1_APB>, - <&zynqmp_reset ZYNQMP_RESET_DP>, - <&zynqmp_reset ZYNQMP_RESET_GEM0>, - <&zynqmp_reset ZYNQMP_RESET_GEM1>, - <&zynqmp_reset ZYNQMP_RESET_GEM2>, - <&zynqmp_reset ZYNQMP_RESET_GEM3>; - reset-names = "sata_rst", "usb0_crst", "usb1_crst", - "usb0_hibrst", "usb1_hibrst", "usb0_apbrst", - "usb1_apbrst", "dp_rst", "gem0_rst", - "gem1_rst", "gem2_rst", "gem3_rst"; - lane0: lane0 { - #phy-cells = <4>; - }; - lane1: lane1 { - #phy-cells = <4>; - }; - lane2: lane2 { - #phy-cells = <4>; - }; - lane3: lane3 { - #phy-cells = <4>; - }; - }; - sata: ahci@fd0c0000 { compatible = "ceva,ahci-1v84"; status = "disabled"; diff --git a/cmd/load.c b/cmd/load.c index 9a3a16979c71..c6a7cc465153 100644 --- a/cmd/load.c +++ b/cmd/load.c @@ -228,12 +228,11 @@ static int read_record(char *buf, ulong len) *p = c; } - /* Check for the console hangup (if any different from serial) */ - if (gd->jt->getc != getchar) { - if (ctrlc()) { - return (-1); + /* Check for the console hangup (if any different from serial) */ + if (gd->jt->getc != getchar) { + if (ctrlc()) + return (-1); } - } } /* line too long - truncate */ From patchwork Tue Dec 1 16:05:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 1408909 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.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.a=rsa-sha256 header.s=20150623 header.b=I8foklNb; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Cln545tkGz9sRK for ; Wed, 2 Dec 2020 03:05:44 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 36EEA827DE; Tue, 1 Dec 2020 17:05:28 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=xilinx.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; 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="I8foklNb"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id EE1C3826DA; Tue, 1 Dec 2020 17:05:23 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-ej1-x641.google.com (mail-ej1-x641.google.com [IPv6:2a00:1450:4864:20::641]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 74324826CA for ; Tue, 1 Dec 2020 17:05:21 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=xilinx.com Authentication-Results: phobos.denx.de; spf=none smtp.mailfrom=monstr@monstr.eu Received: by mail-ej1-x641.google.com with SMTP id 7so5240906ejm.0 for ; Tue, 01 Dec 2020 08:05:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monstr-eu.20150623.gappssmtp.com; s=20150623; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=hmgiDfhEz4PMAbG5ZbL29VAuaMCFk8bZMvNRvdgZ+Z0=; b=I8foklNbhrzqDOkoXtUP0RpUH6LTzGbruVlpzLniu0UJDPB1vDz46wAL9sOnVgd970 tvhLop2mXlmDnBWDevcSA16sopFMI7/ez69fI+BUE1H0l9JA6YY9r46RH2uPZQrFY3dP ObopTKsY08jt0vGmzTfDe3bmaxEGQaNCju51YFFcesd7IZ9l5E0VkEN2z81vK6ZdjvU8 4p2PYH0CSKIt431Ccxnc0a7xLlIVOh6Tro9UA047kxNPYLE4qjbYbbo8hShaO04nHXz3 rMx2+ZuKM6lgkY7OR4Ji/hxciTP9i+I7OaxTmtgQmhx9e/o3J03+pY7erU0nzAIbrR0d o7Hg== 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:mime-version:content-transfer-encoding; bh=hmgiDfhEz4PMAbG5ZbL29VAuaMCFk8bZMvNRvdgZ+Z0=; b=NBM7kXg0mky+ydMpPLfXrl9CBZsDrMn4nI3+L8Fc7RBaiU9vDA+c/0RTEPYNxbTGfR lku7k3EfIcC7OgcgoCkOe+SKGZytPffEmP9WsdKqq/lnytYGKFQJgUrEtuAos4fWjeE3 ohzT+4kzgSvOvDd1MszbUCEVTZQP60RAirtqRQowAZqLt56g9zLUX0jjZGCzXqF9wPqZ O6FbgvVWAnn5mmh1ntSlHtgjACbkF+snFK2Sx3e9Cb/CGCQ9xSNGHDkP1un8bDCXt+xS qx6YlnZkiUIU/xEN/J3hzy+v6QJBSB2Zz7Bc3EeBTkETLCKjmeap5O0iCp31nFE4wbgh sYpQ== X-Gm-Message-State: AOAM532pDvhY1c6uHH2+Y2q4ZIT2APCIFylydK0XDcvPDWoWS+fX08/e YjUTj3AfpD5qAVh5LkQX2fX0M1vC4aAFCwsf X-Google-Smtp-Source: ABdhPJx7n/MEa9KcE127lQJWLqK8s0Holad+Sa8A1r/WhtJM8fLWWjNX+8TnambZsVkiY6pH4tDRxw== X-Received: by 2002:a17:906:b0c5:: with SMTP id bk5mr3701768ejb.217.1606838720903; Tue, 01 Dec 2020 08:05:20 -0800 (PST) Received: from localhost (nat-35.starnet.cz. [178.255.168.35]) by smtp.gmail.com with ESMTPSA id z22sm79604eji.91.2020.12.01.08.05.20 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 01 Dec 2020 08:05:20 -0800 (PST) From: Michal Simek To: u-boot@lists.denx.de, git@xilinx.com Cc: Lukasz Majewski Subject: [PATCH v2 2/2] common: usb_storage: Fix code indentation Date: Tue, 1 Dec 2020 17:05:17 +0100 Message-Id: X-Mailer: git-send-email 2.29.2 In-Reply-To: <61881e257b3a508c62766428373bca1214fa1c25.1606838715.git.michal.simek@xilinx.com> References: <61881e257b3a508c62766428373bca1214fa1c25.1606838715.git.michal.simek@xilinx.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean Reported by smatch like: common/usb_storage.c:430 us_one_transfer() warn: inconsistent indenting Signed-off-by: Michal Simek --- (no changes since v1) common/usb_storage.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/usb_storage.c b/common/usb_storage.c index ff254419951f..7742bad1440d 100644 --- a/common/usb_storage.c +++ b/common/usb_storage.c @@ -431,8 +431,8 @@ static int us_one_transfer(struct us_data *us, int pipe, char *buf, int length) return 0; } /* if our try counter reaches 0, bail out */ - debug(" %ld, data %d\n", - us->pusb_dev->status, partial); + debug(" %ld, data %d\n", + us->pusb_dev->status, partial); if (!maxtry--) return result; }