diff options
author | Stephen Warren <swarren@nvidia.com> | 2012-05-11 17:03:26 -0600 |
---|---|---|
committer | Stephen Warren <swarren@nvidia.com> | 2012-05-14 10:55:15 -0600 |
commit | c04abb3a07b56db4756b6f970609e65a8624b0a3 (patch) | |
tree | 8d3290dcd70672b60c1a269e4dd17279eace801c /arch/arm/boot/dts/tegra-cardhu.dts | |
parent | 2f32b1faa8c75e2e987c5b714ae25491d8477da5 (diff) | |
download | lwn-c04abb3a07b56db4756b6f970609e65a8624b0a3.tar.gz lwn-c04abb3a07b56db4756b6f970609e65a8624b0a3.zip |
ARM: dt: tegra: sort nodes based on bus order
Sort the nodes according to the following rules:
* First, any overrides for properties or nodes created by included files,
in the order they appeared in the include file.
* Second, any nodes with a reg property, in numerical order.
* Third, any nodes without a reg property, in alphabetical order of node
name.
The second sorting rule at least will probably help if/when we need to
explicitly insert nodes for the various busses in Tegra; that will just
be an indentation change rather than also a node re-ordering.
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts/tegra-cardhu.dts')
-rw-r--r-- | arch/arm/boot/dts/tegra-cardhu.dts | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/arch/arm/boot/dts/tegra-cardhu.dts b/arch/arm/boot/dts/tegra-cardhu.dts index 653d62891791..3b5cd7b07553 100644 --- a/arch/arm/boot/dts/tegra-cardhu.dts +++ b/arch/arm/boot/dts/tegra-cardhu.dts @@ -138,24 +138,6 @@ }; }; - sdhci@78000000 { - cd-gpios = <&gpio 69 0>; /* gpio PI5 */ - wp-gpios = <&gpio 155 0>; /* gpio PT3 */ - power-gpios = <&gpio 31 0>; /* gpio PD7 */ - }; - - sdhci@78000200 { - status = "disable"; - }; - - sdhci@78000400 { - status = "disable"; - }; - - sdhci@78000600 { - support-8bit; - }; - ahub { i2s@70080300 { status = "disable"; @@ -174,6 +156,24 @@ }; }; + sdhci@78000000 { + cd-gpios = <&gpio 69 0>; /* gpio PI5 */ + wp-gpios = <&gpio 155 0>; /* gpio PT3 */ + power-gpios = <&gpio 31 0>; /* gpio PD7 */ + }; + + sdhci@78000200 { + status = "disable"; + }; + + sdhci@78000400 { + status = "disable"; + }; + + sdhci@78000600 { + support-8bit; + }; + sound { compatible = "nvidia,tegra-audio-wm8903-cardhu", "nvidia,tegra-audio-wm8903"; |