| Message ID | 20230412073830.13928-4-matt@traverse.com.au |
|---|---|
| State | Accepted |
| Commit | 25914878655c47912a7793e61ce69fa9f5871400 |
| Delegated to: | Peng Fan |
| Headers | show |
| Series | Synchronise LS1088A/Ten64 device tree with Linux | expand |
On 4/12/2023 3:38 PM, Mathew McBride wrote: > This moves the bootph-all tags that were added in commit a593c1fec579 > ("arch: arm: dts: fsl-ls1088a.dtsi: tag serial nodes with bootph-all") > into a u-boot only include. > > Due to the way the U-Boot device tree "tweak" system is setup[1], > we need to have a per-board <boardname>-u-boot.dtsi, which will > include the "fsl-ls1088a-u-boot.dtsi" tweaks. > > By doing so, future updates to fsl-ls1088a.dtsi from upstream > (Linux kernel) can just be copied directly into the U-Boot tree, > without worrying about any extra data local to U-Boot. > > Signed-off-by: Mathew McBride<matt@traverse.com.au> Reviewed-by: Peng Fan <peng.fan@nxp.com>
diff --git a/arch/arm/dts/fsl-ls1088a-qds-u-boot.dtsi b/arch/arm/dts/fsl-ls1088a-qds-u-boot.dtsi new file mode 100644 index 0000000000..298adb849b --- /dev/null +++ b/arch/arm/dts/fsl-ls1088a-qds-u-boot.dtsi @@ -0,0 +1,5 @@ +// SPDX-License-Identifier: GPL-2.0+ +#include <config.h> + +#include "fsl-ls1088a-u-boot.dtsi" + diff --git a/arch/arm/dts/fsl-ls1088a-rdb-u-boot.dtsi b/arch/arm/dts/fsl-ls1088a-rdb-u-boot.dtsi new file mode 100644 index 0000000000..298adb849b --- /dev/null +++ b/arch/arm/dts/fsl-ls1088a-rdb-u-boot.dtsi @@ -0,0 +1,5 @@ +// SPDX-License-Identifier: GPL-2.0+ +#include <config.h> + +#include "fsl-ls1088a-u-boot.dtsi" + diff --git a/arch/arm/dts/fsl-ls1088a-ten64-u-boot.dtsi b/arch/arm/dts/fsl-ls1088a-ten64-u-boot.dtsi new file mode 100644 index 0000000000..298adb849b --- /dev/null +++ b/arch/arm/dts/fsl-ls1088a-ten64-u-boot.dtsi @@ -0,0 +1,5 @@ +// SPDX-License-Identifier: GPL-2.0+ +#include <config.h> + +#include "fsl-ls1088a-u-boot.dtsi" + diff --git a/arch/arm/dts/fsl-ls1088a-u-boot.dtsi b/arch/arm/dts/fsl-ls1088a-u-boot.dtsi new file mode 100644 index 0000000000..f59d8b184c --- /dev/null +++ b/arch/arm/dts/fsl-ls1088a-u-boot.dtsi @@ -0,0 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0+ +#include <config.h> + +&duart0 { + bootph-all; +}; + +&duart1 { + bootph-all; +}; diff --git a/arch/arm/dts/fsl-ls1088a.dtsi b/arch/arm/dts/fsl-ls1088a.dtsi index 4782b83515..b094bcf67c 100644 --- a/arch/arm/dts/fsl-ls1088a.dtsi +++ b/arch/arm/dts/fsl-ls1088a.dtsi @@ -64,7 +64,6 @@ QORIQ_CLK_PLL_DIV(4)>; interrupts = <0 32 IRQ_TYPE_LEVEL_HIGH>; status = "disabled"; - bootph-all; }; duart1: serial@21c0600 { @@ -74,7 +73,6 @@ QORIQ_CLK_PLL_DIV(4)>; interrupts = <0 32 IRQ_TYPE_LEVEL_HIGH>; status = "disabled"; - bootph-all; }; };
This moves the bootph-all tags that were added in commit a593c1fec579 ("arch: arm: dts: fsl-ls1088a.dtsi: tag serial nodes with bootph-all") into a u-boot only include. Due to the way the U-Boot device tree "tweak" system is setup[1], we need to have a per-board <boardname>-u-boot.dtsi, which will include the "fsl-ls1088a-u-boot.dtsi" tweaks. By doing so, future updates to fsl-ls1088a.dtsi from upstream (Linux kernel) can just be copied directly into the U-Boot tree, without worrying about any extra data local to U-Boot. Signed-off-by: Mathew McBride <matt@traverse.com.au> [1] - https://u-boot.readthedocs.io/en/latest/develop/devicetree/control.html#adding-tweaks-for-u-boot The CONFIG_SYS_SOC, CONFIG_SYS_CPU and CONFIG_SYS_VENDOR values are the same for the entire Layerscape family, meaning there is no ability to create a LS1088A only file here. But we will be adding per-board tweaks later in any case. --- arch/arm/dts/fsl-ls1088a-qds-u-boot.dtsi | 5 +++++ arch/arm/dts/fsl-ls1088a-rdb-u-boot.dtsi | 5 +++++ arch/arm/dts/fsl-ls1088a-ten64-u-boot.dtsi | 5 +++++ arch/arm/dts/fsl-ls1088a-u-boot.dtsi | 10 ++++++++++ arch/arm/dts/fsl-ls1088a.dtsi | 2 -- 5 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 arch/arm/dts/fsl-ls1088a-qds-u-boot.dtsi create mode 100644 arch/arm/dts/fsl-ls1088a-rdb-u-boot.dtsi create mode 100644 arch/arm/dts/fsl-ls1088a-ten64-u-boot.dtsi create mode 100644 arch/arm/dts/fsl-ls1088a-u-boot.dtsi