From patchwork Sun Nov 22 13:03:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hugh Cole-Baker X-Patchwork-Id: 1404475 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=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=f7a961TC; 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) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Cf9VJ2jybz9sSf for ; Mon, 23 Nov 2020 00:04:29 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E299A82569; Sun, 22 Nov 2020 14:04:13 +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=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="f7a961TC"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 5386682580; Sun, 22 Nov 2020 14:04:12 +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.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-wm1-x341.google.com (mail-wm1-x341.google.com [IPv6:2a00:1450:4864:20::341]) (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 14274821A4 for ; Sun, 22 Nov 2020 14:04:02 +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=sigmaris@gmail.com Received: by mail-wm1-x341.google.com with SMTP id a65so14749499wme.1 for ; Sun, 22 Nov 2020 05:04:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=JyYgWY1CmYGG9G+SWd+0zHhWSVBzBP1/DF1raVAgyAk=; b=f7a961TC/iYwK9wr4jdRDwY1syWq2ZgQSQq1hqPC7OfTyaVNtr1Mi0H5s+ndlMHmRb cRYdB349pGsK6Mf1Tuvlv+xniVzs05DHlKE1R0VpgdJb0voHQqv+D/4FeApUgdRYNprU ctOTsV0EFl35UTdDcO83X//DA9o2XNWyVbVTx/U+qOsyr0OuNM2ofLdRl6bGnP3qYMfv 2JaREN4iOrAGTInvPgBQZe10MARouoXV1FsHGqZLbbUuDM6ZD87bkrhaetnz+ctXuC3m arxUcT2860wil60zRe5kOvNZhCsMnN9DQMoojWsytZeJ5jMd9s1RmKvvMJ7VlBVzeA8e pHUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=JyYgWY1CmYGG9G+SWd+0zHhWSVBzBP1/DF1raVAgyAk=; b=rjzuk2AM+zFmC77iItcsvYALDYFON4u6H5Xok/ON64WnStM2zFHA44XEhWKRW3Gtka qdmXeGEJbwPppdbrMt3xPhvDWDoPBrsstQiQt9nYI620qi6rsV+iVbH4XO5EwUoB2MRy pFeq/WCbinVKyEYGl525gbWhZsude2N5quj9QkrwhixGnV1rlePoxV1b1y6H9BvKChaM GIKIGu0Q+iLoUOY1AuB8OVSJ5m2Hk6WhSa92z+x1Ibyj3va3XXNzQsg5QDdXxhbNqxvs gPvsSyGowjSYJibmDrWqQnF9GL7x7Sktp9EBiXFoYDNMH1s+4gieNuyETlu9HIFUmQ4y 7dcw== X-Gm-Message-State: AOAM5309jhVH3RWQSL+MrSUiI9Wdp6r13N6Ogj2MvfAwf73lj7RGawZ5 pJzO2WPyI7dcMgqrJHAjcFB/GFIgS6QY2g== X-Google-Smtp-Source: ABdhPJyve1b4K9PRmcvmNPr2JCoqxcnd9JElcBGu+REnT4DiBNQKv29Kmo6M3D/1DoOhowSOMhhzHQ== X-Received: by 2002:a1c:c284:: with SMTP id s126mr11537299wmf.109.1606050241987; Sun, 22 Nov 2020 05:04:01 -0800 (PST) Received: from apple.sigmaris.info (ebrouter.sigmaris.info. [82.69.107.165]) by smtp.gmail.com with ESMTPSA id i6sm10968566wma.42.2020.11.22.05.04.00 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 22 Nov 2020 05:04:01 -0800 (PST) From: Hugh Cole-Baker To: U-Boot Mailing List Cc: Hugh Cole-Baker , Heiko Stuebner , Jagan Teki , Kever Yang , Klaus Goger , Levin Du , Peter Robinson , Philipp Tomsich , Simon Glass , Suniel Mahesh Subject: [PATCH v2 0/3] rockchip: Fix SPI boot on Pinebook Pro, Puma and RK3399-ROC-PC Date: Sun, 22 Nov 2020 13:03:43 +0000 Message-Id: <20201122130346.11621-1-sigmaris@gmail.com> X-Mailer: git-send-email 2.24.3 (Apple Git-128) 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 Commit c4cea2bbf995 ("rockchip: Enable building a SPI ROM image on bob") added an alias spi1 referring to spi@ff1d0000, however in several boards there was already an alias spi0 referring to the same node, and having both aliases present broke booting U-Boot from SPI flash. This series removes the spi0 alias from the Pinebook Pro, RK3399-ROC-PC and Puma dts and sets the default bus for SPI flash to 1, so that the correct device is used. The Rockpro64 board, which was also affected, has already had the same type of fix applied. This has only been compile-tested - testing by folks who have the affected boards would be welcome. Changes in v2: Also make this change to the Puma-Haikou board as suggested by Kever. Hugh Cole-Baker (3): rockchip: pinebook-pro: default to SPI bus 1 for SPI-flash rockchip: rk3399-roc-pc: default to SPI bus 1 for SPI-flash rockchip: puma-haikou: default to SPI bus 1 for SPI-flash arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi | 4 ---- arch/arm/dts/rk3399-puma-haikou-u-boot.dtsi | 3 +-- arch/arm/dts/rk3399-roc-pc-u-boot.dtsi | 4 ---- configs/pinebook-pro-rk3399_defconfig | 2 ++ configs/puma-rk3399_defconfig | 2 ++ configs/roc-pc-mezzanine-rk3399_defconfig | 1 + configs/roc-pc-rk3399_defconfig | 1 + 7 files changed, 7 insertions(+), 10 deletions(-)