From patchwork Thu Oct 7 12:59:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 1537692 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=baylibre-com.20210112.gappssmtp.com header.i=@baylibre-com.20210112.gappssmtp.com header.a=rsa-sha256 header.s=20210112 header.b=VOUkBcm0; dkim-atps=neutral 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=) 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 bilbo.ozlabs.org (Postfix) with ESMTPS id 4HQBHc1vvGz9sRN for ; Thu, 7 Oct 2021 23:59:56 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 5AC07834B9; Thu, 7 Oct 2021 14:59:50 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=baylibre-com.20210112.gappssmtp.com header.i=@baylibre-com.20210112.gappssmtp.com header.b="VOUkBcm0"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id ACEB0834BE; Thu, 7 Oct 2021 14:59:47 +0200 (CEST) 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,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-wr1-x434.google.com (mail-wr1-x434.google.com [IPv6:2a00:1450:4864:20::434]) (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 575BF831B0 for ; Thu, 7 Oct 2021 14:59:43 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=narmstrong@baylibre.com Received: by mail-wr1-x434.google.com with SMTP id m22so18954189wrb.0 for ; Thu, 07 Oct 2021 05:59:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20210112.gappssmtp.com; s=20210112; h=from:subject:reply-to:to:cc:organization:message-id:date:user-agent :mime-version:content-language:content-transfer-encoding; bh=mMiz82thhF9v0nm2knTiakpzhwFbQTO7VObX5h8TmlQ=; b=VOUkBcm0W8Rgv1Xu+jWr/D6h/6O0PZwcfjOx7G8WI0Qc3kYyzeZEovCgxzrExc2Huf 3Y1UlNy8meCdL7bwYu5C/zvcUlH1MxyOK0B0TLpmvZT6ZiXe5/SJT7KqkGGXBZFWkjDS Xj1irJqago3E5eIZnB8cDmo9XGeEGh1XYh1Vsm7+Kp2X5m0OPS1WsHQglrHM3wcG3wX/ YVcHQ4WDIfuGyRYKB3bWhr9qrRxeGzIDxlrCH1WFciYwsC1g15t1pxXs9JcPqYiZgHxW B8kwywZklD1Vt9LwHMTIXojbNQzHdvfKKBJqCD802Qg0YTkFC+juEJa+EyXRFFmhcU5P Pkiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:subject:reply-to:to:cc:organization :message-id:date:user-agent:mime-version:content-language :content-transfer-encoding; bh=mMiz82thhF9v0nm2knTiakpzhwFbQTO7VObX5h8TmlQ=; b=MBQSV6xtcdz6HX4mQmdyd4elsV85NmdSm9hiFdwoZtoqbzy4wQzwUMgQ8Z5sW2Ifyw Zy6r3Pp2kmVIFgX78s+P34QKwBCWMTJ3wZXxYlgY/zaI0XBK1hWR9yMueq3EkOBNYMXx a5GWMCZrmCixVQfPlgtzy9n4K6L4KTmgx/Ki2eb15dXeVZxAvHaSzMWdCjOu0KM8pE8Q D9v4v9a7F7n/3SB5/N2frsHYCmw881eVjMccq7eL2kzAbT3F/guOZ7IPPij66hwLWUNk VeFdNqlcM1PzaHOemm1Vne5cnISTNGpZMT02f7wpI4w2HlKjXv2o9zY211xLqK5wWKND VGMA== X-Gm-Message-State: AOAM5325KJEo+SIa2HnmaaqowHp8que4p036BJ+RZmLWAA3pZNx0X4Hk YVf8nAT2CAizsQk2SpfASFB6lVoDSIRe6w== X-Google-Smtp-Source: ABdhPJwOe+IwB4xMQyoU/TSIGBCmEi/LpROMZYwT/L7o7WoedvIlbGbzRY0n9bCib6xlZnPylD5sLg== X-Received: by 2002:a1c:3807:: with SMTP id f7mr8529177wma.117.1633611582150; Thu, 07 Oct 2021 05:59:42 -0700 (PDT) Received: from ?IPv6:2001:861:44c0:66c0:4e6:6eee:3312:b574? ([2001:861:44c0:66c0:4e6:6eee:3312:b574]) by smtp.gmail.com with ESMTPSA id z5sm11649056wmp.26.2021.10.07.05.59.41 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 07 Oct 2021 05:59:41 -0700 (PDT) From: Neil Armstrong Subject: [PULL u-boot] Please pull u-boot-amlogic-20211007 To: trini@konsulko.com Cc: u-boot-amlogic@groups.io, U-Boot Mailing List Organization: Baylibre Message-ID: Date: Thu, 7 Oct 2021 14:59:41 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.13.0 MIME-Version: 1.0 Content-Language: en-US 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: , Reply-To: narmstrong@baylibre.com 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, Here's a bunch of changes concerning: - Sync DT from Linux 5.14 in order to support those new boards: - Odroid-HC4: a variant of Odroid-C4 with 2 SATA ports (via PCIe-SATA bridge) - Beelink GS-King X: A variant of the other Beelink board with 2 SATA ports (via USB3-SATA bridge) - Banana Pi M5: another credit card SBC - JetHub D1/H1: home automation controllers - Radxa Zero: another RPi Zero sized SBC - Other misc changes related to DT update - PCIe fixup when link init fails - distro_bootcmd scsi_boot change so we can boot on the Odroid-HC4 SATA disks over the PCIe-SATA bridge The CI job is at https://gitlab.denx.de/u-boot/custodians/u-boot-amlogic/pipelines/9389 Thanks, Neil The following changes since commit ea67f467a43e4c8852bd1ce1bb75f5dc6c3788d1: Merge branch '2021-10-06-assorted-improvements' (2021-10-06 13:46:31 -0400) are available in the Git repository at: https://source.denx.de/u-boot/custodians/u-boot-amlogic.git tags/u-boot-amlogic-20211007 for you to fetch changes up to 506fd30740081541d672ec2651cd23734899af76: doc: boards: amlogic: update for Radxa Zero (2021-10-07 13:45:46 +0200) ---------------------------------------------------------------- - Add new SoC ID for S905Y2 found in Radxa Zero - pcie_dw_meson: fix usb fail when pci link fails to go up - Sync Amlogic DT from Linux 5.14 - dwc3-meson-gxl: add AXG compatible - dts: keep back HW order for MMC devices since change in Upstream Linux - Cleanup local AXG DT USB nodes now everything is upstream - distro_bootcmd: run pci enum for scsi_boot just like it is done for nvme_boot - New Boards: - Odroid-HC4: a variant of Odroid-C4 with 2 SATA ports (via PCIe-SATA bridge) - Beelink GS-King X: A variant of the other Beelink board with 2 SATA ports (via USB3-SATA bridge) - Banana Pi M5: another credit card SBC - JetHub D1/H1: home automation controllers - Radxa Zero: another RPi Zero sized SBC ---------------------------------------------------------------- Christian Hewitt (5): ARM: meson: Add S905Y2 SOC ID ARM: dts: sort Amlogic Makefile section ARM: dts: add support for Radxa Zero boards: amlogic: add Radxa Zero defconfig doc: boards: amlogic: update for Radxa Zero Neil Armstrong (11): pci: pcie_dw_meson: fix usb fail when pci link fails to go up ARM: meson: Sync Amlogic DT from Linux 5.14 usb: dwc3: meson-gxl: add AXG compatible ARM: meson: keep HW order for MMC devices ARM: meson-axg: remove local USB nodes configs: meson64: add SCSI boot target distro_bootcmd: run pci enum for scsi_boot just like it is done for nvme_boot ARM: amlogic: add support for Odroid-HC4 device doc: boards: amlogic: update for Odroid HC4 ARM: meson: add Beelink GS-King X board ARM: amlogic: add Banana Pi M5 Vyacheslav Bocharov (3): ARM: amlogic: add JetHub common config header ARM: amlogic: add JetHub D1/H1 device support ARM: amlogic: add JetHub D1/H1 docs arch/arm/dts/Makefile | 18 +- arch/arm/dts/meson-axg-jethome-jethub-j100.dts | 361 ++++++++++++ arch/arm/dts/meson-axg-s400-u-boot.dtsi | 8 - arch/arm/dts/meson-axg-s400.dts | 16 + arch/arm/dts/meson-axg-u-boot.dtsi | 62 -- arch/arm/dts/meson-axg.dtsi | 181 ++++++ arch/arm/dts/meson-g12-common-u-boot.dtsi | 7 + arch/arm/dts/meson-g12-common.dtsi | 31 +- arch/arm/dts/meson-g12a-radxa-zero-u-boot.dtsi | 7 + arch/arm/dts/meson-g12a-radxa-zero.dts | 405 +++++++++++++ arch/arm/dts/meson-g12a-sei510.dts | 2 +- arch/arm/dts/meson-g12b-gsking-x-u-boot.dtsi | 7 + arch/arm/dts/meson-g12b-gsking-x.dts | 133 +++++ arch/arm/dts/meson-g12b-gtking-pro.dts | 23 +- arch/arm/dts/meson-g12b-gtking.dts | 22 +- arch/arm/dts/meson-g12b-odroid-n2-plus.dts | 2 +- arch/arm/dts/meson-g12b-odroid-n2.dtsi | 74 ++- arch/arm/dts/meson-g12b-w400.dtsi | 2 +- arch/arm/dts/meson-g12b.dtsi | 4 + arch/arm/dts/meson-gx-libretech-pc.dtsi | 2 +- arch/arm/dts/meson-gx-p23x-q20x.dtsi | 2 +- arch/arm/dts/meson-gx-u-boot.dtsi | 7 + arch/arm/dts/meson-gx.dtsi | 7 + arch/arm/dts/meson-gxbb-nanopi-k2.dts | 42 +- arch/arm/dts/meson-gxbb-odroidc2.dts | 44 +- arch/arm/dts/meson-gxl-s805x-libretech-ac.dts | 2 +- .../arm/dts/meson-gxl-s905w-jethome-jethub-j80.dts | 241 ++++++++ arch/arm/dts/meson-gxl-s905x-khadas-vim.dts | 50 +- arch/arm/dts/meson-gxl-s905x-libretech-cc-v2.dts | 6 +- arch/arm/dts/meson-gxl-s905x-libretech-cc.dts | 2 +- arch/arm/dts/meson-gxm-khadas-vim2.dts | 55 +- arch/arm/dts/meson-gxm-wetek-core2.dts | 2 +- arch/arm/dts/meson-gxm.dtsi | 20 + arch/arm/dts/meson-khadas-vim3.dtsi | 73 ++- arch/arm/dts/meson-sm1-bananapi-m5-u-boot.dtsi | 13 + arch/arm/dts/meson-sm1-bananapi-m5.dts | 646 +++++++++++++++++++++ arch/arm/dts/meson-sm1-khadas-vim3l.dts | 20 +- arch/arm/dts/meson-sm1-odroid-c4.dts | 448 +------------- arch/arm/dts/meson-sm1-odroid-hc4-u-boot.dtsi | 23 + arch/arm/dts/meson-sm1-odroid-hc4.dts | 140 +++++ arch/arm/dts/meson-sm1-odroid.dtsi | 449 ++++++++++++++ arch/arm/dts/meson-sm1-sei610.dts | 10 +- arch/arm/dts/meson-sm1.dtsi | 12 +- arch/arm/mach-meson/board-info.c | 1 + board/amlogic/beelink-s922x/MAINTAINERS | 1 + board/amlogic/jethub-j80/MAINTAINERS | 9 + board/amlogic/jethub-j80/Makefile | 6 + board/amlogic/jethub-j80/jethub-j80.c | 67 +++ board/amlogic/odroid-n2/MAINTAINERS | 1 + board/amlogic/u200/MAINTAINERS | 3 + configs/bananapi-m5_defconfig | 74 +++ configs/beelink-gsking-x_defconfig | 71 +++ configs/jethub_j100_defconfig | 63 ++ configs/jethub_j80_defconfig | 71 +++ configs/odroid-hc4_defconfig | 93 +++ configs/radxa-zero_defconfig | 65 +++ doc/board/amlogic/index.rst | 128 ++-- doc/board/amlogic/jethub-j100.rst | 108 ++++ doc/board/amlogic/jethub-j80.rst | 97 ++++ doc/board/amlogic/odroid-c4.rst | 3 + doc/board/amlogic/radxa-zero.rst | 74 +++ drivers/pci/pcie_dw_meson.c | 8 +- drivers/usb/dwc3/dwc3-meson-gxl.c | 1 + include/config_distro_bootcmd.h | 1 + include/configs/jethub.h | 40 ++ include/configs/meson64.h | 7 + include/dt-bindings/clock/axg-clkc.h | 26 +- include/dt-bindings/clock/g12a-clkc.h | 2 + 68 files changed, 4033 insertions(+), 668 deletions(-) create mode 100644 arch/arm/dts/meson-axg-jethome-jethub-j100.dts delete mode 100644 arch/arm/dts/meson-axg-u-boot.dtsi create mode 100644 arch/arm/dts/meson-g12a-radxa-zero-u-boot.dtsi create mode 100644 arch/arm/dts/meson-g12a-radxa-zero.dts create mode 100644 arch/arm/dts/meson-g12b-gsking-x-u-boot.dtsi create mode 100644 arch/arm/dts/meson-g12b-gsking-x.dts create mode 100644 arch/arm/dts/meson-gxl-s905w-jethome-jethub-j80.dts create mode 100644 arch/arm/dts/meson-sm1-bananapi-m5-u-boot.dtsi create mode 100644 arch/arm/dts/meson-sm1-bananapi-m5.dts create mode 100644 arch/arm/dts/meson-sm1-odroid-hc4-u-boot.dtsi create mode 100644 arch/arm/dts/meson-sm1-odroid-hc4.dts create mode 100644 arch/arm/dts/meson-sm1-odroid.dtsi create mode 100644 board/amlogic/jethub-j80/MAINTAINERS create mode 100644 board/amlogic/jethub-j80/Makefile create mode 100644 board/amlogic/jethub-j80/jethub-j80.c create mode 100644 configs/bananapi-m5_defconfig create mode 100644 configs/beelink-gsking-x_defconfig create mode 100644 configs/jethub_j100_defconfig create mode 100644 configs/jethub_j80_defconfig create mode 100644 configs/odroid-hc4_defconfig create mode 100644 configs/radxa-zero_defconfig create mode 100644 doc/board/amlogic/jethub-j100.rst create mode 100644 doc/board/amlogic/jethub-j80.rst create mode 100644 doc/board/amlogic/radxa-zero.rst create mode 100644 include/configs/jethub.h