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

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

Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
  eHEA: Fix bonding support
  Blackfin ethernet driver: on chip ethernet MAC controller driver
  fix wrong argument of tc35815_read_plat_dev_addr()
  ARM/ETHER3: Handle multicast frames.
  SAA9730: Handle multicast frames.
  NI5010: Handle multicast frames.
  NS83820: Handle multicast frames.
  Fix RGMII-ID handling in gianfar
  Fix Vitesse RGMII-ID support
  Add phy-connection-type to gianfar nodes
  Fix Vitesse 824x PHY interrupt acking
  [PATCH] zd1211rw: Add ID for Siemens Gigaset USB Stick 54
  [PATCH] zd1211rw: Add ID for Planex GW-US54GXS
  [PATCH] Update version ipw2200 stamp to 1.2.2
  [PATCH] ipw2200: Fix ipw_isr() comments error on shared IRQ
  [PATCH] Fix ipw2200 set wrong power parameter causing firmware error
  [PATCH] ipw2100: Fix `iwpriv set_power` error
  [PATCH] softmac: Channel is listed twice in scan output
parents 789c56b7 f9e29228

Documentation/powerpc/booting-without-of.txt

+6 −0
Original line number Diff line number Diff line
@@ -1250,6 +1250,12 @@ platforms are moved over to use the flattened-device-tree model. 
      network device.  This is used by the bootwrapper to interpret

      MAC addresses passed by the firmware when no information other

      than indices is available to associate an address with a device.

    - phy-connection-type : a string naming the controller/PHY interface type,

      i.e., "mii" (default), "rmii", "gmii", "rgmii", "rgmii-id", "sgmii",

      "tbi", or "rtbi".  This property is only really needed if the connection

      is of type "rgmii-id", as all other connection types are detected by

      hardware.





  Example:

MAINTAINERS

+7 −0
Original line number Diff line number Diff line
@@ -732,6 +732,13 @@ L: uclinux-dist-devel@blackfin.uclinux.org (subscribers-only) 
W:	http://blackfin.uclinux.org

S:	Supported



BLACKFIN EMAC DRIVER

P:	Bryan Wu

M:	bryan.wu@analog.com

L:	uclinux-dist-devel@blackfin.uclinux.org (subscribers-only)

W:	http://blackfin.uclinux.org

S:	Supported



BLACKFIN RTC DRIVER

P:	Mike Frysinger

M:	michael.frysinger@analog.com

arch/powerpc/boot/dts/mpc8641_hpcn.dts

+4 −0
Original line number Diff line number Diff line
@@ -131,6 +131,7 @@ 
			interrupts = <1d 2 1e 2 22 2>;

			interrupt-parent = <&mpic>;

			phy-handle = <&phy0>;

			phy-connection-type = "rgmii-id";

		};



		ethernet@25000 {
@@ -150,6 +151,7 @@ 
			interrupts = <23 2 24 2 28 2>;

			interrupt-parent = <&mpic>;

			phy-handle = <&phy1>;

			phy-connection-type = "rgmii-id";

		};

		

		ethernet@26000 {
@@ -169,6 +171,7 @@ 
			interrupts = <1F 2 20 2 21 2>;

			interrupt-parent = <&mpic>;

			phy-handle = <&phy2>;

			phy-connection-type = "rgmii-id";

		};



		ethernet@27000 {
@@ -188,6 +191,7 @@ 
			interrupts = <25 2 26 2 27 2>;

			interrupt-parent = <&mpic>;

			phy-handle = <&phy3>;

			phy-connection-type = "rgmii-id";

		};

		serial@4500 {

			device_type = "serial";

arch/powerpc/sysdev/fsl_soc.c

+9 −0
Original line number Diff line number Diff line
@@ -197,6 +197,7 @@ static int __init gfar_of_init(void) 
		struct gianfar_platform_data gfar_data;

		const unsigned int *id;

		const char *model;

		const char *ctype;

		const void *mac_addr;

		const phandle *ph;

		int n_res = 2;
@@ -254,6 +255,14 @@ static int __init gfar_of_init(void) 
			    FSL_GIANFAR_DEV_HAS_VLAN |

			    FSL_GIANFAR_DEV_HAS_EXTENDED_HASH;



		ctype = of_get_property(np, "phy-connection-type", NULL);



		/* We only care about rgmii-id.  The rest are autodetected */

		if (ctype && !strcmp(ctype, "rgmii-id"))

			gfar_data.interface = PHY_INTERFACE_MODE_RGMII_ID;

		else

			gfar_data.interface = PHY_INTERFACE_MODE_MII;



		ph = of_get_property(np, "phy-handle", NULL);

		phy = of_find_node_by_phandle(*ph);

drivers/net/Kconfig

+44 −0
Original line number Diff line number Diff line
@@ -838,6 +838,50 @@ config ULTRA32 
	  <file:Documentation/networking/net-modules.txt>. The module

	  will be called smc-ultra32.



config BFIN_MAC

	tristate "Blackfin 536/537 on-chip mac support"

	depends on NET_ETHERNET && (BF537 || BF536) && (!BF537_PORT_H)

	select CRC32

	select BFIN_MAC_USE_L1 if DMA_UNCACHED_NONE

	help

	  This is the driver for blackfin on-chip mac device. Say Y if you want it

	  compiled into the kernel. This driver is also available as a module

	  ( = code which can be inserted in and removed from the running kernel

	  whenever you want). The module will be called bfin_mac.



config BFIN_MAC_USE_L1

	bool "Use L1 memory for rx/tx packets"

	depends on BFIN_MAC && BF537

	default y

	help

	  To get maximum network performace, you should use L1 memory as rx/tx buffers.

	  Say N here if you want to reserve L1 memory for other uses.



config BFIN_TX_DESC_NUM

	int "Number of transmit buffer packets"

	depends on BFIN_MAC

	range 6 10 if BFIN_MAC_USE_L1

	range 10 100

	default "10"

	help

	  Set the number of buffer packets used in driver.



config BFIN_RX_DESC_NUM

	int "Number of receive buffer packets"

	depends on BFIN_MAC

	range 20 100 if BFIN_MAC_USE_L1

	range 20 800

	default "20"

	help

	  Set the number of buffer packets used in driver.



config BFIN_MAC_RMII

	bool "RMII PHY Interface (EXPERIMENTAL)"

	depends on BFIN_MAC && EXPERIMENTAL

	default n

	help

	  Use Reduced PHY MII Interface



config SMC9194

	tristate "SMC 9194 support"

	depends on NET_VENDOR_SMC && (ISA || MAC && BROKEN)