From 5051377a0b2bec1605ce97170585d693a98ec34a Mon Sep 17 00:00:00 2001 From: Matthias Brugger Date: Fri, 8 Nov 2019 14:49:47 +0100 Subject: arm: dts: bcm283x: Rename U-Boot file 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 --- arch/arm/dts/bcm283x-u-boot.dtsi | 21 +++++++++++++++++++++ arch/arm/dts/bcm283x-uboot.dtsi | 21 --------------------- 2 files changed, 21 insertions(+), 21 deletions(-) create mode 100644 arch/arm/dts/bcm283x-u-boot.dtsi delete mode 100644 arch/arm/dts/bcm283x-uboot.dtsi diff --git a/arch/arm/dts/bcm283x-u-boot.dtsi b/arch/arm/dts/bcm283x-u-boot.dtsi new file mode 100644 index 00000000000..36548dad62c --- /dev/null +++ b/arch/arm/dts/bcm283x-u-boot.dtsi @@ -0,0 +1,21 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * U-Boot addition to keep baudrate set by firmware + * and also initialize before relocation. + * + * (C) Copyright 2016 Fabian Vogt + */ + +&uart0 { + skip-init; + u-boot,dm-pre-reloc; +}; + +&uart1 { + skip-init; + u-boot,dm-pre-reloc; +}; + +&gpio { + u-boot,dm-pre-reloc; +}; diff --git a/arch/arm/dts/bcm283x-uboot.dtsi b/arch/arm/dts/bcm283x-uboot.dtsi deleted file mode 100644 index 36548dad62c..00000000000 --- a/arch/arm/dts/bcm283x-uboot.dtsi +++ /dev/null @@ -1,21 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * U-Boot addition to keep baudrate set by firmware - * and also initialize before relocation. - * - * (C) Copyright 2016 Fabian Vogt - */ - -&uart0 { - skip-init; - u-boot,dm-pre-reloc; -}; - -&uart1 { - skip-init; - u-boot,dm-pre-reloc; -}; - -&gpio { - u-boot,dm-pre-reloc; -}; -- cgit v1.2.3