[PATCH v5] ibm_newemac: Parameterize EMAC Multicast Match Handling

Valentine Barshak vbarshak at ru.mvista.com
Tue Jul 8 05:50:12 EST 2008


Grant Erickson wrote:

<snip>

> index 48c9a6e..799592d 100644
> --- a/arch/powerpc/boot/dts/kilauea.dts
> +++ b/arch/powerpc/boot/dts/kilauea.dts
> @@ -205,7 +205,7 @@
>  			EMAC0: ethernet at ef600900 {
>  				linux,network-index = <0>;
>  				device_type = "network";
> -				compatible = "ibm,emac-405ex", "ibm,emac4";
> +				compatible = "ibm,emac-405ex", "ibm,emac4sync";
>  				interrupt-parent = <&EMAC0>;
>  				interrupts = <0 1>;
>  				#interrupt-cells = <1>;
> @@ -213,7 +213,7 @@
>  				#size-cells = <0>;
>  				interrupt-map = </*Status*/ 0 &UIC0 18 4
>  						/*Wake*/  1 &UIC1 1d 4>;
> -				reg = <ef600900 70>;
> +				reg = <ef600900 c4>;
>  				local-mac-address = [000000000000]; /* Filled in by U-Boot */
>  				mal-device = <&MAL0>;
>  				mal-tx-channel = <0>;
> @@ -233,7 +233,7 @@
>  			EMAC1: ethernet at ef600a00 {
>  				linux,network-index = <1>;
>  				device_type = "network";
> -				compatible = "ibm,emac-405ex", "ibm,emac4";
> +				compatible = "ibm,emac-405ex", "ibm,emac4sync";
>  				interrupt-parent = <&EMAC1>;
>  				interrupts = <0 1>;
>  				#interrupt-cells = <1>;
> @@ -241,7 +241,7 @@
>  				#size-cells = <0>;
>  				interrupt-map = </*Status*/ 0 &UIC0 19 4
>  						/*Wake*/  1 &UIC1 1f 4>;
> -				reg = <ef600a00 70>;
> +				reg = <ef600900 c4>;

Should be reg = <ef600a00 c4>

<snip>

> --- a/arch/powerpc/boot/dts/makalu.dts
> +++ b/arch/powerpc/boot/dts/makalu.dts
> @@ -205,7 +205,7 @@
>  			EMAC0: ethernet at ef600900 {
>  				linux,network-index = <0>;
>  				device_type = "network";
> -				compatible = "ibm,emac-405ex", "ibm,emac4";
> +				compatible = "ibm,emac-405ex", "ibm,emac4sync";
>  				interrupt-parent = <&EMAC0>;
>  				interrupts = <0 1>;
>  				#interrupt-cells = <1>;
> @@ -213,7 +213,7 @@
>  				#size-cells = <0>;
>  				interrupt-map = </*Status*/ 0 &UIC0 18 4
>  						/*Wake*/  1 &UIC1 1d 4>;
> -				reg = <ef600900 70>;
> +				reg = <ef600900 c4>;
>  				local-mac-address = [000000000000]; /* Filled in by U-Boot */
>  				mal-device = <&MAL0>;
>  				mal-tx-channel = <0>;
> @@ -233,7 +233,7 @@
>  			EMAC1: ethernet at ef600a00 {
>  				linux,network-index = <1>;
>  				device_type = "network";
> -				compatible = "ibm,emac-405ex", "ibm,emac4";
> +				compatible = "ibm,emac-405ex", "ibm,emac4sync";
>  				interrupt-parent = <&EMAC1>;
>  				interrupts = <0 1>;
>  				#interrupt-cells = <1>;
> @@ -241,7 +241,7 @@
>  				#size-cells = <0>;
>  				interrupt-map = </*Status*/ 0 &UIC0 19 4
>  						/*Wake*/  1 &UIC1 1f 4>;
> -				reg = <ef600a00 70>;
> +				reg = <ef600900 c4>;

Should be reg = <ef600a00 c4>


Thanks,
Valentine.



More information about the Linuxppc-dev mailing list