From patchwork Mon Dec 9 08:09:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Goldschmidt X-Patchwork-Id: 1206002 X-Patchwork-Delegate: marek.vasut@gmail.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=fail (p=none dis=none) header.from=gmail.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="bIPp7UMS"; 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 47WbT84mLSz9sPc for ; Mon, 9 Dec 2019 19:09:48 +1100 (AEDT) Received: from phobos.denx.de (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 936918163A; Mon, 9 Dec 2019 09:09:43 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=gmail.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=gmail.com header.i=@gmail.com header.b="bIPp7UMS"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id CA1DF8164B; Mon, 9 Dec 2019 09:09:42 +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=-0.1 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, SPF_HELO_NONE, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-lj1-x231.google.com (mail-lj1-x231.google.com [IPv6:2a00:1450:4864:20::231]) (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 4BFCE81630 for ; Mon, 9 Dec 2019 09:09:39 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=simon.k.r.goldschmidt@gmail.com Received: by mail-lj1-x231.google.com with SMTP id r19so14534979ljg.3 for ; Mon, 09 Dec 2019 00:09:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to:cc; bh=pfaELM5QsJEGgUwnxCJKU98rBXMBqTDp54+nH3MSHZs=; b=bIPp7UMS456TSgsUx9wDvjI6cF4SlyOWlHoRUH27BMySkGOB8g9oT//+dRIghkQHRw AeWUroALPNjbz2AERu1ruMyBfZPIMKHOxwMjDOV6BJ1c0K6wNDVmHO7RG9igMRw/Kf/r QByzd9ZAiX2CjNtz+zCNnkzs0GgPcDj35cfmEJ27Z8lB4qtfcQGC8uqm17rXiaT8UEYf LMHP5DOBGRPSDHpRaZGPfVpchQ+7zFsRfhssofpwyyTrhsbIi3591bQY2B4/utOOfwS+ PrhAQc7xyeNLaQKVyk09Z0X5mVf8Prto2nN95SfO7LG/lOh4ZnQhv5RxmU3UJwQ+Zt4e muRg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to:cc; bh=pfaELM5QsJEGgUwnxCJKU98rBXMBqTDp54+nH3MSHZs=; b=ZuE/tkXyuCWf8Q+TB/1vNjD1YAtarMa+b0A428T6rLpuJBbl75RWf5KdXgD5Ny4oZ3 q+fzuwKH394L77e2WFFfTBS20DNu8gqEdOx+npoVgvXBUBtvPBSDRkqXzzMOLkg86xuH fjZgo8PFnfeSQaBZahMo3c3LM9vVWIH4if5fk4u3E6UsbGPGc/5TOnfbgiotemQ/Htmj bgO66S974lrEoNCTTTKt6qoIV8gM90COLp6gNWEmqwedf5ZKQCmcWkeXj4uJ+AhWwsyl /nSLhDNk8DjuWtABMuk/z1Qpj5jrCdMofOLiA83skYCMkzPaw9NLQTsk51EQ/ku/DRhS lZ/g== X-Gm-Message-State: APjAAAXxkpa/awsC1ppWG2x/K6luWGO6VqfTM0W6mcFzfA1M/SitgGNX 3vwSUlF5ag2LUmfR4RD336p346uTo5yVJlIwh5M= X-Google-Smtp-Source: APXvYqyvvlamQMKowb873TwvkX2woruu45Sm++BIhCfd+A2qCflwOqZEj2RmxGtfZk3zIt+wibED+v42Hg+dvhRv/No= X-Received: by 2002:a2e:7f08:: with SMTP id a8mr15276843ljd.164.1575878978026; Mon, 09 Dec 2019 00:09:38 -0800 (PST) MIME-Version: 1.0 From: Simon Goldschmidt Date: Mon, 9 Dec 2019 09:09:26 +0100 Message-ID: Subject: Pull request: socfpga-next To: Marek Vasut X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.26 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: U-Boot Mailing List Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.101.4 at phobos.denx.de X-Virus-Status: Clean The following changes since commit b38c3a641fc01fcd4eda5fa107ae3c247baa0196: Merge https://gitlab.denx.de/u-boot/custodians/u-boot-x86 (2019-12-08 10:51:00 -0500) are available in the git repository at: https://github.com/goldsimon/u-boot.git socfpga-next for you to fetch changes up to ed2d3002c23d1c5632a03a64676102f0445d627e: arm: socfpga: agilex: Enable Agilex SoC build (2019-12-09 08:49:51 +0100) ---------------------------------------------------------------- Ley Foon Tan (24): spl: Allow cache drivers to be used in SPL arm: dts: socfpga: Add u-boot, dm-pre-reloc for sysmgr and clkmgr nodes arm: socfpga: Convert reset manager from struct to defines arm: socfpga: Convert system manager from struct to defines arm: socfpga: Convert clock manager from struct to defines arm: socfpga: agilex: Add base address for Intel Agilex SoC arm: socfpga: Move firewall code to firewall file arm: socfpga: Move Stratix10 and Agilex reset manager common code arm: socfpga: agilex: Add reset manager support arm: socfpga: Move Stratix10 and Agilex system manager common code arm: socfpga: agilex: Add system manager support arm: socfpga: Move Stratix10 and Agilex clock manager common code arm: socfpga: Fix CLKMGR_INTOSC_HZ to 400MHz clk: agilex: Add clock driver for Agilex arm: socfpga: agilex: Add clock wrapper functions cache: Add Arteris Ncore cache coherent unit driver arm: agilex: Add clock handoff offset for Agilex ddr: altera: Restructure Stratix 10 SDRAM driver ddr: altera: agilex: Add SDRAM driver for Agilex board: intel: agilex: Add socdk board support for Intel Agilex SoC arm: socfpga: agilex: Add SPL for Agilex SoC arm: dts: agilex: Add base dtsi and devkit dts configs: socfpga: Move Stratix10 and Agilex common CONFIGs arm: socfpga: agilex: Enable Agilex SoC build arch/arm/Kconfig | 4 +- arch/arm/dts/Makefile | 1 + arch/arm/dts/socfpga-common-u-boot.dtsi | 8 + arch/arm/dts/socfpga.dtsi | 2 +- arch/arm/dts/socfpga_agilex-u-boot.dtsi | 96 +++++++++++ arch/arm/dts/socfpga_agilex.dtsi | 622 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ arch/arm/dts/socfpga_agilex_socdk-u-boot.dtsi | 39 +++++ arch/arm/dts/socfpga_agilex_socdk.dts | 141 +++++++++++++++ arch/arm/dts/socfpga_arria10.dtsi | 2 +- arch/arm/dts/socfpga_arria10_socdk.dtsi | 8 + arch/arm/dts/socfpga_stratix10.dtsi | 2 +- arch/arm/dts/socfpga_stratix10_socdk-u-boot.dtsi | 8 + arch/arm/mach-socfpga/Kconfig | 16 ++ arch/arm/mach-socfpga/Makefile | 17 ++ arch/arm/mach-socfpga/clock_manager.c | 14 +- arch/arm/mach-socfpga/clock_manager_agilex.c | 85 ++++++++++ arch/arm/mach-socfpga/clock_manager_arria10.c | 155 +++++++++-------- arch/arm/mach-socfpga/clock_manager_gen5.c | 211 +++++++++++++---------- arch/arm/mach-socfpga/clock_manager_s10.c | 218 ++++++++++++++---------- arch/arm/mach-socfpga/firewall.c | 107 ++++++++++++ arch/arm/mach-socfpga/include/mach/base_addr_s10.h | 4 + arch/arm/mach-socfpga/include/mach/clock_manager.h | 4 + arch/arm/mach-socfpga/include/mach/clock_manager_agilex.h | 14 ++ arch/arm/mach-socfpga/include/mach/clock_manager_arria10.h | 133 ++++++--------- arch/arm/mach-socfpga/include/mach/clock_manager_gen5.h | 112 +++++------- arch/arm/mach-socfpga/include/mach/clock_manager_s10.h | 131 ++++++-------- arch/arm/mach-socfpga/include/mach/clock_manager_soc64.h | 21 +++ arch/arm/mach-socfpga/include/mach/{firewall_s10.h => firewall.h} | 10 +- arch/arm/mach-socfpga/include/mach/handoff_s10.h | 9 +- arch/arm/mach-socfpga/include/mach/misc.h | 1 + arch/arm/mach-socfpga/include/mach/reset_manager.h | 7 +- arch/arm/mach-socfpga/include/mach/reset_manager_arria10.h | 43 +---- arch/arm/mach-socfpga/include/mach/reset_manager_gen5.h | 22 +-- arch/arm/mach-socfpga/include/mach/reset_manager_s10.h | 118 ------------- arch/arm/mach-socfpga/include/mach/reset_manager_soc64.h | 38 +++++ arch/arm/mach-socfpga/include/mach/system_manager.h | 7 +- arch/arm/mach-socfpga/include/mach/system_manager_arria10.h | 94 +++------- arch/arm/mach-socfpga/include/mach/system_manager_gen5.h | 123 +++----------- arch/arm/mach-socfpga/include/mach/system_manager_s10.h | 176 ------------------- arch/arm/mach-socfpga/include/mach/system_manager_soc64.h | 123 ++++++++++++++ arch/arm/mach-socfpga/mailbox_s10.c | 6 +- arch/arm/mach-socfpga/misc.c | 66 ++++++++ arch/arm/mach-socfpga/misc_arria10.c | 11 +- arch/arm/mach-socfpga/misc_gen5.c | 38 +++-- arch/arm/mach-socfpga/misc_s10.c | 9 +- arch/arm/mach-socfpga/reset_manager_arria10.c | 73 ++++---- arch/arm/mach-socfpga/reset_manager_gen5.c | 37 ++-- arch/arm/mach-socfpga/reset_manager_s10.c | 56 +++--- arch/arm/mach-socfpga/scan_manager.c | 6 +- arch/arm/mach-socfpga/spl_a10.c | 12 +- arch/arm/mach-socfpga/spl_agilex.c | 98 +++++++++++ arch/arm/mach-socfpga/spl_gen5.c | 26 ++- arch/arm/mach-socfpga/spl_s10.c | 109 ++---------- arch/arm/mach-socfpga/system_manager_gen5.c | 42 +++-- arch/arm/mach-socfpga/system_manager_s10.c | 42 +++-- arch/arm/mach-socfpga/wrap_pll_config_s10.c | 20 ++- board/intel/agilex-socdk/MAINTAINERS | 7 + board/intel/agilex-socdk/Makefile | 7 + board/intel/agilex-socdk/socfpga.c | 7 + common/spl/Kconfig | 6 + configs/socfpga_agilex_defconfig | 60 +++++++ drivers/Makefile | 1 + drivers/cache/Kconfig | 8 + drivers/cache/Makefile | 3 +- drivers/cache/cache-ncore.c | 164 ++++++++++++++++++ drivers/clk/altera/Makefile | 1 + drivers/clk/altera/clk-agilex.c | 579 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ drivers/clk/altera/clk-agilex.h | 237 ++++++++++++++++++++++++++ drivers/ddr/altera/Kconfig | 6 +- drivers/ddr/altera/Makefile | 3 +- drivers/ddr/altera/sdram_agilex.c | 168 ++++++++++++++++++ drivers/ddr/altera/sdram_gen5.c | 12 +- drivers/ddr/altera/sdram_s10.c | 300 +------------------------------- drivers/ddr/altera/sdram_s10.h | 148 +--------------- drivers/ddr/altera/sdram_soc64.c | 305 +++++++++++++++++++++++++++++++++ drivers/ddr/altera/sdram_soc64.h | 187 ++++++++++++++++++++ drivers/fpga/socfpga_arria10.c | 7 +- drivers/fpga/socfpga_gen5.c | 4 +- drivers/mmc/socfpga_dw_mmc.c | 17 +- drivers/sysreset/sysreset_socfpga.c | 6 +- include/configs/socfpga_agilex_socdk.h | 12 ++ include/configs/socfpga_soc64_common.h | 203 ++++++++++++++++++++++ include/configs/socfpga_stratix10_socdk.h | 192 +-------------------- include/dt-bindings/clock/agilex-clock.h | 71 ++++++++ 84 files changed, 4369 insertions(+), 1949 deletions(-) create mode 100644 arch/arm/dts/socfpga_agilex-u-boot.dtsi create mode 100644 arch/arm/dts/socfpga_agilex.dtsi create mode 100644 arch/arm/dts/socfpga_agilex_socdk-u-boot.dtsi create mode 100644 arch/arm/dts/socfpga_agilex_socdk.dts create mode 100644 arch/arm/mach-socfpga/clock_manager_agilex.c create mode 100644 arch/arm/mach-socfpga/firewall.c create mode 100644 arch/arm/mach-socfpga/include/mach/clock_manager_agilex.h create mode 100644 arch/arm/mach-socfpga/include/mach/clock_manager_soc64.h rename arch/arm/mach-socfpga/include/mach/{firewall_s10.h => firewall.h} (94%) delete mode 100644 arch/arm/mach-socfpga/include/mach/reset_manager_s10.h create mode 100644 arch/arm/mach-socfpga/include/mach/reset_manager_soc64.h delete mode 100644 arch/arm/mach-socfpga/include/mach/system_manager_s10.h create mode 100644 arch/arm/mach-socfpga/include/mach/system_manager_soc64.h create mode 100644 arch/arm/mach-socfpga/spl_agilex.c create mode 100644 board/intel/agilex-socdk/MAINTAINERS create mode 100644 board/intel/agilex-socdk/Makefile create mode 100644 board/intel/agilex-socdk/socfpga.c create mode 100644 configs/socfpga_agilex_defconfig create mode 100644 drivers/cache/cache-ncore.c create mode 100644 drivers/clk/altera/clk-agilex.c create mode 100644 drivers/clk/altera/clk-agilex.h create mode 100644 drivers/ddr/altera/sdram_agilex.c create mode 100644 drivers/ddr/altera/sdram_soc64.c create mode 100644 drivers/ddr/altera/sdram_soc64.h create mode 100644 include/configs/socfpga_agilex_socdk.h create mode 100644 include/configs/socfpga_soc64_common.h create mode 100644 include/dt-bindings/clock/agilex-clock.h