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

Commit d67ebe72 authored Nov 24, 2009 by Benjamin Herrenschmidt

Merge commit 'jwb/next' into next

parents ab2f4892 59e1d495

arch/powerpc/boot/dts/canyonlands.dts

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -352,6 +352,7 @@
	max-frame-size = <9000>;		max-frame-size = <9000>;
	rx-fifo-size = <4096>;		rx-fifo-size = <4096>;
	tx-fifo-size = <2048>;		tx-fifo-size = <2048>;
			rx-fifo-size-gige = <16384>;
	phy-mode = "rgmii";		phy-mode = "rgmii";
	phy-map = <0x00000000>;		phy-map = <0x00000000>;
	rgmii-device = <&RGMII0>;		rgmii-device = <&RGMII0>;
	@@ -381,6 +382,7 @@
	max-frame-size = <9000>;		max-frame-size = <9000>;
	rx-fifo-size = <4096>;		rx-fifo-size = <4096>;
	tx-fifo-size = <2048>;		tx-fifo-size = <2048>;
			rx-fifo-size-gige = <16384>;
	phy-mode = "rgmii";		phy-mode = "rgmii";
	phy-map = <0x00000000>;		phy-map = <0x00000000>;
	rgmii-device = <&RGMII0>;		rgmii-device = <&RGMII0>;

arch/powerpc/boot/dts/eiger.dts

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -316,6 +316,7 @@
	max-frame-size = <9000>;		max-frame-size = <9000>;
	rx-fifo-size = <4096>;		rx-fifo-size = <4096>;
	tx-fifo-size = <2048>;		tx-fifo-size = <2048>;
			rx-fifo-size-gige = <16384>;
	phy-mode = "rgmii";		phy-mode = "rgmii";
	phy-map = <0x00000000>;		phy-map = <0x00000000>;
	rgmii-device = <&RGMII0>;		rgmii-device = <&RGMII0>;
	@@ -345,6 +346,7 @@
	max-frame-size = <9000>;		max-frame-size = <9000>;
	rx-fifo-size = <4096>;		rx-fifo-size = <4096>;
	tx-fifo-size = <2048>;		tx-fifo-size = <2048>;
			rx-fifo-size-gige = <16384>;
	phy-mode = "rgmii";		phy-mode = "rgmii";
	phy-map = <0x00000000>;		phy-map = <0x00000000>;
	rgmii-device = <&RGMII0>;		rgmii-device = <&RGMII0>;
	@@ -375,6 +377,8 @@
	max-frame-size = <9000>;		max-frame-size = <9000>;
	rx-fifo-size = <4096>;		rx-fifo-size = <4096>;
	tx-fifo-size = <2048>;		tx-fifo-size = <2048>;
			rx-fifo-size-gige = <16384>;
			tx-fifo-size-gige = <16384>; /* emac2&3 only */
	phy-mode = "rgmii";		phy-mode = "rgmii";
	phy-map = <0x00000000>;		phy-map = <0x00000000>;
	rgmii-device = <&RGMII1>;		rgmii-device = <&RGMII1>;
	@@ -403,6 +407,8 @@
	max-frame-size = <9000>;		max-frame-size = <9000>;
	rx-fifo-size = <4096>;		rx-fifo-size = <4096>;
	tx-fifo-size = <2048>;		tx-fifo-size = <2048>;
			rx-fifo-size-gige = <16384>;
			tx-fifo-size-gige = <16384>; /* emac2&3 only */
	phy-mode = "rgmii";		phy-mode = "rgmii";
	phy-map = <0x00000000>;		phy-map = <0x00000000>;
	rgmii-device = <&RGMII1>;		rgmii-device = <&RGMII1>;

arch/powerpc/boot/dts/glacier.dts

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -292,6 +292,7 @@
	max-frame-size = <9000>;		max-frame-size = <9000>;
	rx-fifo-size = <4096>;		rx-fifo-size = <4096>;
	tx-fifo-size = <2048>;		tx-fifo-size = <2048>;
			rx-fifo-size-gige = <16384>;
	phy-mode = "rgmii";		phy-mode = "rgmii";
	phy-map = <0x00000000>;		phy-map = <0x00000000>;
	rgmii-device = <&RGMII0>;		rgmii-device = <&RGMII0>;
	@@ -321,6 +322,7 @@
	max-frame-size = <9000>;		max-frame-size = <9000>;
	rx-fifo-size = <4096>;		rx-fifo-size = <4096>;
	tx-fifo-size = <2048>;		tx-fifo-size = <2048>;
			rx-fifo-size-gige = <16384>;
	phy-mode = "rgmii";		phy-mode = "rgmii";
	phy-map = <0x00000000>;		phy-map = <0x00000000>;
	rgmii-device = <&RGMII0>;		rgmii-device = <&RGMII0>;
	@@ -351,6 +353,8 @@
	max-frame-size = <9000>;		max-frame-size = <9000>;
	rx-fifo-size = <4096>;		rx-fifo-size = <4096>;
	tx-fifo-size = <2048>;		tx-fifo-size = <2048>;
			rx-fifo-size-gige = <16384>;
			tx-fifo-size-gige = <16384>; /* emac2&3 only */
	phy-mode = "rgmii";		phy-mode = "rgmii";
	phy-map = <0x00000000>;		phy-map = <0x00000000>;
	rgmii-device = <&RGMII1>;		rgmii-device = <&RGMII1>;
	@@ -379,6 +383,8 @@
	max-frame-size = <9000>;		max-frame-size = <9000>;
	rx-fifo-size = <4096>;		rx-fifo-size = <4096>;
	tx-fifo-size = <2048>;		tx-fifo-size = <2048>;
			rx-fifo-size-gige = <16384>;
			tx-fifo-size-gige = <16384>; /* emac2&3 only */
	phy-mode = "rgmii";		phy-mode = "rgmii";
	phy-map = <0x00000000>;		phy-map = <0x00000000>;
	rgmii-device = <&RGMII1>;		rgmii-device = <&RGMII1>;

arch/powerpc/boot/dts/haleakala.dts

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -226,6 +226,8 @@
	max-frame-size = <9000>;		max-frame-size = <9000>;
	rx-fifo-size = <4096>;		rx-fifo-size = <4096>;
	tx-fifo-size = <2048>;		tx-fifo-size = <2048>;
			rx-fifo-size-gige = <16384>;
			tx-fifo-size-gige = <16384>;
	phy-mode = "rgmii";		phy-mode = "rgmii";
	phy-map = <0x00000000>;		phy-map = <0x00000000>;
	rgmii-device = <&RGMII0>;		rgmii-device = <&RGMII0>;

arch/powerpc/boot/dts/katmai.dts

+11 −3

Original line number	Original line	Diff line number	Diff line
	@@ -16,7 +16,7 @@

	/ {		/ {
	#address-cells = <2>;		#address-cells = <2>;
	#size-cells = <1>;		#size-cells = <2>;
	model = "amcc,katmai";		model = "amcc,katmai";
	compatible = "amcc,katmai";		compatible = "amcc,katmai";
	dcr-parent = <&{/cpus/cpu@0}>;		dcr-parent = <&{/cpus/cpu@0}>;
	@@ -49,7 +49,7 @@

	memory {		memory {
	device_type = "memory";		device_type = "memory";
	reg = <0x00000000 0x00000000 0x00000000>; /* Filled in by zImage */		reg = <0x0 0x00000000 0x0 0x00000000>; /* Filled in by U-Boot */
	};		};

	UIC0: interrupt-controller0 {		UIC0: interrupt-controller0 {
	@@ -112,7 +112,15 @@
	compatible = "ibm,plb-440spe", "ibm,plb-440gp", "ibm,plb4";		compatible = "ibm,plb-440spe", "ibm,plb-440gp", "ibm,plb4";
	#address-cells = <2>;		#address-cells = <2>;
	#size-cells = <1>;		#size-cells = <1>;
	ranges;		/* addr-child addr-parent size */
			ranges = <0x4 0xe0000000 0x4 0xe0000000 0x20000000
			0xc 0x00000000 0xc 0x00000000 0x20000000
			0xd 0x00000000 0xd 0x00000000 0x80000000
			0xd 0x80000000 0xd 0x80000000 0x80000000
			0xe 0x00000000 0xe 0x00000000 0x80000000
			0xe 0x80000000 0xe 0x80000000 0x80000000
			0xf 0x00000000 0xf 0x00000000 0x80000000
			0xf 0x80000000 0xf 0x80000000 0x80000000>;
	clock-frequency = <0>; /* Filled in by zImage */		clock-frequency = <0>; /* Filled in by zImage */

	SDRAM0: sdram {		SDRAM0: sdram {