Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 48549cdf0bd04321a60c51ce2e258e4dbd53ae91

Authored by Simon Glass
1 parent 6d427c6b1f
Exists in v2017.01-smarct4x and in 25 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-n7.1.2_2.0.0-ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, v2017.01-smarct3x, v2017.01-smarct3x-emmc

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>

Showing 4 changed files with 23 additions and 4 deletions Side-by-side Diff

arch/arm/dts/tegra124-nyan-big-u-boot.dtsi
Diff comments   View file @ 48549cd
  1 +/*
  2 + * Copyright (C) 2016 Google, Inc
  3 + * Written by Simon Glass <sjg@chromium.org>
  4 + *
  5 + * SPDX-License-Identifier: GPL-2.0+
  6 + */
  7 +
  8 +/ {
  9 + host1x@50000000 {
  10 + u-boot,dm-pre-reloc;
  11 + dc@54200000 {
  12 + u-boot,dm-pre-reloc;
  13 + };
  14 + };
  15 +};
arch/arm/dts/tegra124-nyan-big.dts
Diff comments   View file @ 48549cd
... ... @@ -27,9 +27,7 @@
27 27 };
28 28  
29 29 host1x@50000000 {
30   - u-boot,dm-pre-reloc;
31 30 dc@54200000 {
32   - u-boot,dm-pre-reloc;
33 31 display-timings {
34 32 timing@0 {
35 33 clock-frequency = <69500000>;
arch/arm/dts/tegra20-u-boot.dtsi
Diff comments   View file @ 48549cd
  1 +/ {
  2 + host1x@50000000 {
  3 + u-boot,dm-pre-reloc;
  4 + dc@54200000 {
  5 + u-boot,dm-pre-reloc;
  6 + };
  7 + };
  8 +};
arch/arm/dts/tegra20.dtsi
Diff comments   View file @ 48549cd
... ... @@ -10,7 +10,6 @@
10 10 interrupt-parent = <&lic>;
11 11  
12 12 host1x@50000000 {
13   - u-boot,dm-pre-reloc;
14 13 compatible = "nvidia,tegra20-host1x", "simple-bus";
15 14 reg = <0x50000000 0x00024000>;
16 15 interrupts = <GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH>, /* syncpt */
... ... @@ -78,7 +77,6 @@
78 77 };
79 78  
80 79 dc@54200000 {
81   - u-boot,dm-pre-reloc;
82 80 compatible = "nvidia,tegra20-dc";
83 81 reg = <0x54200000 0x00040000>;
84 82 interrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>;