From: Matthias Brugger <mbrugger@suse.com>
Date: Fri, 8 Nov 2019 13:49:47 +0000 (+0100)
Subject: arm: dts: bcm283x: Rename U-Boot file
X-Git-Tag: submit/tizen/20191212.015755~5
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=14a50ded6b3c1db9a12b1148186b26e9f981bf17;p=platform%2Fkernel%2Fu-boot.git

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.

Change-Id: Ife219ee0a0b24cb4a677d826b002f93946cc4ac4
Reported-by: Tom Rini <trini@konsulko.com>
Reported-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Tested-by: Tom Rini <trini@konsulko.com> [RPi 3, 32b and 64b modes]
Signed-off-by: Matthias Brugger <mbrugger@suse.com>
---

diff --git a/arch/arm/dts/bcm283x-u-boot.dtsi b/arch/arm/dts/bcm283x-u-boot.dtsi
new file mode 100644
index 0000000000..36548dad62
--- /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 <fvogt@suse.com>
+ */
+
+&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 36548dad62..0000000000
--- 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 <fvogt@suse.com>
- */
-
-&uart0 {
-	skip-init;
-	u-boot,dm-pre-reloc;
-};
-
-&uart1 {
-	skip-init;
-	u-boot,dm-pre-reloc;
-};
-
-&gpio {
-	u-boot,dm-pre-reloc;
-};