mirror of
https://github.com/torvalds/linux.git
synced 2026-04-22 08:44:02 -04:00
03fe2debbb
Fun set of conflict resolutions here...
For the mac80211 stuff, these were fortunately just parallel
adds. Trivially resolved.
In drivers/net/phy/phy.c we had a bug fix in 'net' that moved the
function phy_disable_interrupts() earlier in the file, whilst in
'net-next' the phy_error() call from this function was removed.
In net/ipv4/xfrm4_policy.c, David Ahern's changes to remove the
'rt_table_id' member of rtable collided with a bug fix in 'net' that
added a new struct member "rt_mtu_locked" which needs to be copied
over here.
The mlxsw driver conflict consisted of net-next separating
the span code and definitions into separate files, whilst
a 'net' bug fix made some changes to that moved code.
The mlx5 infiniband conflict resolution was quite non-trivial,
the RDMA tree's merge commit was used as a guide here, and
here are their notes:
====================
Due to bug fixes found by the syzkaller bot and taken into the for-rc
branch after development for the 4.17 merge window had already started
being taken into the for-next branch, there were fairly non-trivial
merge issues that would need to be resolved between the for-rc branch
and the for-next branch. This merge resolves those conflicts and
provides a unified base upon which ongoing development for 4.17 can
be based.
Conflicts:
drivers/infiniband/hw/mlx5/main.c - Commit 42cea83f95
(IB/mlx5: Fix cleanup order on unload) added to for-rc and
commit b5ca15ad7e (IB/mlx5: Add proper representors support)
add as part of the devel cycle both needed to modify the
init/de-init functions used by mlx5. To support the new
representors, the new functions added by the cleanup patch
needed to be made non-static, and the init/de-init list
added by the representors patch needed to be modified to
match the init/de-init list changes made by the cleanup
patch.
Updates:
drivers/infiniband/hw/mlx5/mlx5_ib.h - Update function
prototypes added by representors patch to reflect new function
names as changed by cleanup patch
drivers/infiniband/hw/mlx5/ib_rep.c - Update init/de-init
stage list to match new order from cleanup patch
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
108 lines
3.1 KiB
Plaintext
108 lines
3.1 KiB
Plaintext
Marvell DSA Switch Device Tree Bindings
|
|
---------------------------------------
|
|
|
|
WARNING: This binding is currently unstable. Do not program it into a
|
|
FLASH never to be changed again. Once this binding is stable, this
|
|
warning will be removed.
|
|
|
|
If you need a stable binding, use the old dsa.txt binding.
|
|
|
|
Marvell Switches are MDIO devices. The following properties should be
|
|
placed as a child node of an mdio device.
|
|
|
|
The properties described here are those specific to Marvell devices.
|
|
Additional required and optional properties can be found in dsa.txt.
|
|
|
|
The compatibility string is used only to find an identification register,
|
|
which is at a different MDIO base address in different switch families.
|
|
- "marvell,mv88e6085" : Switch has base address 0x10. Use with models:
|
|
6085, 6095, 6097, 6123, 6131, 6141, 6161, 6165,
|
|
6171, 6172, 6175, 6176, 6185, 6240, 6320, 6321,
|
|
6341, 6350, 6351, 6352
|
|
- "marvell,mv88e6190" : Switch has base address 0x00. Use with models:
|
|
6190, 6190X, 6191, 6290, 6390, 6390X
|
|
|
|
Required properties:
|
|
- compatible : Should be one of "marvell,mv88e6085" or
|
|
"marvell,mv88e6190" as indicated above
|
|
- reg : Address on the MII bus for the switch.
|
|
|
|
Optional properties:
|
|
|
|
- reset-gpios : Should be a gpio specifier for a reset line
|
|
- interrupt-parent : Parent interrupt controller
|
|
- interrupts : Interrupt from the switch
|
|
- interrupt-controller : Indicates the switch is itself an interrupt
|
|
controller. This is used for the PHY interrupts.
|
|
#interrupt-cells = <2> : Controller uses two cells, number and flag
|
|
- eeprom-length : Set to the length of an EEPROM connected to the
|
|
switch. Must be set if the switch can not detect
|
|
the presence and/or size of a connected EEPROM,
|
|
otherwise optional.
|
|
- mdio : Container of PHY and devices on the switches MDIO
|
|
bus.
|
|
- mdio? : Container of PHYs and devices on the external MDIO
|
|
bus. The node must contains a compatible string of
|
|
"marvell,mv88e6xxx-mdio-external"
|
|
|
|
Example:
|
|
|
|
mdio {
|
|
#address-cells = <1>;
|
|
#size-cells = <0>;
|
|
interrupt-parent = <&gpio0>;
|
|
interrupts = <27 IRQ_TYPE_LEVEL_LOW>;
|
|
interrupt-controller;
|
|
#interrupt-cells = <2>;
|
|
|
|
switch0: switch@0 {
|
|
compatible = "marvell,mv88e6085";
|
|
reg = <0>;
|
|
reset-gpios = <&gpio5 1 GPIO_ACTIVE_LOW>;
|
|
|
|
mdio {
|
|
#address-cells = <1>;
|
|
#size-cells = <0>;
|
|
switch1phy0: switch1phy0@0 {
|
|
reg = <0>;
|
|
interrupt-parent = <&switch0>;
|
|
interrupts = <0 IRQ_TYPE_LEVEL_HIGH>;
|
|
};
|
|
};
|
|
};
|
|
};
|
|
|
|
mdio {
|
|
#address-cells = <1>;
|
|
#size-cells = <0>;
|
|
interrupt-parent = <&gpio0>;
|
|
interrupts = <27 IRQ_TYPE_LEVEL_LOW>;
|
|
interrupt-controller;
|
|
#interrupt-cells = <2>;
|
|
|
|
switch0: switch@0 {
|
|
compatible = "marvell,mv88e6390";
|
|
reg = <0>;
|
|
reset-gpios = <&gpio5 1 GPIO_ACTIVE_LOW>;
|
|
|
|
mdio {
|
|
#address-cells = <1>;
|
|
#size-cells = <0>;
|
|
switch1phy0: switch1phy0@0 {
|
|
reg = <0>;
|
|
interrupt-parent = <&switch0>;
|
|
interrupts = <0 IRQ_TYPE_LEVEL_HIGH>;
|
|
};
|
|
};
|
|
|
|
mdio1 {
|
|
compatible = "marvell,mv88e6xxx-mdio-external";
|
|
#address-cells = <1>;
|
|
#size-cells = <0>;
|
|
switch1phy9: switch1phy0@9 {
|
|
reg = <9>;
|
|
};
|
|
};
|
|
};
|
|
};
|