summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/tegra-paz00.dts
diff options
context:
space:
mode:
authorStephen Warren2012-05-12 01:03:26 +0200
committerStephen Warren2012-05-14 18:55:15 +0200
commitc04abb3a07b56db4756b6f970609e65a8624b0a3 (patch)
tree8d3290dcd70672b60c1a269e4dd17279eace801c /arch/arm/boot/dts/tegra-paz00.dts
parentARM: dt: tegra: remove duplicate device_type property (diff)
downloadkernel-qcow2-linux-c04abb3a07b56db4756b6f970609e65a8624b0a3.tar.gz
kernel-qcow2-linux-c04abb3a07b56db4756b6f970609e65a8624b0a3.tar.xz
kernel-qcow2-linux-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-paz00.dts')
-rw-r--r--arch/arm/boot/dts/tegra-paz00.dts88
1 files changed, 44 insertions, 44 deletions
diff --git a/arch/arm/boot/dts/tegra-paz00.dts b/arch/arm/boot/dts/tegra-paz00.dts
index d469322afbb8..b500212cc01c 100644
--- a/arch/arm/boot/dts/tegra-paz00.dts
+++ b/arch/arm/boot/dts/tegra-paz00.dts
@@ -226,6 +226,30 @@
};
};
+ i2s@70002a00 {
+ status = "disable";
+ };
+
+ serial@70006000 {
+ clock-frequency = <216000000>;
+ };
+
+ serial@70006040 {
+ status = "disable";
+ };
+
+ serial@70006200 {
+ clock-frequency = <216000000>;
+ };
+
+ serial@70006300 {
+ status = "disable";
+ };
+
+ serial@70006400 {
+ status = "disable";
+ };
+
i2c@7000c000 {
clock-frequency = <400000>;
@@ -265,48 +289,8 @@
};
};
- i2s@70002a00 {
- status = "disable";
- };
-
- sound {
- compatible = "nvidia,tegra-audio-alc5632-paz00",
- "nvidia,tegra-audio-alc5632";
-
- nvidia,model = "Compal PAZ00";
-
- nvidia,audio-routing =
- "Int Spk", "SPKOUT",
- "Int Spk", "SPKOUTN",
- "Headset Mic", "MICBIAS1",
- "MIC1", "Headset Mic",
- "Headset Stereophone", "HPR",
- "Headset Stereophone", "HPL",
- "DMICDAT", "Digital Mic";
-
- nvidia,audio-codec = <&alc5632>;
- nvidia,i2s-controller = <&tegra_i2s1>;
- nvidia,hp-det-gpios = <&gpio 178 0>; /* gpio PW2 */
- };
-
- serial@70006000 {
- clock-frequency = <216000000>;
- };
-
- serial@70006040 {
- status = "disable";
- };
-
- serial@70006200 {
- clock-frequency = <216000000>;
- };
-
- serial@70006300 {
- status = "disable";
- };
-
- serial@70006400 {
- status = "disable";
+ usb@c5004000 {
+ nvidia,phy-reset-gpio = <&gpio 168 0>; /* gpio PV0 */
};
sdhci@c8000000 {
@@ -348,7 +332,23 @@
};
};
- usb@c5004000 {
- nvidia,phy-reset-gpio = <&gpio 168 0>; /* gpio PV0 */
+ sound {
+ compatible = "nvidia,tegra-audio-alc5632-paz00",
+ "nvidia,tegra-audio-alc5632";
+
+ nvidia,model = "Compal PAZ00";
+
+ nvidia,audio-routing =
+ "Int Spk", "SPKOUT",
+ "Int Spk", "SPKOUTN",
+ "Headset Mic", "MICBIAS1",
+ "MIC1", "Headset Mic",
+ "Headset Stereophone", "HPR",
+ "Headset Stereophone", "HPL",
+ "DMICDAT", "Digital Mic";
+
+ nvidia,audio-codec = <&alc5632>;
+ nvidia,i2s-controller = <&tegra_i2s1>;
+ nvidia,hp-det-gpios = <&gpio 178 0>; /* gpio PW2 */
};
};