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

ARM: tegra: fix node sort order 



For Tegra DT files, I've been attempting to keep the nodes sorted in
the order:
1) Nodes with reg, in order of reg.
2) Nodes without reg, alphabetically.

This patch fixes a few escapees that I missed:-(

The diffs look larger than they really are, because sometimes when one
node was moved up or down, diff chose to represent this as many other
nodes being moved the other way!

Signed-off-by: default avatarStephen Warren <swarren@nvidia.com>
parent 58ecb23f

arch/arm/boot/dts/tegra20-colibri-512.dtsi

+28 −28
Original line number Diff line number Diff line
@@ -199,6 +199,14 @@ 
		};

	};



	ac97: ac97@70002000 {

		status = "okay";

		nvidia,codec-reset-gpio = <&gpio TEGRA_GPIO(V, 0)

			GPIO_ACTIVE_HIGH>;

		nvidia,codec-sync-gpio = <&gpio TEGRA_GPIO(P, 0)

			GPIO_ACTIVE_HIGH>;

	};



	i2c@7000c000 {

		clock-frequency = <400000>;

	};
@@ -442,14 +450,6 @@ 
		};

	};



	ac97: ac97@70002000 {

		status = "okay";

		nvidia,codec-reset-gpio = <&gpio TEGRA_GPIO(V, 0)

			GPIO_ACTIVE_HIGH>;

		nvidia,codec-sync-gpio = <&gpio TEGRA_GPIO(P, 0)

			GPIO_ACTIVE_HIGH>;

	};



	usb@c5004000 {

		status = "okay";

		nvidia,phy-reset-gpio = <&gpio TEGRA_GPIO(V, 1)
@@ -479,26 +479,6 @@ 
		};

	};



	sound {

		compatible = "nvidia,tegra-audio-wm9712-colibri_t20",

			         "nvidia,tegra-audio-wm9712";

		nvidia,model = "Colibri T20 AC97 Audio";



		nvidia,audio-routing =

			"Headphone", "HPOUTL",

			"Headphone", "HPOUTR",

			"LineIn", "LINEINL",

			"LineIn", "LINEINR",

			"Mic", "MIC1";



		nvidia,ac97-controller = <&ac97>;



		clocks = <&tegra_car TEGRA20_CLK_PLL_A>,

			 <&tegra_car TEGRA20_CLK_PLL_A_OUT0>,

			 <&tegra_car TEGRA20_CLK_CDEV1>;

		clock-names = "pll_a", "pll_a_out0", "mclk";

	};



	regulators {

		compatible = "simple-bus";

		#address-cells = <1>;
@@ -525,4 +505,24 @@ 
			gpio = <&gpio TEGRA_GPIO(BB, 1) GPIO_ACTIVE_HIGH>;

		};

	};



	sound {

		compatible = "nvidia,tegra-audio-wm9712-colibri_t20",

			         "nvidia,tegra-audio-wm9712";

		nvidia,model = "Colibri T20 AC97 Audio";



		nvidia,audio-routing =

			"Headphone", "HPOUTL",

			"Headphone", "HPOUTR",

			"LineIn", "LINEINL",

			"LineIn", "LINEINR",

			"Mic", "MIC1";



		nvidia,ac97-controller = <&ac97>;



		clocks = <&tegra_car TEGRA20_CLK_PLL_A>,

			 <&tegra_car TEGRA20_CLK_PLL_A_OUT0>,

			 <&tegra_car TEGRA20_CLK_CDEV1>;

		clock-names = "pll_a", "pll_a_out0", "mclk";

	};

};

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

+92 −92
Original line number Diff line number Diff line
@@ -415,98 +415,6 @@ 
		};

	};



	pmc@7000e400 {

		nvidia,invert-interrupt;

		nvidia,suspend-mode = <1>;

		nvidia,cpu-pwr-good-time = <5000>;

		nvidia,cpu-pwr-off-time = <5000>;

		nvidia,core-pwr-good-time = <3845 3845>;

		nvidia,core-pwr-off-time = <3875>;

		nvidia,sys-clock-req-active-high;

	};



	pcie-controller@80003000 {

		pex-clk-supply = <&pci_clk_reg>;

		vdd-supply = <&pci_vdd_reg>;

		status = "okay";



		pci@1,0 {

			status = "okay";

		};



		pci@2,0 {

			status = "okay";

		};

	};



	usb@c5000000 {

		status = "okay";

	};



	usb-phy@c5000000 {

		status = "okay";

	};



	usb@c5004000 {

		status = "okay";

		nvidia,phy-reset-gpio = <&gpio TEGRA_GPIO(V, 1)

			GPIO_ACTIVE_LOW>;

	};



	usb-phy@c5004000 {

		status = "okay";

		nvidia,phy-reset-gpio = <&gpio TEGRA_GPIO(V, 1)

			GPIO_ACTIVE_LOW>;

	};



	usb@c5008000 {

		status = "okay";

	};



	usb-phy@c5008000 {

		status = "okay";

	};



	sdhci@c8000200 {

		status = "okay";

		cd-gpios = <&gpio TEGRA_GPIO(I, 5) GPIO_ACTIVE_LOW>;

		wp-gpios = <&gpio TEGRA_GPIO(H, 1) GPIO_ACTIVE_HIGH>;

		power-gpios = <&gpio TEGRA_GPIO(T, 3) GPIO_ACTIVE_HIGH>;

		bus-width = <4>;

	};



	sdhci@c8000600 {

		status = "okay";

		cd-gpios = <&gpio TEGRA_GPIO(H, 2) GPIO_ACTIVE_LOW>;

		wp-gpios = <&gpio TEGRA_GPIO(H, 3) GPIO_ACTIVE_HIGH>;

		power-gpios = <&gpio TEGRA_GPIO(I, 6) GPIO_ACTIVE_HIGH>;

		bus-width = <8>;

	};



	clocks {

		compatible = "simple-bus";

		#address-cells = <1>;

		#size-cells = <0>;



		clk32k_in: clock@0 {

			compatible = "fixed-clock";

			reg=<0>;

			#clock-cells = <0>;

			clock-frequency = <32768>;

		};

	};



	gpio-keys {

		compatible = "gpio-keys";



		power {

			label = "Power";

			gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_LOW>;

			linux,code = <116>; /* KEY_POWER */

			gpio-key,wakeup;

		};

	};



	kbc@7000e200 {

		status = "okay";

		nvidia,debounce-delay-ms = <2>;
@@ -624,6 +532,98 @@ 
				0x1F0400D6>;	/* KEY_QUESTION */

	};



	pmc@7000e400 {

		nvidia,invert-interrupt;

		nvidia,suspend-mode = <1>;

		nvidia,cpu-pwr-good-time = <5000>;

		nvidia,cpu-pwr-off-time = <5000>;

		nvidia,core-pwr-good-time = <3845 3845>;

		nvidia,core-pwr-off-time = <3875>;

		nvidia,sys-clock-req-active-high;

	};



	pcie-controller@80003000 {

		pex-clk-supply = <&pci_clk_reg>;

		vdd-supply = <&pci_vdd_reg>;

		status = "okay";



		pci@1,0 {

			status = "okay";

		};



		pci@2,0 {

			status = "okay";

		};

	};



	usb@c5000000 {

		status = "okay";

	};



	usb-phy@c5000000 {

		status = "okay";

	};



	usb@c5004000 {

		status = "okay";

		nvidia,phy-reset-gpio = <&gpio TEGRA_GPIO(V, 1)

			GPIO_ACTIVE_LOW>;

	};



	usb-phy@c5004000 {

		status = "okay";

		nvidia,phy-reset-gpio = <&gpio TEGRA_GPIO(V, 1)

			GPIO_ACTIVE_LOW>;

	};



	usb@c5008000 {

		status = "okay";

	};



	usb-phy@c5008000 {

		status = "okay";

	};



	sdhci@c8000200 {

		status = "okay";

		cd-gpios = <&gpio TEGRA_GPIO(I, 5) GPIO_ACTIVE_LOW>;

		wp-gpios = <&gpio TEGRA_GPIO(H, 1) GPIO_ACTIVE_HIGH>;

		power-gpios = <&gpio TEGRA_GPIO(T, 3) GPIO_ACTIVE_HIGH>;

		bus-width = <4>;

	};



	sdhci@c8000600 {

		status = "okay";

		cd-gpios = <&gpio TEGRA_GPIO(H, 2) GPIO_ACTIVE_LOW>;

		wp-gpios = <&gpio TEGRA_GPIO(H, 3) GPIO_ACTIVE_HIGH>;

		power-gpios = <&gpio TEGRA_GPIO(I, 6) GPIO_ACTIVE_HIGH>;

		bus-width = <8>;

	};



	clocks {

		compatible = "simple-bus";

		#address-cells = <1>;

		#size-cells = <0>;



		clk32k_in: clock@0 {

			compatible = "fixed-clock";

			reg=<0>;

			#clock-cells = <0>;

			clock-frequency = <32768>;

		};

	};



	gpio-keys {

		compatible = "gpio-keys";



		power {

			label = "Power";

			gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_LOW>;

			linux,code = <116>; /* KEY_POWER */

			gpio-key,wakeup;

		};

	};



	regulators {

		compatible = "simple-bus";

		#address-cells = <1>;

arch/arm/boot/dts/tegra20-iris-512.dts

+7 −7
Original line number Diff line number Diff line
@@ -36,31 +36,31 @@ 
		};

	};



	usb@c5000000 {

	serial@70006000 {

		status = "okay";

	};



	usb-phy@c5000000 {

	serial@70006300 {

		status = "okay";

	};



	usb@c5008000 {

	i2c_ddc: i2c@7000c400 {

		status = "okay";

	};



	usb-phy@c5008000 {

	usb@c5000000 {

		status = "okay";

	};



	serial@70006000 {

	usb-phy@c5000000 {

		status = "okay";

	};



	serial@70006300 {

	usb@c5008000 {

		status = "okay";

	};



	i2c_ddc: i2c@7000c400 {

	usb-phy@c5008000 {

		status = "okay";

	};

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

+141 −140
Original line number Diff line number Diff line
@@ -386,6 +386,13 @@ 
		status = "okay";

		clock-frequency = <400000>;



		magnetometer@c {

			compatible = "ak,ak8975";

			reg = <0xc>;

			interrupt-parent = <&gpio>;

			interrupts = <TEGRA_GPIO(N, 5) IRQ_TYPE_LEVEL_HIGH>;

		};



		pmic: tps6586x@34 {

			compatible = "ti,tps6586x";

			reg = <0x34>;
@@ -507,146 +514,6 @@ 
			compatible = "onnn,nct1008";

			reg = <0x4c>;

		};



		magnetometer@c {

			compatible = "ak,ak8975";

			reg = <0xc>;

			interrupt-parent = <&gpio>;

			interrupts = <TEGRA_GPIO(N, 5) IRQ_TYPE_LEVEL_HIGH>;

		};

	};



	pmc@7000e400 {

		nvidia,invert-interrupt;

		nvidia,suspend-mode = <1>;

		nvidia,cpu-pwr-good-time = <5000>;

		nvidia,cpu-pwr-off-time = <5000>;

		nvidia,core-pwr-good-time = <3845 3845>;

		nvidia,core-pwr-off-time = <3875>;

		nvidia,sys-clock-req-active-high;

	};



	memory-controller@7000f400 {

		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>;

		};



		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>;

		};

	};



	usb@c5000000 {

		status = "okay";

		dr_mode = "otg";

	};



	usb-phy@c5000000 {

		status = "okay";

		vbus-supply = <&vbus_reg>;

		dr_mode = "otg";

	};



	usb@c5004000 {

		status = "okay";

		nvidia,phy-reset-gpio = <&gpio TEGRA_GPIO(V, 1)

			GPIO_ACTIVE_LOW>;

	};



	usb-phy@c5004000 {

		status = "okay";

		nvidia,phy-reset-gpio = <&gpio TEGRA_GPIO(V, 1)

			GPIO_ACTIVE_LOW>;

	};



	usb@c5008000 {

		status = "okay";

	};



	usb-phy@c5008000 {

		status = "okay";

	};



	sdhci@c8000000 {

		status = "okay";

		power-gpios = <&gpio TEGRA_GPIO(K, 6) GPIO_ACTIVE_HIGH>;

		bus-width = <4>;

		keep-power-in-suspend;

	};



	sdhci@c8000400 {

		status = "okay";

		cd-gpios = <&gpio TEGRA_GPIO(I, 5) GPIO_ACTIVE_LOW>;

		wp-gpios = <&gpio TEGRA_GPIO(H, 1) GPIO_ACTIVE_HIGH>;

		power-gpios = <&gpio TEGRA_GPIO(I, 6) GPIO_ACTIVE_HIGH>;

		bus-width = <4>;

	};



	sdhci@c8000600 {

		status = "okay";

		bus-width = <8>;

		non-removable;

	};



	clocks {

		compatible = "simple-bus";

		#address-cells = <1>;

		#size-cells = <0>;



		clk32k_in: clock@0 {

			compatible = "fixed-clock";

			reg=<0>;

			#clock-cells = <0>;

			clock-frequency = <32768>;

		};

	};



	gpio-keys {

		compatible = "gpio-keys";



		power {

			label = "Power";

			gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_LOW>;

			linux,code = <116>; /* KEY_POWER */

			gpio-key,wakeup;

		};



		lid {

			label = "Lid";

			gpios = <&gpio TEGRA_GPIO(C, 7) GPIO_ACTIVE_HIGH>;

			linux,input-type = <5>; /* EV_SW */

			linux,code = <0>; /* SW_LID */

			debounce-interval = <1>;

			gpio-key,wakeup;

		};

	};



	kbc@7000e200 {
@@ -788,6 +655,140 @@ 


				0x1F04008A>;	/* KEY_HELP */

	};



	pmc@7000e400 {

		nvidia,invert-interrupt;

		nvidia,suspend-mode = <1>;

		nvidia,cpu-pwr-good-time = <5000>;

		nvidia,cpu-pwr-off-time = <5000>;

		nvidia,core-pwr-good-time = <3845 3845>;

		nvidia,core-pwr-off-time = <3875>;

		nvidia,sys-clock-req-active-high;

	};



	memory-controller@7000f400 {

		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>;

		};



		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>;

		};

	};



	usb@c5000000 {

		status = "okay";

		dr_mode = "otg";

	};



	usb-phy@c5000000 {

		status = "okay";

		vbus-supply = <&vbus_reg>;

		dr_mode = "otg";

	};



	usb@c5004000 {

		status = "okay";

		nvidia,phy-reset-gpio = <&gpio TEGRA_GPIO(V, 1)

			GPIO_ACTIVE_LOW>;

	};



	usb-phy@c5004000 {

		status = "okay";

		nvidia,phy-reset-gpio = <&gpio TEGRA_GPIO(V, 1)

			GPIO_ACTIVE_LOW>;

	};



	usb@c5008000 {

		status = "okay";

	};



	usb-phy@c5008000 {

		status = "okay";

	};



	sdhci@c8000000 {

		status = "okay";

		power-gpios = <&gpio TEGRA_GPIO(K, 6) GPIO_ACTIVE_HIGH>;

		bus-width = <4>;

		keep-power-in-suspend;

	};



	sdhci@c8000400 {

		status = "okay";

		cd-gpios = <&gpio TEGRA_GPIO(I, 5) GPIO_ACTIVE_LOW>;

		wp-gpios = <&gpio TEGRA_GPIO(H, 1) GPIO_ACTIVE_HIGH>;

		power-gpios = <&gpio TEGRA_GPIO(I, 6) GPIO_ACTIVE_HIGH>;

		bus-width = <4>;

	};



	sdhci@c8000600 {

		status = "okay";

		bus-width = <8>;

		non-removable;

	};



	clocks {

		compatible = "simple-bus";

		#address-cells = <1>;

		#size-cells = <0>;



		clk32k_in: clock@0 {

			compatible = "fixed-clock";

			reg=<0>;

			#clock-cells = <0>;

			clock-frequency = <32768>;

		};

	};



	gpio-keys {

		compatible = "gpio-keys";



		power {

			label = "Power";

			gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_LOW>;

			linux,code = <116>; /* KEY_POWER */

			gpio-key,wakeup;

		};



		lid {

			label = "Lid";

			gpios = <&gpio TEGRA_GPIO(C, 7) GPIO_ACTIVE_HIGH>;

			linux,input-type = <5>; /* EV_SW */

			linux,code = <0>; /* SW_LID */

			debounce-interval = <1>;

			gpio-key,wakeup;

		};

	};



	regulators {

		compatible = "simple-bus";

		#address-cells = <1>;

arch/arm/boot/dts/tegra20-whistler.dts

+13 −13
Original line number Diff line number Diff line
@@ -495,6 +495,19 @@ 
		};

	};



	kbc@7000e200 {

		status = "okay";

		nvidia,debounce-delay-ms = <20>;

		nvidia,repeat-delay-ms = <160>;

		nvidia,kbc-row-pins = <0 1 2>;

		nvidia,kbc-col-pins = <16 17>;

		nvidia,wakeup-source;

		linux,keymap = <0x00000074	/* KEY_POWER */

				0x01000066	/* KEY_HOME */

				0x0101009E	/* KEY_BACK */

				0x0201008B>;	/* KEY_MENU */

	};



	pmc@7000e400 {

		nvidia,invert-interrupt;

		nvidia,suspend-mode = <1>;
@@ -551,19 +564,6 @@ 
		};

	};



	kbc@7000e200 {

		status = "okay";

		nvidia,debounce-delay-ms = <20>;

		nvidia,repeat-delay-ms = <160>;

		nvidia,kbc-row-pins = <0 1 2>;

		nvidia,kbc-col-pins = <16 17>;

		nvidia,wakeup-source;

		linux,keymap = <0x00000074	/* KEY_POWER */

				0x01000066	/* KEY_HOME */

				0x0101009E	/* KEY_BACK */

				0x0201008B>;	/* KEY_MENU */

	};



	regulators {

		compatible = "simple-bus";

		#address-cells = <1>;

CRA Git | Maintained and supported by SUSTech CRA and CCSE