Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next (81bf1c64) · Commits · e / devices / android_kernel_fairphone_FP5

Documentation/devicetree/bindings/dma/apm-xgene-dma.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -35,7 +35,7 @@ Example:
		device_type = "dma";
		reg = <0x0 0x1f270000 0x0 0x10000>,
		<0x0 0x1f200000 0x0 0x10000>,
		<0x0 0x1b008000 0x0 0x2000>,
		<0x0 0x1b000000 0x0 0x400000>,
		<0x0 0x1054a000 0x0 0x100>;
		interrupts = <0x0 0x82 0x4>,
		<0x0 0xb8 0x4>,

Documentation/devicetree/bindings/net/dsa/dsa.txt

+32 −6

Original line number	Diff line number	Diff line
		@@ -44,9 +44,10 @@ Note that a port labelled "dsa" will imply checking for the uplink phandle
		described below.

		Optionnal property:
		- link : Should be a phandle to another switch's DSA port.
		- link : Should be a list of phandles to another switch's DSA port.
		This property is only used when switches are being
		chained/cascaded together.
		chained/cascaded together. This port is used as outgoing port
		towards the phandle port, which can be more than one hop away.

		- phy-handle : Phandle to a PHY on an external MDIO bus, not the
		switch internal one. See
		@@ -58,6 +59,10 @@ Optionnal property:
		Documentation/devicetree/bindings/net/ethernet.txt
		for details.

		- mii-bus : Should be a phandle to a valid MDIO bus device node.
		This mii-bus will be used in preference to the
		global dsa,mii-bus defined above, for this switch.

		Optional subnodes:
		- fixed-link : Fixed-link subnode describing a link to a non-MDIO
		managed entity. See
		@@ -96,10 +101,11 @@ Example:
		label = "cpu";
		};

		switch0uplink: port@6 {
		switch0port6: port@6 {
		reg = <6>;
		label = "dsa";
		link = <&switch1uplink>;
		link = <&switch1port0
		&switch2port0>;
		};
		};

		@@ -107,11 +113,31 @@ Example:
		#address-cells = <1>;
		#size-cells = <0>;
		reg = <17 1>; /* MDIO address 17, switch 1 in tree */
		mii-bus = <&mii_bus1>;

		switch1port0: port@0 {
		reg = <0>;
		label = "dsa";
		link = <&switch0port6>;
		};
		switch1port1: port@1 {
		reg = <1>;
		label = "dsa";
		link = <&switch2port1>;
		};
		};

		switch@2 {
		#address-cells = <1>;
		#size-cells = <0>;
		reg = <18 2>; /* MDIO address 18, switch 2 in tree */
		mii-bus = <&mii_bus1>;

		switch1uplink: port@0 {
		switch2port0: port@0 {
		reg = <0>;
		label = "dsa";
		link = <&switch0uplink>;
		link = <&switch1port1
		&switch0port6>;
		};
		};
		};

Documentation/devicetree/bindings/phy/ti-phy.txt

+16 −0

Original line number	Diff line number	Diff line
		@@ -82,6 +82,9 @@ Optional properties:
		- id: If there are multiple instance of the same type, in order to
		differentiate between each instance "id" can be used (e.g., multi-lane PCIe
		PHY). If "id" is not provided, it is set to default value of '1'.
		- syscon-pllreset: Handle to system control region that contains the
		CTRL_CORE_SMA_SW_0 register and register offset to the CTRL_CORE_SMA_SW_0
		register that contains the SATA_PLL_SOFT_RESET bit. Only valid for sata_phy.

		This is usually a subnode of ocp2scp to which it is connected.

		@@ -100,3 +103,16 @@ usb3phy@4a084400 {
		"sysclk",
		"refclk";
		};

		sata_phy: phy@4A096000 {
		compatible = "ti,phy-pipe3-sata";
		reg = <0x4A096000 0x80>, /* phy_rx */
		<0x4A096400 0x64>, /* phy_tx */
		<0x4A096800 0x40>; /* pll_ctrl */
		reg-names = "phy_rx", "phy_tx", "pll_ctrl";
		ctrl-module = <&omap_control_sata>;
		clocks = <&sys_clkin1>, <&sata_ref_clk>;
		clock-names = "sysclk", "refclk";
		syscon-pllreset = <&scm_conf 0x3fc>;
		#phy-cells = <0>;
		};

Documentation/input/alps.txt

+4 −2

Original line number	Diff line number	Diff line
		@@ -119,8 +119,10 @@ ALPS Absolute Mode - Protocol Version 2
		byte 5: 0 z6 z5 z4 z3 z2 z1 z0

		Protocol Version 2 DualPoint devices send standard PS/2 mouse packets for
		the DualPoint Stick. For non interleaved dualpoint devices the pointingstick
		buttons get reported separately in the PSM, PSR and PSL bits.
		the DualPoint Stick. The M, R and L bits signal the combined status of both
		the pointingstick and touchpad buttons, except for Dell dualpoint devices
		where the pointingstick buttons get reported separately in the PSM, PSR
		and PSL bits.

		Dualpoint device -- interleaved packet format
		---------------------------------------------

Documentation/networking/6lowpan.txt

0 → 100644

+50 −0

Original line number	Diff line number	Diff line

		Netdev private dataroom for 6lowpan interfaces:

		All 6lowpan able net devices, means all interfaces with ARPHRD_6LOWPAN,
		must have "struct lowpan_priv" placed at beginning of netdev_priv.

		The priv_size of each interface should be calculate by:

		dev->priv_size = LOWPAN_PRIV_SIZE(LL_6LOWPAN_PRIV_DATA);

		Where LL_PRIV_6LOWPAN_DATA is sizeof linklayer 6lowpan private data struct.
		To access the LL_PRIV_6LOWPAN_DATA structure you can cast:

		lowpan_priv(dev)-priv;

		to your LL_6LOWPAN_PRIV_DATA structure.

		Before registering the lowpan netdev interface you must run:

		lowpan_netdev_setup(dev, LOWPAN_LLTYPE_FOOBAR);

		wheres LOWPAN_LLTYPE_FOOBAR is a define for your 6LoWPAN linklayer type of
		enum lowpan_lltypes.

		Example to evaluate the private usually you can do:

		static inline sturct lowpan_priv_foobar *
		lowpan_foobar_priv(struct net_device *dev)
		{
		return (sturct lowpan_priv_foobar *)lowpan_priv(dev)->priv;
		}

		switch (dev->type) {
		case ARPHRD_6LOWPAN:
		lowpan_priv = lowpan_priv(dev);
		/* do great stuff which is ARPHRD_6LOWPAN related */
		switch (lowpan_priv->lltype) {
		case LOWPAN_LLTYPE_FOOBAR:
		/* do 802.15.4 6LoWPAN handling here */
		lowpan_foobar_priv(dev)->bar = foo;
		break;
		...
		}
		break;
		...
		}

		In case of generic 6lowpan branch ("net/6lowpan") you can remove the check
		on ARPHRD_6LOWPAN, because you can be sure that these function are called
		by ARPHRD_6LOWPAN interfaces.