Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c04abb3a authored by Stephen Warren's avatar Stephen Warren
Browse files

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: default avatarStephen Warren <swarren@nvidia.com>
Acked-by: default avatarOlof Johansson <olof@lixom.net>
parent 2f32b1fa

arch/arm/boot/dts/tegra-cardhu.dts

+18 −18
Original line number Diff line number Diff line
@@ -138,40 +138,40 @@ 
		};

	};



	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 {

	ahub {

		i2s@70080300 {

			status = "disable";

		};



	sdhci@78000400 {

		i2s@70080500 {

			status = "disable";

		};



	sdhci@78000600 {

		support-8bit;

		i2s@70080600 {

			status = "disable";

		};



	ahub {

		i2s@70080300 {

		i2s@70080700 {

			status = "disable";

		};

	};



		i2s@70080500 {

			status = "disable";

	sdhci@78000000 {

		cd-gpios = <&gpio 69 0>; /* gpio PI5 */

		wp-gpios = <&gpio 155 0>; /* gpio PT3 */

		power-gpios = <&gpio 31 0>; /* gpio PD7 */

	};



		i2s@70080600 {

	sdhci@78000200 {

		status = "disable";

	};



		i2s@70080700 {

	sdhci@78000400 {

		status = "disable";

	};



	sdhci@78000600 {

		support-8bit;

	};



	sound {

arch/arm/boot/dts/tegra-harmony.dts

+48 −48
Original line number Diff line number Diff line
@@ -234,8 +234,28 @@ 
		};

	};



	pmc {

		nvidia,invert-interrupt;

	i2s@70002a00 {

		status = "disable";

	};



	serial@70006000 {

		status = "disable";

	};



	serial@70006040 {

		status = "disable";

	};



	serial@70006200 {

		status = "disable";

	};



	serial@70006300 {

		clock-frequency = <216000000>;

	};



	serial@70006400 {

		status = "disable";

	};



	i2c@7000c000 {
@@ -268,52 +288,12 @@ 
		clock-frequency = <400000>;

	};



	i2s@70002a00 {

		status = "disable";

	};



	sound {

		compatible = "nvidia,tegra-audio-wm8903-harmony",

			     "nvidia,tegra-audio-wm8903";

		nvidia,model = "NVIDIA Tegra Harmony";



		nvidia,audio-routing =

			"Headphone Jack", "HPOUTR",

			"Headphone Jack", "HPOUTL",

			"Int Spk", "ROP",

			"Int Spk", "RON",

			"Int Spk", "LOP",

			"Int Spk", "LON",

			"Mic Jack", "MICBIAS",

			"IN1L", "Mic Jack";



		nvidia,i2s-controller = <&tegra_i2s1>;

		nvidia,audio-codec = <&wm8903>;



		nvidia,spkr-en-gpios = <&wm8903 2 0>;

		nvidia,hp-det-gpios = <&gpio 178 0>; /* gpio PW2 */

		nvidia,int-mic-en-gpios = <&gpio 184 0>; /*gpio PX0 */

		nvidia,ext-mic-en-gpios = <&gpio 185 0>; /* gpio PX1 */

	};



	serial@70006000 {

		status = "disable";

	};



	serial@70006040 {

		status = "disable";

	};



	serial@70006200 {

		status = "disable";

	};



	serial@70006300 {

		clock-frequency = <216000000>;

	pmc {

		nvidia,invert-interrupt;

	};



	serial@70006400 {

		status = "disable";

	usb@c5004000 {

		nvidia,phy-reset-gpio = <&gpio 169 0>; /* gpio PV1 */

	};



	sdhci@c8000000 {
@@ -337,7 +317,27 @@ 
		support-8bit;

	};



	usb@c5004000 {

		nvidia,phy-reset-gpio = <&gpio 169 0>; /* gpio PV1 */

	sound {

		compatible = "nvidia,tegra-audio-wm8903-harmony",

			     "nvidia,tegra-audio-wm8903";

		nvidia,model = "NVIDIA Tegra Harmony";



		nvidia,audio-routing =

			"Headphone Jack", "HPOUTR",

			"Headphone Jack", "HPOUTL",

			"Int Spk", "ROP",

			"Int Spk", "RON",

			"Int Spk", "LOP",

			"Int Spk", "LON",

			"Mic Jack", "MICBIAS",

			"IN1L", "Mic Jack";



		nvidia,i2s-controller = <&tegra_i2s1>;

		nvidia,audio-codec = <&wm8903>;



		nvidia,spkr-en-gpios = <&wm8903 2 0>;

		nvidia,hp-det-gpios = <&gpio 178 0>; /* gpio PW2 */

		nvidia,int-mic-en-gpios = <&gpio 184 0>; /*gpio PX0 */

		nvidia,ext-mic-en-gpios = <&gpio 185 0>; /* gpio PX1 */

	};

};

arch/arm/boot/dts/tegra-paz00.dts

+44 −44
Original line number Diff line number Diff line
@@ -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 */

	};

};

arch/arm/boot/dts/tegra-seaboard.dts

+82 −82
Original line number Diff line number Diff line
@@ -257,6 +257,30 @@ 
		};

	};



	i2s@70002a00 {

		status = "disable";

	};



	serial@70006000 {

		status = "disable";

	};



	serial@70006040 {

		status = "disable";

	};



	serial@70006200 {

		status = "disable";

	};



	serial@70006300 {

		clock-frequency = <216000000>;

	};



	serial@70006400 {

		status = "disable";

	};



	i2c@7000c000 {

		clock-frequency = <400000>;
@@ -321,50 +345,51 @@ 
		};

	};



	i2s@70002a00 {

		status = "disable";

	};



	sound {

		compatible = "nvidia,tegra-audio-wm8903-seaboard",

			     "nvidia,tegra-audio-wm8903";

		nvidia,model = "NVIDIA Tegra Seaboard";



		nvidia,audio-routing =

			"Headphone Jack", "HPOUTR",

			"Headphone Jack", "HPOUTL",

			"Int Spk", "ROP",

			"Int Spk", "RON",

			"Int Spk", "LOP",

			"Int Spk", "LON",

			"Mic Jack", "MICBIAS",

			"IN1R", "Mic Jack";



		nvidia,i2s-controller = <&tegra_i2s1>;

		nvidia,audio-codec = <&wm8903>;



		nvidia,spkr-en-gpios = <&wm8903 2 0>;

		nvidia,hp-det-gpios = <&gpio 185 0>; /* gpio PX1 */

	};



	serial@70006000 {

		status = "disable";

	emc {

		emc-table@190000 {

			reg = <190000>;

			compatible = "nvidia,tegra20-emc-table";

			clock-frequency = <190000>;

			nvidia,emc-registers = <0x0000000c 0x00000026

				0x00000009 0x00000003 0x00000004 0x00000004

				0x00000002 0x0000000c 0x00000003 0x00000003

				0x00000002 0x00000001 0x00000004 0x00000005

				0x00000004 0x00000009 0x0000000d 0x0000059f

				0x00000000 0x00000003 0x00000003 0x00000003

				0x00000003 0x00000001 0x0000000b 0x000000c8

				0x00000003 0x00000007 0x00000004 0x0000000f

				0x00000002 0x00000000 0x00000000 0x00000002

				0x00000000 0x00000000 0x00000083 0xa06204ae

				0x007dc010 0x00000000 0x00000000 0x00000000

				0x00000000 0x00000000 0x00000000 0x00000000>;

		};



	serial@70006040 {

		status = "disable";

		emc-table@380000 {

			reg = <380000>;

			compatible = "nvidia,tegra20-emc-table";

			clock-frequency = <380000>;

			nvidia,emc-registers = <0x00000017 0x0000004b

				0x00000012 0x00000006 0x00000004 0x00000005

				0x00000003 0x0000000c 0x00000006 0x00000006

				0x00000003 0x00000001 0x00000004 0x00000005

				0x00000004 0x00000009 0x0000000d 0x00000b5f

				0x00000000 0x00000003 0x00000003 0x00000006

				0x00000006 0x00000001 0x00000011 0x000000c8

				0x00000003 0x0000000e 0x00000007 0x0000000f

				0x00000002 0x00000000 0x00000000 0x00000002

				0x00000000 0x00000000 0x00000083 0xe044048b

				0x007d8010 0x00000000 0x00000000 0x00000000

				0x00000000 0x00000000 0x00000000 0x00000000>;

		};



	serial@70006200 {

		status = "disable";

	};



	serial@70006300 {

		clock-frequency = <216000000>;

	usb@c5000000 {

		nvidia,vbus-gpio = <&gpio 24 0>; /* PD0 */

		dr_mode = "otg";

	};



	serial@70006400 {

		status = "disable";

	usb@c5004000 {

		nvidia,phy-reset-gpio = <&gpio 169 0>; /* gpio PV1 */

	};



	sdhci@c8000000 {
@@ -385,11 +410,6 @@ 
		support-8bit;

	};



	usb@c5000000 {

		nvidia,vbus-gpio = <&gpio 24 0>; /* PD0 */

		dr_mode = "otg";

	};



	gpio-keys {

		compatible = "gpio-keys";
@@ -410,45 +430,25 @@ 
		};

	};



	emc {

		emc-table@190000 {

			reg = <190000>;

			compatible = "nvidia,tegra20-emc-table";

			clock-frequency = <190000>;

			nvidia,emc-registers = <0x0000000c 0x00000026

				0x00000009 0x00000003 0x00000004 0x00000004

				0x00000002 0x0000000c 0x00000003 0x00000003

				0x00000002 0x00000001 0x00000004 0x00000005

				0x00000004 0x00000009 0x0000000d 0x0000059f

				0x00000000 0x00000003 0x00000003 0x00000003

				0x00000003 0x00000001 0x0000000b 0x000000c8

				0x00000003 0x00000007 0x00000004 0x0000000f

				0x00000002 0x00000000 0x00000000 0x00000002

				0x00000000 0x00000000 0x00000083 0xa06204ae

				0x007dc010 0x00000000 0x00000000 0x00000000

				0x00000000 0x00000000 0x00000000 0x00000000>;

		};

	sound {

		compatible = "nvidia,tegra-audio-wm8903-seaboard",

			     "nvidia,tegra-audio-wm8903";

		nvidia,model = "NVIDIA Tegra Seaboard";



		emc-table@380000 {

			reg = <380000>;

			compatible = "nvidia,tegra20-emc-table";

			clock-frequency = <380000>;

			nvidia,emc-registers = <0x00000017 0x0000004b

				0x00000012 0x00000006 0x00000004 0x00000005

				0x00000003 0x0000000c 0x00000006 0x00000006

				0x00000003 0x00000001 0x00000004 0x00000005

				0x00000004 0x00000009 0x0000000d 0x00000b5f

				0x00000000 0x00000003 0x00000003 0x00000006

				0x00000006 0x00000001 0x00000011 0x000000c8

				0x00000003 0x0000000e 0x00000007 0x0000000f

				0x00000002 0x00000000 0x00000000 0x00000002

				0x00000000 0x00000000 0x00000083 0xe044048b

				0x007d8010 0x00000000 0x00000000 0x00000000

				0x00000000 0x00000000 0x00000000 0x00000000>;

		};

	};

		nvidia,audio-routing =

			"Headphone Jack", "HPOUTR",

			"Headphone Jack", "HPOUTL",

			"Int Spk", "ROP",

			"Int Spk", "RON",

			"Int Spk", "LOP",

			"Int Spk", "LON",

			"Mic Jack", "MICBIAS",

			"IN1R", "Mic Jack";



	usb@c5004000 {

		nvidia,phy-reset-gpio = <&gpio 169 0>; /* gpio PV1 */

		nvidia,i2s-controller = <&tegra_i2s1>;

		nvidia,audio-codec = <&wm8903>;



		nvidia,spkr-en-gpios = <&wm8903 2 0>;

		nvidia,hp-det-gpios = <&gpio 185 0>; /* gpio PX1 */

	};

};

arch/arm/boot/dts/tegra-trimslice.dts

+30 −30
Original line number Diff line number Diff line
@@ -240,6 +240,30 @@ 
		};

	};



	i2s@70002a00 {

		status = "disable";

	};



	serial@70006000 {

		clock-frequency = <216000000>;

	};



	serial@70006040 {

		status = "disable";

	};



	serial@70006200 {

		status = "disable";

	};



	serial@70006300 {

		status = "disable";

	};



	serial@70006400 {

		status = "disable";

	};



	i2c@7000c000 {

		clock-frequency = <400000>;

	};
@@ -266,34 +290,8 @@ 
		status = "disable";

	};



	i2s@70002a00 {

		status = "disable";

	};



	sound {

		compatible = "nvidia,tegra-audio-trimslice";

		nvidia,i2s-controller = <&tegra_i2s1>;

		nvidia,audio-codec = <&codec>;

	};



	serial@70006000 {

		clock-frequency = <216000000>;

	};



	serial@70006040 {

		status = "disable";

	};



	serial@70006200 {

		status = "disable";

	};



	serial@70006300 {

		status = "disable";

	};



	serial@70006400 {

		status = "disable";

	usb@c5004000 {

		nvidia,phy-reset-gpio = <&gpio 168 0>; /* gpio PV0 */

	};



	sdhci@c8000200 {
@@ -309,7 +307,9 @@ 
		wp-gpios = <&gpio 122 0>; /* gpio PP2 */

	};



	usb@c5004000 {

		nvidia,phy-reset-gpio = <&gpio 168 0>; /* gpio PV0 */

	sound {

		compatible = "nvidia,tegra-audio-trimslice";

		nvidia,i2s-controller = <&tegra_i2s1>;

		nvidia,audio-codec = <&codec>;

	};

};