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

Commit e5eca6ae authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc 

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
  [POWERPC] Add Vitaly Bordug as PPC8xx maintainer
  [POWERPC] 4xx: Enable EMAC on Bamboo board
  [POWERPC] 4xx: Enable EMAC for PPC405 Walnut board
  [POWERPC] 4xx: Fix timebase clock selection on Walnut
  [POWERPC] 4xx: Enable EMAC on the PPC 440GP Ebony board
  [POWERPC] 4xx: Split early debug output and early boot console for 44x
  [POWERPC] 4xx: Enable NEW EMAC support for Sequoia 440EPx.
  [POWERPC] 4xx: Add RGMII support for Sequoia 440EPx
parents 6e506079 786d3693

MAINTAINERS

+2 −0
Original line number Diff line number Diff line
@@ -2338,6 +2338,8 @@ L: linuxppc-dev@ozlabs.org 
S:	Maintained



LINUX FOR POWERPC EMBEDDED PPC8XX

P:	Vitaly Bordug

M:	vitb@kernel.crashing.org

P:	Marcelo Tosatti

M:	marcelo@kvack.org

W:	http://www.penguinppc.org/

arch/powerpc/Kconfig.debug

+0 −1
Original line number Diff line number Diff line
@@ -216,7 +216,6 @@ config PPC_EARLY_DEBUG_BEAT 
config PPC_EARLY_DEBUG_44x

	bool "Early serial debugging for IBM/AMCC 44x CPUs"

	depends on 44x

	select PPC_UDBG_16550

	help

	  Select this to enable early debugging for IBM 44x chips via the

	  inbuilt serial port.

arch/powerpc/boot/dts/bamboo.dts

+7 −3
Original line number Diff line number Diff line
@@ -98,11 +98,13 @@ 
			interrupt-parent = <&MAL0>;

			interrupts = <0 1 2 3 4>;

			#interrupt-cells = <1>;

			#address-cells = <0>;

			#size-cells = <0>;

			interrupt-map = </*TXEOB*/ 0 &UIC0 a 4

					/*RXEOB*/ 1 &UIC0 b 4

					/*SERR*/  2 &UIC1 0 4

					/*TXDE*/  3 &UIC1 1 4

					/*RXDE*/  4 &UIC1 3 4>;

					/*RXDE*/  4 &UIC1 2 4>;

		};



		POB0: opb {
@@ -196,6 +198,7 @@ 
			};



			EMAC0: ethernet@ef600e00 {

				linux,network-index = <0>;

				device_type = "network";

				compatible = "ibm,emac-440ep", "ibm,emac-440gp", "ibm,emac";

				interrupt-parent = <&UIC1>;
@@ -210,12 +213,13 @@ 
				rx-fifo-size = <1000>;

				tx-fifo-size = <800>;

				phy-mode = "rmii";

				phy-map = <00000001>;

				phy-map = <00000000>;

				zmii-device = <&ZMII0>;

				zmii-channel = <0>;

			};



			EMAC1: ethernet@ef600f00 {

				linux,network-index = <1>;

				device_type = "network";

				compatible = "ibm,emac-440ep", "ibm,emac-440gp", "ibm,emac";

				interrupt-parent = <&UIC1>;
@@ -230,7 +234,7 @@ 
				rx-fifo-size = <1000>;

				tx-fifo-size = <800>;

				phy-mode = "rmii";

				phy-map = <00000001>;

				phy-map = <00000000>;

				zmii-device = <&ZMII0>;

				zmii-channel = <1>;

			};

arch/powerpc/boot/dts/sequoia.dts

+12 −2
Original line number Diff line number Diff line
@@ -241,6 +241,12 @@ 
				reg = <ef600d00 c>;

			};



			RGMII0: emac-rgmii@ef601000 {

				device_type = "rgmii-interface";

				compatible = "ibm,rgmii-440epx", "ibm,rgmii";

				reg = <ef601000 8>;

			};



			EMAC0: ethernet@ef600e00 {

				linux,network-index = <0>;

				device_type = "network";
@@ -261,10 +267,12 @@ 
				max-frame-size = <5dc>;

				rx-fifo-size = <1000>;

				tx-fifo-size = <800>;

				phy-mode = "rmii";

				phy-mode = "rgmii";

				phy-map = <00000000>;

				zmii-device = <&ZMII0>;

				zmii-channel = <0>;

				rgmii-device = <&RGMII0>;

				rgmii-channel = <0>;

			};



			EMAC1: ethernet@ef600f00 {
@@ -287,10 +295,12 @@ 
				max-frame-size = <5dc>;

				rx-fifo-size = <1000>;

				tx-fifo-size = <800>;

				phy-mode = "rmii";

				phy-mode = "rgmii";

				phy-map = <00000000>;

				zmii-device = <&ZMII0>;

				zmii-channel = <1>;

				rgmii-device = <&RGMII0>;

				rgmii-channel = <1>;

			};

		};

	};

arch/powerpc/boot/dts/walnut.dts

+9 −3
Original line number Diff line number Diff line
@@ -64,10 +64,15 @@ 
		MAL: mcmal {

			compatible = "ibm,mcmal-405gp", "ibm,mcmal";

			dcr-reg = <180 62>;

			num-tx-chans = <2>;

			num-tx-chans = <1>;

			num-rx-chans = <1>;

			interrupt-parent = <&UIC0>;

			interrupts = <a 4 b 4 c 4 d 4 e 4>;

			interrupts = <

				b 4 /* TXEOB */

				c 4 /* RXEOB */

				a 4 /* SERR */

				d 4 /* TXDE */

				e 4 /* RXDE */>;

		};



		POB0: opb {
@@ -118,9 +123,10 @@ 
				compatible = "ibm,emac-405gp", "ibm,emac";

				interrupt-parent = <&UIC0>;

				interrupts = <9 4 f 4>;

				local-mac-address = [000000000000]; /* Filled in by zImage */

				reg = <ef600800 70>;

				mal-device = <&MAL>;

				mal-tx-channel = <0 1>;

				mal-tx-channel = <0>;

				mal-rx-channel = <0>;

				cell-index = <0>;

				max-frame-size = <5dc>;