From patchwork Fri Nov 8 13:49:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Brugger X-Patchwork-Id: 1191898 X-Patchwork-Delegate: matthias.bgg@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.b="YGeArR2d"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 478hWQ5fxtz9sNT for ; Sat, 9 Nov 2019 00:51:14 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 687EFC21DED; Fri, 8 Nov 2019 13:51:05 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id BD20FC21BE5; Fri, 8 Nov 2019 13:50:48 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id F14A3C21BE5; Fri, 8 Nov 2019 13:50:46 +0000 (UTC) Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by lists.denx.de (Postfix) with ESMTPS id DD6E9C21BE5 for ; Fri, 8 Nov 2019 13:50:44 +0000 (UTC) Received: from ziggy.de (unknown [37.223.137.234]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id B5936214DB; Fri, 8 Nov 2019 13:50:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573221042; bh=MMsXcZOmmlboDBCS5AMKWaNJjRZSSFhPplIxU9j0zyE=; h=From:To:Cc:Subject:Date:From; b=YGeArR2dxMKHZUWmsTV/Q4Q7ASzzpdu/KOw+nufrSe/Z0WjR8PZL8OGtrTxtOBuZh CCJBnMa3B898fphbTB7SRezEoKocA/+edKW3Jw3Zi/kuTOE/UoWdVdW2j7WiqhpHcm KglyBb3wyi0rhMtJUAJsICZLDPPMzk7X8o9TNUsQ= From: matthias.bgg@kernel.org To: Tom Rini , Alexander Graf , Heinrich Schuchardt Date: Fri, 8 Nov 2019 14:49:46 +0100 Message-Id: <20191108134948.17742-1-matthias.bgg@kernel.org> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 Cc: u-boot@lists.denx.de, Matthias Brugger , matthias.bgg@kernel.org Subject: [U-Boot] [PATCH v4 1/3] fdt: fix bcm283x dm-pre-reloc definitions X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" From: Matthias Brugger In commmit 143256b353 ("fdt: update bcm283x device tree sources to Linux 5.1-rc6 state") we deleted the label for the node soc from bcm283x.dtsi As we don't need to add the property dm-pre-reloc to the soc node, we can delete it from bcm283x-uboot.dtsi Tested-by: Tom Rini [RPi 3, 32b and 64b modes] Signed-off-by: Matthias Brugger --- Changes in v4: - fix commit message Changes in v3: - add tested-by tag Changes in v2: - node soc, does not need a label - dm-pre-reloc not needed for node soc arch/arm/dts/bcm283x-uboot.dtsi | 4 ---- 1 file changed, 4 deletions(-) diff --git a/arch/arm/dts/bcm283x-uboot.dtsi b/arch/arm/dts/bcm283x-uboot.dtsi index 6cc1aa3f93..36548dad62 100644 --- a/arch/arm/dts/bcm283x-uboot.dtsi +++ b/arch/arm/dts/bcm283x-uboot.dtsi @@ -6,10 +6,6 @@ * (C) Copyright 2016 Fabian Vogt */ -&soc { - u-boot,dm-pre-reloc; -}; - &uart0 { skip-init; u-boot,dm-pre-reloc; From patchwork Fri Nov 8 13:49:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Brugger X-Patchwork-Id: 1191895 X-Patchwork-Delegate: matthias.bgg@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.b="wROspe7u"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 478hW46p8Zz9sNT for ; Sat, 9 Nov 2019 00:50:56 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 58FFFC21DB6; Fri, 8 Nov 2019 13:50:51 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 2124AC21C3F; Fri, 8 Nov 2019 13:50:48 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id E7043C21C3F; Fri, 8 Nov 2019 13:50:46 +0000 (UTC) Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by lists.denx.de (Postfix) with ESMTPS id 447F1C21C38 for ; Fri, 8 Nov 2019 13:50:45 +0000 (UTC) Received: from ziggy.de (unknown [37.223.137.234]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 9555E21D6C; Fri, 8 Nov 2019 13:50:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573221043; bh=oQrdTNBJ0aPlY1XWw6G9S0lX9p40vCGu1fRyhjTF94M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=wROspe7uh3TYCiz9UvpxXQg++jVG1g3bExWGRdaCjMUO1IcDMRyhQy73M+Ko47v2i odGThPnTmr0wr9UXOQDx6aJR442FPLgyGYqFkitO3NFK+2lNOBshJOz8+JkWQUYw6Z JZ+DUJCOWMnRwS0L7brQJRvB4sMT+IoZhhkeCgPw= From: matthias.bgg@kernel.org To: Tom Rini , Alexander Graf , Heinrich Schuchardt Date: Fri, 8 Nov 2019 14:49:47 +0100 Message-Id: <20191108134948.17742-2-matthias.bgg@kernel.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191108134948.17742-1-matthias.bgg@kernel.org> References: <20191108134948.17742-1-matthias.bgg@kernel.org> MIME-Version: 1.0 Cc: u-boot@lists.denx.de, Matthias Brugger , matthias.bgg@kernel.org Subject: [U-Boot] [PATCH v4 2/3] arm: dts: bcm283x: Rename U-Boot file X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" From: Matthias Brugger Rename the file bcm283x-uboot.dtsi so that it get automatically include through the scripts/Makefile.lib using $(CONFIG_SYS_SOC))-u-boot.dtsi Without this uarts and pincontroller miss the property dm-pre-reloc and the first call to bcm283x_mu_serial_ofdata_to_platdata() fails as the pins are not set correctly. As a result the U-Boot banner isn't shown on boot. Before commmit 143256b353 ("fdt: update bcm283x device tree sources to Linux 5.1-rc6 state") we included bcm283x-uboot.dtsi directly in the device-tree file. Which got deleted by the metioned commit. This is a much robuster solution. Reported-by: Tom Rini Reported-by: Heinrich Schuchardt Tested-by: Tom Rini [RPi 3, 32b and 64b modes] Signed-off-by: Matthias Brugger --- Changes in v4: None Changes in v3: - add tested-by tag Changes in v2: None arch/arm/dts/{bcm283x-uboot.dtsi => bcm283x-u-boot.dtsi} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename arch/arm/dts/{bcm283x-uboot.dtsi => bcm283x-u-boot.dtsi} (100%) diff --git a/arch/arm/dts/bcm283x-uboot.dtsi b/arch/arm/dts/bcm283x-u-boot.dtsi similarity index 100% rename from arch/arm/dts/bcm283x-uboot.dtsi rename to arch/arm/dts/bcm283x-u-boot.dtsi From patchwork Fri Nov 8 13:49:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Brugger X-Patchwork-Id: 1191899 X-Patchwork-Delegate: matthias.bgg@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.b="Dol9BArp"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 478hXP4PXyz9s7T for ; Sat, 9 Nov 2019 00:52:05 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 45B40C21E30; Fri, 8 Nov 2019 13:51:18 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 1C780C21DDC; Fri, 8 Nov 2019 13:50:50 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 5548CC21C38; Fri, 8 Nov 2019 13:50:48 +0000 (UTC) Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by lists.denx.de (Postfix) with ESMTPS id 19639C21C38 for ; Fri, 8 Nov 2019 13:50:47 +0000 (UTC) Received: from ziggy.de (unknown [37.223.137.234]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 6E0FA21D7E; Fri, 8 Nov 2019 13:50:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573221045; bh=n5Gxvwx6xQLRqMF1X/L5S/o0SKe2SRy3/5K5C30IC7E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Dol9BArpJQa7URXofz0piORr9nPOHpCpcJzfKDO90lcdkWswqdCB0SnsUI/LGlIPL LSSHjf7Ir35dDocptu8y+DUe0NEQ+jgfCwFtkFb9s/joAv5Bjtm6Plgrg6vRVABhq+ iG8fvm0IAWBg5I7JOOUPD2usgARDpJHYUFiy5+Yk= From: matthias.bgg@kernel.org To: Tom Rini , Alexander Graf , Heinrich Schuchardt Date: Fri, 8 Nov 2019 14:49:48 +0100 Message-Id: <20191108134948.17742-3-matthias.bgg@kernel.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191108134948.17742-1-matthias.bgg@kernel.org> References: <20191108134948.17742-1-matthias.bgg@kernel.org> MIME-Version: 1.0 Cc: u-boot@lists.denx.de, Matthias Brugger , matthias.bgg@kernel.org Subject: [U-Boot] [PATCH v4 3/3] drivers: bcm283x: Set pre-location flag for OF_BOARD X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" From: Matthias Brugger U-Boot support on Raspberry Pi 4 relies on the device-tree provided by the firmware. The blob does not contain the U-Boot specific pre-loc-rel properties. The result is, that the U-Boot banner is not printed. We fix this by setting the DM_FLAG_PRE_RELOC flag in the driver, if we rely on a device-tree provided by the firmware. Reported-by: Heinrich Schuchardt Signed-off-by: Matthias Brugger --- Changes in v4: None Changes in v3: None Changes in v2: - add DM_FLAG_PRE_RELOC for RPi4 case drivers/pinctrl/broadcom/pinctrl-bcm283x.c | 2 +- drivers/serial/serial_bcm283x_mu.c | 2 +- drivers/serial/serial_bcm283x_pl011.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/pinctrl/broadcom/pinctrl-bcm283x.c b/drivers/pinctrl/broadcom/pinctrl-bcm283x.c index 3be080d29e..1bb91d6eed 100644 --- a/drivers/pinctrl/broadcom/pinctrl-bcm283x.c +++ b/drivers/pinctrl/broadcom/pinctrl-bcm283x.c @@ -148,7 +148,7 @@ U_BOOT_DRIVER(pinctrl_bcm283x) = { .priv_auto_alloc_size = sizeof(struct bcm283x_pinctrl_priv), .ops = &bcm283x_pinctrl_ops, .probe = bcm283x_pinctl_probe, -#if !CONFIG_IS_ENABLED(OF_CONTROL) +#if !CONFIG_IS_ENABLED(OF_CONTROL) || CONFIG_IS_ENABLED(OF_BOARD) .flags = DM_FLAG_PRE_RELOC, #endif }; diff --git a/drivers/serial/serial_bcm283x_mu.c b/drivers/serial/serial_bcm283x_mu.c index bd1d89ec83..a6ffc84b96 100644 --- a/drivers/serial/serial_bcm283x_mu.c +++ b/drivers/serial/serial_bcm283x_mu.c @@ -199,7 +199,7 @@ U_BOOT_DRIVER(serial_bcm283x_mu) = { .platdata_auto_alloc_size = sizeof(struct bcm283x_mu_serial_platdata), .probe = bcm283x_mu_serial_probe, .ops = &bcm283x_mu_serial_ops, -#if !CONFIG_IS_ENABLED(OF_CONTROL) +#if !CONFIG_IS_ENABLED(OF_CONTROL) || CONFIG_IS_ENABLED(OF_BOARD) .flags = DM_FLAG_PRE_RELOC, #endif .priv_auto_alloc_size = sizeof(struct bcm283x_mu_priv), diff --git a/drivers/serial/serial_bcm283x_pl011.c b/drivers/serial/serial_bcm283x_pl011.c index 2527bb8b1c..7d8ab7b716 100644 --- a/drivers/serial/serial_bcm283x_pl011.c +++ b/drivers/serial/serial_bcm283x_pl011.c @@ -90,7 +90,7 @@ U_BOOT_DRIVER(bcm283x_pl011_uart) = { .platdata_auto_alloc_size = sizeof(struct pl01x_serial_platdata), .probe = pl01x_serial_probe, .ops = &bcm283x_pl011_serial_ops, -#if !CONFIG_IS_ENABLED(OF_CONTROL) +#if !CONFIG_IS_ENABLED(OF_CONTROL) || CONFIG_IS_ENABLED(OF_BOARD) .flags = DM_FLAG_PRE_RELOC, #endif .priv_auto_alloc_size = sizeof(struct pl01x_priv),