Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.3 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,INCLUDES_PULL_REQUEST, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D580CC432BE for ; Fri, 27 Aug 2021 11:00:38 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E7979604AC for ; Fri, 27 Aug 2021 11:00:37 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org E7979604AC Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=xilinx.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id EFD3C832B0; Fri, 27 Aug 2021 13:00:35 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=fail (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=pass (1024-bit key; unprotected) header.d=xilinx.onmicrosoft.com header.i=@xilinx.onmicrosoft.com header.b="TLEAR1Wh"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C6CEC832A1; Fri, 27 Aug 2021 13:00:27 +0200 (CEST) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on20619.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe5a::619]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 07D3A832A3 for ; Fri, 27 Aug 2021 13:00:17 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=xilinx.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=michals@xilinx.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Y6VLCumimpSadCA4TfFYrtkkxWxNIXJs5AD2XIIv/W9e0nawbP2yd8s67Ahlnzrqba+GrN92MH3ssFHpitLiRUSp0BkBHbPaxACz8WgyvXA+ghL9gv8Kli/xfYZFJQT0b7YmOvU66amCkg6llWHbpK8AnZ/6PRoTH41Ef4Wlbsc2FGqW7YoTuZe8nKBPVf8/iyW99YhUZCI/OQAWoIPqfljQYnEp0DhZvdazpunsaqzG/DpTNZSMOqdn53xtonkFa4L0WQB8rYpYyrh7fRWdMAO9in9B4QhU1o6DpIcTldAVzHKI9xLPjcbQxd45E4wqWOzeiM4fwHd8BpOqS3vDng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ztaAbGMRCPkinsnNUqFwE+aGVc9JQ1FtgaG8ZqKmr5s=; b=cDuzi6slpbGp6peA4ymmZQDl5cCgCp6UYNK3R2/Ydpv7Y0cm76s0txkY34AW7rYmz+ROLEa+oeDSmtMv8r+3oQpG1g6GCkGBjvowv4SKWmIE9Fh8HAvCSyPzUv9VGkqF18ymWycZAGfl3WR6E1OenxKe0XkHOoccrLCb0HyCB3YHKRrugBkRKZGxVftzDrTrgTKn9mIY6OQo9FqCXygIfP1G7db5O813YC1YK3EPYN7zNr3ZtZ5JnEjZX1bp4EEhvtK/5yVza9H9UsvZYy1u/DadwcB9gF2il2CFPXudHhAjmcB502GPEJsP14wpKG7JXdf5q4CV7dKowb3x9ei2Kw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 149.199.62.198) smtp.rcpttodomain=lists.denx.de smtp.mailfrom=xilinx.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=xilinx.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=xilinx.onmicrosoft.com; s=selector2-xilinx-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ztaAbGMRCPkinsnNUqFwE+aGVc9JQ1FtgaG8ZqKmr5s=; b=TLEAR1WhhC+ahmoSNtU+ScmQi7QIxfPhmtw1a7OTraubR/QTkoXaKXDJg9ggQUyvV9oqUXH7661isxrSnv27v6dqpfF5aTPoy3CraX/5f+ma1Hv2GUunXrWGJU5jl0q95VBjXJrP5EI7xfX2hGFYpyaw4y5y3DGv8XxgRl61N0U= Received: from SN7PR04CA0235.namprd04.prod.outlook.com (2603:10b6:806:127::30) by SA0PR02MB7307.namprd02.prod.outlook.com (2603:10b6:806:eb::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4457.17; Fri, 27 Aug 2021 11:00:13 +0000 Received: from SN1NAM02FT0045.eop-nam02.prod.protection.outlook.com (2603:10b6:806:127:cafe::dd) by SN7PR04CA0235.outlook.office365.com (2603:10b6:806:127::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4457.20 via Frontend Transport; Fri, 27 Aug 2021 11:00:13 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 149.199.62.198) smtp.mailfrom=xilinx.com; lists.denx.de; dkim=none (message not signed) header.d=none;lists.denx.de; dmarc=pass action=none header.from=xilinx.com; Received-SPF: Pass (protection.outlook.com: domain of xilinx.com designates 149.199.62.198 as permitted sender) receiver=protection.outlook.com; client-ip=149.199.62.198; helo=xsj-pvapexch02.xlnx.xilinx.com; Received: from xsj-pvapexch02.xlnx.xilinx.com (149.199.62.198) by SN1NAM02FT0045.mail.protection.outlook.com (10.97.5.234) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4457.17 via Frontend Transport; Fri, 27 Aug 2021 11:00:12 +0000 Received: from xsj-pvapexch02.xlnx.xilinx.com (172.19.86.41) by xsj-pvapexch02.xlnx.xilinx.com (172.19.86.41) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.14; Fri, 27 Aug 2021 04:00:11 -0700 Received: from smtp.xilinx.com (172.19.127.96) by xsj-pvapexch02.xlnx.xilinx.com (172.19.86.41) with Microsoft SMTP Server id 15.1.2176.14 via Frontend Transport; Fri, 27 Aug 2021 04:00:11 -0700 Envelope-to: u-boot@lists.denx.de, trini@konsulko.com Received: from [172.30.17.109] (port=44472) by smtp.xilinx.com with esmtp (Exim 4.90) (envelope-from ) id 1mJZal-000FGS-7A; Fri, 27 Aug 2021 04:00:11 -0700 To: Tom Rini CC: U-Boot Mailing List From: Michal Simek Subject: [GIT PULL] xilinx patches for v2021.10-rc3 Message-ID: <3e8329e5-80b1-e2fe-6fd1-3e4b2ee19719@xilinx.com> Date: Fri, 27 Aug 2021 13:00:09 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.13.0 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Language: en-US Content-Transfer-Encoding: 7bit X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b9e250c9-bb71-4b71-713c-08d96949d812 X-MS-TrafficTypeDiagnostic: SA0PR02MB7307: X-Microsoft-Antispam-PRVS: X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-MS-Oob-TLC-OOBClassifiers: OLM:10000; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: RWmOc6Tt0b/81jH4vuBNWqACbZ2q0f75qLrRJcFH73O2Dhs59N9bnljMfRvvIj1cMf+pRmTIZ1U6QJOzTkKNmGck5+TZtBBMlcCz1zA9LbHXe+xPL9ByvJ0mingLYKPv2nmtg79KVQG06UECMQDMQu2LMQ1mFU54y8GyWwWtlZTrC5AdYqNR3QDpPCJ+m8u0JNpirgT6FkYbCr7OuZ7W+yjIBXXT6DyZttK6E1pv53dJsTL7bN3jikorHil5CClypx9ZIhRd7B2GQsCRjHfSNKvbF/iRSUzExdetX8HTNHa2+o8yb/dxd1meEv0L8pADoun06XXSpNdYK2HLDcgO+/EeB9/doxhGFlIe7SnNIRiTXyUQgRZGUkyjnC3PSiCspuz5ZM+mmx3F0xDfjDRsnWjP3tmXsARDAceeCOiywFgdf46yTxl1sj2PsgxrLmCFiP7cLNRDGKALTTBxd+vMykZVOx7L/qZ5gYADRF0I18YzNKE1pkqjarnPW0vsiVCv+dEHki8Q+JGq9hrZLRsj5r4jWirLMzitAU9QHw/N32u9+g0S0BQ1N/teQUlPIJDbVW1zMKluiwNzHM/t0qqt2CD2qqyT1kzgAo8MTGIi08PUU6ig5ZLgoW4uLLBnOddN7Y6dKXNiM8vi+ZgdmEhvL/I8FEr+serlYl1J0wNp2TlywwWQWe2NbQRZ3ExFscMQ4JsEkuqMNVItF9m7V8P516WR1UM5lBWD8xY/or0twsjtQE/iASDELBeSTYC0ZaGNeL9hlstj1ZuawG0yg37NOMOKiODAhjnayIXS/cQxRvAu9SATK1djhZSgsnJ90IvW X-Forefront-Antispam-Report: CIP:149.199.62.198; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:xsj-pvapexch02.xlnx.xilinx.com; PTR:unknown-62-198.xilinx.com; CAT:NONE; SFS:(4636009)(39860400002)(346002)(136003)(396003)(376002)(46966006)(36840700001)(6916009)(31696002)(4326008)(356005)(478600001)(2906002)(36860700001)(426003)(44832011)(82310400003)(2616005)(8676002)(8936002)(316002)(70586007)(83380400001)(336012)(70206006)(5660300002)(36756003)(9786002)(36906005)(31686004)(186003)(7636003)(82740400003)(26005)(47076005)(50156003)(43740500002)(473944003)(414714003); DIR:OUT; SFP:1101; X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Aug 2021 11:00:12.7452 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b9e250c9-bb71-4b71-713c-08d96949d812 X-MS-Exchange-CrossTenant-Id: 657af505-d5df-48d0-8300-c31994686c5c X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=657af505-d5df-48d0-8300-c31994686c5c; Ip=[149.199.62.198]; Helo=[xsj-pvapexch02.xlnx.xilinx.com] X-MS-Exchange-CrossTenant-AuthSource: SN1NAM02FT0045.eop-nam02.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA0PR02MB7307 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.103.2 at phobos.denx.de X-Virus-Status: Clean Hi Tom, please pull these patches to your tree. Gitlab CI is not showing any issue and I have also tested qspi/sd flows on zynq and zynqmp boards. There are a lot of fixes and alignments with also some features like rtc/soc drivers and correcting capsule update. Code for multi_fit is also added but not enabled by default. SPI driver needs to be fixed. Patches have been sent today. I will take care about them soon. Thanks, Michal The following changes since commit ab97eb341cb4fdbd69e33bd4a53714db95b5b63e: Merge branch '2021-08-04-assorted-minor-fixes' (2021-08-04 21:18:33 -0400) are available in the Git repository at: git@source.denx.de:u-boot/custodians/u-boot-microblaze.git tags/xilinx-for-v2021.10-rc3 for you to fetch changes up to 229cb5c6ba3469cbc4a0bcc69389fe61c51fd3b4: xilinx: zynqmp: Enable stack relocation to DDR (2021-08-26 08:14:43 +0200) ---------------------------------------------------------------- Xilinx changes for v2021.10-rc3 xilinx: - Disable CONFIG_ARCH_FIXUP_FDT_MEMORY - Print information about cpu via soc drivers and enable DISPLAY_CPUINFO - Wire infrastructure for DTB_RESELECT and MULTI_DTB_FIT zynq: - Wire single QSPI - Use power-source instead of io-standard properties - Enable nor on zc770-xm012 zynqmp: - Change handling around multi_boot() - Setup offset for u-boot.itb in spi - Generate run time dfu_alt_info for capsule update - Use explicit values for enums (zynqmp_firmware.h) - Enable RTC/SHA1/BUTTON/BUTTON_GPIO command - Disable WDT driver by default - Bind usb/scsi via preboot because of EFI - DT updates/fixes - Add soc driver - Fix SPL SPI boot mode versal: - Add soc driver sdhci: - Update tap delay programming for zynq_sdhci driver cmd: - Fix RTC uclass handling in date command - Update pwm help message - Update reset help message watchdog: - Fix wwdt compilation rtc: - Deal with seq alias in rtc uclass - Add zynqmp RTC driver fdt: - Add kernel-doc for fdt_fixup_memory_banks() ---------------------------------------------------------------- Ashok Reddy Soma (6): mmc: zynq_sdhci: Return errors from arasan_sdhci_set_tapdelay mmc: sdhci: Change prototype of set_delay to return errors mmc: zynq_sdhci: Add xilinx_pm_request() method to set tapdelays mmc: zynq_sdhci: Move setting tapdelay code to driver mmc: zynq_sdhci: Use set_control_reg from sdhci.c watchdog: versal: Include header file needed for dev_ functions Michal Simek (37): xilinx: zynqmp: Free allocated field for target variable xilinx: zynqmp: Change multi_boot() to return value xilinx: zynqmp: use zynqmp_mmio_read() in multi_boot() xilinx: zynqmp: Config non zero SYS_SPI_U_BOOT_OFFS xilinx: zynqmp: Add support for runtime dfu_alt_info setup firmware: xilinx: Use explicit values for all enum values dm: rtc: uclass: Add flag to control sequence numbering cmd: date: rtc: Update command to read the first RTC with seq 0 rtc: zynqmp: Add support for ZynqMP RTC xilinx: zynqmp: Enable CMD_RTC command with Zynqmp RTC driver reset: zynqmp: Add reset controller for ZynqMP SoC arm64: zynqmp: Disable WDT_CDNS driver by default xilinx: zynqmp: Initialize usb and scsi via preboot arm64: zynqmp: Fix node name for ds35/36 leds arm64: zynqmp: Fix header alignment on kv260 boards arm64: zynqmp: Update comment style sm-k26 ARM: zynq: Wire single qspi on couple of boards ARM: zynq: Enable smcc and nor for zc770-xm012 xilinx: Disable ARCH_FIXUP_FDT_MEMORY fdt_support: Add kernel-doc for fdt_fixup_memory_banks() cmd: pwm: Remove additional pwm description cmd: boot: Update reset usage message xilinx: zynqmp: Add debug messages for boot mode arm64: zynqmp: Enable sha1sum command xilinx: zynqmp: Enable gpio-key/button driver xilinx: fru: Replace spaces with \0 in detected name xilinx: Use variable for passing board_name xilinx: common: Change board_info[] handling xilinx: common: Free allocated structure xilinx: Add support for generic board detection xilinx: zynqmp: Check that DT is 64bit aligned Makefile: Align fit-dtb.blob and u-boot.itb by 64bits arm64: dts: Make sure that all DTBs are 64bit aligned xilinx: zynqmp: Generate different u-boot.itb for MULTI_DTB_FIT xilinx: common: Enabling generic function for DT reselection xilinx: zynqmp: Update descriptions for u-boot.its xilinx: zynqmp: Enable stack relocation to DDR Raju Kumar Pothuraju (1): xilinx: Add jedec compatible string for QSPI (Zynq/ZynqMP) Sai Krishna Potthuri (1): ARM: zynq: Replace 'io-standard' with 'power-source' property T Karthik Reddy (6): zynqmp_firmware: Add zynqmp firmware related enums mmc: zynq_sdhci: Wait till sd card detect state is stable soc: xilinx: zynqmp: Add soc_xilinx_zynqmp driver soc: xilinx: versal: Add soc_xilinx_versal driver xilinx: common: Add function to print SoC info xilinx: Enable config to display cpuinfo MAINTAINERS | 4 +++ Makefile | 3 ++ arch/arm/Kconfig | 2 ++ arch/arm/dts/Makefile | 2 +- arch/arm/dts/zynq-cc108.dts | 2 +- arch/arm/dts/zynq-cse-qspi.dtsi | 2 +- arch/arm/dts/zynq-topic-miami.dts | 2 +- arch/arm/dts/zynq-zc702.dts | 30 ++++++++++------- arch/arm/dts/zynq-zc706.dts | 26 +++++++++------ arch/arm/dts/zynq-zc770-xm010.dts | 8 +++++ arch/arm/dts/zynq-zc770-xm012.dts | 9 ++++++ arch/arm/dts/zynq-zc770-xm013.dts | 8 +++++ arch/arm/dts/zynqmp-sck-kv-g-revA.dts | 8 ++--- arch/arm/dts/zynqmp-sck-kv-g-revB.dts | 8 ++--- arch/arm/dts/zynqmp-sm-k26-revA.dts | 9 ++++-- arch/arm/dts/zynqmp-topic-miamimp-xilinx-xdp-v1r1.dts | 2 +- arch/arm/mach-versal/cpu.c | 5 +++ arch/arm/mach-versal/include/mach/hardware.h | 4 +++ arch/arm/mach-zynqmp/cpu.c | 5 +++ arch/arm/mach-zynqmp/include/mach/hardware.h | 3 ++ arch/arm/mach-zynqmp/mkimage_fit_atf.sh | 51 +++++++++++++++++++++++++++-- board/xilinx/common/board.c | 184 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------- board/xilinx/zynqmp/Makefile | 2 -- board/xilinx/zynqmp/tap_delays.c | 101 --------------------------------------------------------- board/xilinx/zynqmp/zynqmp.c | 74 ++++++++++++++++++++++++++++++++++++++---- cmd/boot.c | 3 +- cmd/date.c | 9 ++++-- cmd/pwm.c | 7 ++-- common/fdt_support.c | 18 +++++++++++ configs/xilinx_versal_virt_defconfig | 3 +- configs/xilinx_zynq_virt_defconfig | 1 + configs/xilinx_zynqmp_virt_defconfig | 16 +++++++-- drivers/mmc/sdhci.c | 10 ++++-- drivers/mmc/zynq_sdhci.c | 244 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------- drivers/reset/Kconfig | 9 ++++++ drivers/reset/Makefile | 1 + drivers/reset/reset-zynqmp.c | 100 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ drivers/rtc/Kconfig | 7 ++++ drivers/rtc/Makefile | 1 + drivers/rtc/rtc-uclass.c | 1 + drivers/rtc/zynqmp_rtc.c | 158 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ drivers/soc/Kconfig | 16 +++++++++ drivers/soc/Makefile | 2 ++ drivers/soc/soc_xilinx_versal.c | 76 +++++++++++++++++++++++++++++++++++++++++++ drivers/soc/soc_xilinx_zynqmp.c | 78 ++++++++++++++++++++++++++++++++++++++++++++ drivers/watchdog/xilinx_wwdt.c | 1 + include/sdhci.h | 2 +- include/zynqmp_firmware.h | 351 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------- include/zynqmp_tap_delay.h | 21 ------------ 49 files changed, 1395 insertions(+), 294 deletions(-) delete mode 100644 board/xilinx/zynqmp/tap_delays.c create mode 100644 drivers/reset/reset-zynqmp.c create mode 100644 drivers/rtc/zynqmp_rtc.c create mode 100644 drivers/soc/soc_xilinx_versal.c create mode 100644 drivers/soc/soc_xilinx_zynqmp.c delete mode 100644 include/zynqmp_tap_delay.h