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

Commit f1618073 authored by David Howells's avatar David Howells
Browse files

Merge remote-tracking branch 'net/master' into afs-next

parents 9f159ae0 e1e54ec7

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

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ Required properties: 
  - "microchip,ksz8565"

  - "microchip,ksz9893"

  - "microchip,ksz9563"

  - "microchip,ksz8563"



Optional properties:

Documentation/devicetree/bindings/net/macb.txt

+2 −2
Original line number Diff line number Diff line
@@ -15,10 +15,10 @@ Required properties: 
  Use "atmel,sama5d4-gem" for the GEM IP (10/100) available on Atmel sama5d4 SoCs.

  Use "cdns,zynq-gem" Xilinx Zynq-7xxx SoC.

  Use "cdns,zynqmp-gem" for Zynq Ultrascale+ MPSoC.

  Use "sifive,fu540-macb" for SiFive FU540-C000 SoC.

  Use "sifive,fu540-c000-gem" for SiFive FU540-C000 SoC.

  Or the generic form: "cdns,emac".

- reg: Address and length of the register set for the device

	For "sifive,fu540-macb", second range is required to specify the

	For "sifive,fu540-c000-gem", second range is required to specify the

	address and length of the registers for GEMGXL Management block.

- interrupts: Should contain macb interrupt

- phy-mode: See ethernet.txt file in the same directory.

drivers/net/dsa/microchip/ksz9477_spi.c

+1 −0
Original line number Diff line number Diff line
@@ -81,6 +81,7 @@ static const struct of_device_id ksz9477_dt_ids[] = { 
	{ .compatible = "microchip,ksz9897" },

	{ .compatible = "microchip,ksz9893" },

	{ .compatible = "microchip,ksz9563" },

	{ .compatible = "microchip,ksz8563" },

	{},

};

MODULE_DEVICE_TABLE(of, ksz9477_dt_ids);

drivers/net/dsa/microchip/ksz_common.h

+1 −0
Original line number Diff line number Diff line
@@ -128,6 +128,7 @@ static inline void ksz_pwrite32(struct ksz_device *dev, int port, int offset, 


#define KSZ_REGMAP_ENTRY(width, swp, regbits, regpad, regalign)		\

	{								\

		.name = #width,						\

		.val_bits = (width),					\

		.reg_stride = (width) / 8,				\

		.reg_bits = (regbits) + (regalign),			\

drivers/net/ethernet/amd/xgbe/xgbe-main.c

+8 −2
Original line number Diff line number Diff line
@@ -469,13 +469,19 @@ static int __init xgbe_mod_init(void) 


	ret = xgbe_platform_init();

	if (ret)

		return ret;

		goto err_platform_init;



	ret = xgbe_pci_init();

	if (ret)

		return ret;

		goto err_pci_init;



	return 0;



err_pci_init:

	xgbe_platform_exit();

err_platform_init:

	unregister_netdevice_notifier(&xgbe_netdev_notifier);

	return ret;

}



static void __exit xgbe_mod_exit(void)