diff options
| author | Simon Glass <sjg@chromium.org> | 2016-11-25 20:16:00 -0700 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2016-12-20 08:09:55 +1300 |
| commit | 48549cdf0bd04321a60c51ce2e258e4dbd53ae91 (patch) | |
| tree | 3486be2aa34c1e25e2c9ecb5b759ea7c8a2cbed5 | |
| parent | 6d427c6b1fa0ae97e7c484229d137c6a1f8a4118 (diff) | |
| download | u-boot-imx-48549cdf0bd04321a60c51ce2e258e4dbd53ae91.zip u-boot-imx-48549cdf0bd04321a60c51ce2e258e4dbd53ae91.tar.gz u-boot-imx-48549cdf0bd04321a60c51ce2e258e4dbd53ae91.tar.bz2 | |
tegra: Use a U-Boot-specific .dtsi file
With the new device-tree rules it is possible to put device-tree changes
needed by U-Boot into their own file. As an example of this approach, move
Tegra over to use it.
Signed-off-by: Simon Glass <sjg@chromium.org>
| -rw-r--r-- | arch/arm/dts/tegra124-nyan-big-u-boot.dtsi | 15 | ||||
| -rw-r--r-- | arch/arm/dts/tegra124-nyan-big.dts | 2 | ||||
| -rw-r--r-- | arch/arm/dts/tegra20-u-boot.dtsi | 8 | ||||
| -rw-r--r-- | arch/arm/dts/tegra20.dtsi | 2 |
4 files changed, 23 insertions, 4 deletions
diff --git a/arch/arm/dts/tegra124-nyan-big-u-boot.dtsi b/arch/arm/dts/tegra124-nyan-big-u-boot.dtsi new file mode 100644 index 0000000..fff1d78 --- /dev/null +++ b/arch/arm/dts/tegra124-nyan-big-u-boot.dtsi @@ -0,0 +1,15 @@ +/* + * Copyright (C) 2016 Google, Inc + * Written by Simon Glass <sjg@chromium.org> + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +/ { + host1x@50000000 { + u-boot,dm-pre-reloc; + dc@54200000 { + u-boot,dm-pre-reloc; + }; + }; +}; diff --git a/arch/arm/dts/tegra124-nyan-big.dts b/arch/arm/dts/tegra124-nyan-big.dts index 3758395..62f89d0 100644 --- a/arch/arm/dts/tegra124-nyan-big.dts +++ b/arch/arm/dts/tegra124-nyan-big.dts @@ -27,9 +27,7 @@ }; host1x@50000000 { - u-boot,dm-pre-reloc; dc@54200000 { - u-boot,dm-pre-reloc; display-timings { timing@0 { clock-frequency = <69500000>; diff --git a/arch/arm/dts/tegra20-u-boot.dtsi b/arch/arm/dts/tegra20-u-boot.dtsi new file mode 100644 index 0000000..9b9835d --- /dev/null +++ b/arch/arm/dts/tegra20-u-boot.dtsi @@ -0,0 +1,8 @@ +/ { + host1x@50000000 { + u-boot,dm-pre-reloc; + dc@54200000 { + u-boot,dm-pre-reloc; + }; + }; +}; diff --git a/arch/arm/dts/tegra20.dtsi b/arch/arm/dts/tegra20.dtsi index 84bb1b0..e21ee25 100644 --- a/arch/arm/dts/tegra20.dtsi +++ b/arch/arm/dts/tegra20.dtsi @@ -10,7 +10,6 @@ interrupt-parent = <&lic>; host1x@50000000 { - u-boot,dm-pre-reloc; compatible = "nvidia,tegra20-host1x", "simple-bus"; reg = <0x50000000 0x00024000>; interrupts = <GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH>, /* syncpt */ @@ -78,7 +77,6 @@ }; dc@54200000 { - u-boot,dm-pre-reloc; compatible = "nvidia,tegra20-dc"; reg = <0x54200000 0x00040000>; interrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>; |