From patchwork Wed Feb 7 00:02:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonas Karlman X-Patchwork-Id: 1895947 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=kwiboo.se header.i=@kwiboo.se header.a=rsa-sha256 header.s=fe-e1b5cab7be header.b=jea3Yu1R; dkim-atps=neutral Authentication-Results: legolas.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=patchwork.ozlabs.org) 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 ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4TV0h25G5Pz23gM for ; Wed, 7 Feb 2024 11:03:30 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 58B7187C87; Wed, 7 Feb 2024 01:03:28 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=kwiboo.se 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; secure) header.d=kwiboo.se header.i=@kwiboo.se header.b="jea3Yu1R"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 59A2787CA3; Wed, 7 Feb 2024 01:03:26 +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=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from smtp.forwardemail.net (smtp.forwardemail.net [149.28.215.223]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 5E6B486F34 for ; Wed, 7 Feb 2024 01:03:21 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=kwiboo.se Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=SRS0=4f0f=JQ=kwiboo.se=jonas@fe-bounces.kwiboo.se DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kwiboo.se; h=Content-Transfer-Encoding: MIME-Version: Message-ID: Date: Subject: Cc: To: From; q=dns/txt; s=fe-e1b5cab7be; t=1707264188; bh=0HRwjHkPzGoHRkP8y8IyFGHla9E5x91SShOHrqFl6tI=; b=jea3Yu1RX3ZSAtwJ2Ad+XbZ99wzXgd4T6AOMbZN1KvKA0wrBHYMGQbcTUcorVhkopd4FNN1GR 2LW8BpyyMaIFaj8uah5aCBuatyy5qRFa+rX9ilXZMczqeiH6iMCKgG3j6en2CREAE0MSxlb4KHJ xAhqT73lUIRv8W3aWgA68ljcheF+bXTdp4EmbHS9E2PN1kpDZYx8LV9l26z4U/o990uW/CKGRWt vcdZkE/RDPVZD3TsFprrOT+rTgld6+ny/wl2jvQYZQ3nl+wqvNRw3y698wgtyYjrxS2RAnjrxxQ jiD1K53+XS8rcrzz8ScXELSMhMlQcdLW4v1ujgUotBJw== From: Jonas Karlman To: Kever Yang , Simon Glass , Philipp Tomsich , Tom Rini Cc: u-boot@lists.denx.de, Jonas Karlman Subject: [PATCH 00/15] rockchip: rk3328: Update defconfigs, DTs and enable boot from SPI Date: Wed, 7 Feb 2024 00:02:29 +0000 Message-ID: <20240207000301.3270722-1-jonas@kwiboo.se> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-Report-Abuse-To: abuse@forwardemail.net X-Report-Abuse: abuse@forwardemail.net X-Complaints-To: abuse@forwardemail.net X-ForwardEmail-Version: 0.4.40 X-ForwardEmail-Sender: rfc822; jonas@kwiboo.se, smtp.forwardemail.net, 149.28.215.223 X-ForwardEmail-ID: 65c2c8bbd5b31093c56fbf22 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.8 at phobos.denx.de X-Virus-Status: Clean This series contains miscellaneous updates to defconfigs, syncs latest device trees from linux, fixes an issue loading FIT from SD-card when running SPL from eMMC and enables building a bootable SPI image on RK3328 boards. I am also adding myself as a reviewer for the three RK3328 boards I own. Patch 1-7 updates boards to enable similar Kconfig options and use a common order for from where to try and load FIT. Patch 8 fix loading FIT from SD-card when booting from eMMC by using pinctrl for emmc and sdmmc in SPL. Patch 9-10 makes rockchip gpio and rng driver compatible with linux. Patch 11 sync latest rk3328 device tree files from linux v6.8-rc1. Patch 12 reverts an old commit that added duplicated code. Patch 13-15 enables building u-boot-rockchip-spi.bin for boards with SPI flash. This series depends on the "rockchip: Fix ethernet on Radxa ROCK Pi E v1.21" series at [1]. [1] https://patchwork.ozlabs.org/cover/1887729/ Jonas Karlman (15): rockchip: rk3328: Update default u-boot,spl-boot-order prop rockchip: rk3328-evb: Update defconfig rockchip: rk3328-rock64: Update defconfig rockchip: rk3328-roc-cc: Update defconfig rockchip: rk3328-rock-pi-e: Update defconfig rockchip: rk3328-nanopi-r2: Update defconfig rockchip: rk3328-orangepi-r1-plus: Update defconfig rockchip: rk3328: Fix loading FIT from SD-card when booting from eMMC gpio: rockchip: Use gpio alias id as gpio bank id rng: rockchip: Use same compatible as linux rockchip: rk3328: Sync device tree from linux v6.8-rc1 Revert "rockchip: Allow booting from SPI" rockchip: rk3328: Add support to build bootable SPI image rockchip: rk3328-rock64: Enable boot from SPI NOR flash rockchip: rk3328-orangepi-r1-plus: Enable boot from SPI NOR flash arch/arm/dts/rk3328-evb-u-boot.dtsi | 4 + arch/arm/dts/rk3328-evb.dts | 1 + .../dts/rk3328-nanopi-r2c-plus-u-boot.dtsi | 6 -- arch/arm/dts/rk3328-nanopi-r2s-u-boot.dtsi | 28 ------ arch/arm/dts/rk3328-nanopi-r2s.dts | 3 +- .../rk3328-orangepi-r1-plus-lts-u-boot.dtsi | 36 ++----- arch/arm/dts/rk3328-orangepi-r1-plus-lts.dts | 4 +- .../dts/rk3328-orangepi-r1-plus-u-boot.dtsi | 36 ++----- arch/arm/dts/rk3328-orangepi-r1-plus.dts | 1 + arch/arm/dts/rk3328-roc-cc-u-boot.dtsi | 22 +---- arch/arm/dts/rk3328-roc-cc.dts | 3 +- arch/arm/dts/rk3328-rock-pi-e-u-boot.dtsi | 17 ---- arch/arm/dts/rk3328-rock-pi-e.dts | 55 +++++++++++ arch/arm/dts/rk3328-rock64-u-boot.dtsi | 30 ++---- arch/arm/dts/rk3328-rock64.dts | 1 + arch/arm/dts/rk3328-u-boot.dtsi | 99 +++++++++++++++---- arch/arm/dts/rk3328.dtsi | 64 +++++++++--- arch/arm/dts/rk3399-u-boot.dtsi | 2 +- arch/arm/mach-rockchip/rk3328/rk3328.c | 1 + arch/arm/mach-rockchip/spl-boot-order.c | 3 - board/rockchip/evb_rk3328/MAINTAINERS | 11 +++ board/rockchip/evb_rk3328/README | 70 ------------- configs/evb-rk3328_defconfig | 16 ++- configs/nanopi-r2c-plus-rk3328_defconfig | 11 ++- configs/nanopi-r2c-rk3328_defconfig | 11 ++- configs/nanopi-r2s-rk3328_defconfig | 11 ++- configs/orangepi-r1-plus-lts-rk3328_defconfig | 20 +++- configs/orangepi-r1-plus-rk3328_defconfig | 20 +++- configs/roc-cc-rk3328_defconfig | 9 +- configs/rock-pi-e-rk3328_defconfig | 10 +- configs/rock64-rk3328_defconfig | 15 ++- doc/board/rockchip/rockchip.rst | 9 +- drivers/gpio/rk_gpio.c | 7 +- drivers/rng/rockchip_rng.c | 10 +- 34 files changed, 351 insertions(+), 295 deletions(-) delete mode 100644 board/rockchip/evb_rk3328/README