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

Commit 5164172f authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'fec-next' 



Fugang Duan says:

====================
net: fec: add Wake-on-LAN support

The patch series enable FEC Wake-on-LAN feature for i.MX6q/dl and i.MX6SX SOCs.
FEC HW support sleep mode, when system in suspend status with FEC all clock gate
off, magic packet can wake up system. For different SOCs, there have special SOC
GPR register to let FEC enter sleep mode or exit sleep mode, add these to platform
callback for driver' call.

Patch#1: add WOL interface supports.
Patch#2: add SOC special sleep of/off operations for driver's sleep callback.
Patch#3: add magic pattern support for devicetree.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 03366a33 07b4d2dd

Documentation/devicetree/bindings/net/fsl-fec.txt

+2 −0
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ Optional properties: 
- fsl,num-rx-queues : The property is valid for enet-avb IP, which supports

  hw multi queues. Should specify the rx queue number, otherwise set rx queue

  number to 1.

- fsl,magic-packet : If present, indicates that the hardware supports waking

  up via magic packet.



Optional subnodes:

- mdio : specifies the mdio bus in the FEC, used as a container for phy nodes

arch/arm/boot/dts/imx6qdl-sabreauto.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ 
	phy-mode = "rgmii";

	interrupts-extended = <&gpio1 6 IRQ_TYPE_LEVEL_HIGH>,

			      <&intc 0 119 IRQ_TYPE_LEVEL_HIGH>;

	fsl,magic-packet;

	status = "okay";

};

arch/arm/boot/dts/imx6qdl-sabresd.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -160,6 +160,7 @@ 
	pinctrl-0 = <&pinctrl_enet>;

	phy-mode = "rgmii";

	phy-reset-gpios = <&gpio1 25 0>;

	fsl,magic-packet;

	status = "okay";

};

arch/arm/mach-imx/mach-imx6q.c

+40 −1
Original line number Diff line number Diff line
@@ -31,6 +31,8 @@ 
#include <linux/micrel_phy.h>

#include <linux/mfd/syscon.h>

#include <linux/mfd/syscon/imx6q-iomuxc-gpr.h>

#include <linux/fec.h>

#include <linux/netdevice.h>

#include <asm/mach/arch.h>

#include <asm/mach/map.h>

#include <asm/system_misc.h>
@@ -39,6 +41,35 @@ 
#include "cpuidle.h"

#include "hardware.h"



static struct fec_platform_data fec_pdata;



static void imx6q_fec_sleep_enable(int enabled)

{

	struct regmap *gpr;



	gpr = syscon_regmap_lookup_by_compatible("fsl,imx6q-iomuxc-gpr");

	if (!IS_ERR(gpr)) {

		if (enabled)

			regmap_update_bits(gpr, IOMUXC_GPR13,

					   IMX6Q_GPR13_ENET_STOP_REQ,

					   IMX6Q_GPR13_ENET_STOP_REQ);



		else

			regmap_update_bits(gpr, IOMUXC_GPR13,

					   IMX6Q_GPR13_ENET_STOP_REQ, 0);

	} else

		pr_err("failed to find fsl,imx6q-iomux-gpr regmap\n");

}



static void __init imx6q_enet_plt_init(void)

{

	struct device_node *np;



	np = of_find_node_by_path("/soc/aips-bus@02100000/ethernet@02188000");

	if (np && of_get_property(np, "fsl,magic-packet", NULL))

		fec_pdata.sleep_mode_enable = imx6q_fec_sleep_enable;

}



/* For imx6q sabrelite board: set KSZ9021RN RGMII pad skew */

static int ksz9021rn_phy_fixup(struct phy_device *phydev)

{
@@ -261,6 +292,12 @@ static void __init imx6q_axi_init(void) 
	}

}



/* Add auxdata to pass platform data */

static const struct of_dev_auxdata imx6q_auxdata_lookup[] __initconst = {

	OF_DEV_AUXDATA("fsl,imx6q-fec", 0x02188000, NULL, &fec_pdata),

	{ /* sentinel */ }

};



static void __init imx6q_init_machine(void)

{

	struct device *parent;
@@ -274,11 +311,13 @@ static void __init imx6q_init_machine(void) 


	imx6q_enet_phy_init();



	of_platform_populate(NULL, of_default_bus_match_table, NULL, parent);

	of_platform_populate(NULL, of_default_bus_match_table,

			     imx6q_auxdata_lookup, parent);



	imx_anatop_init();

	cpu_is_imx6q() ?  imx6q_pm_init() : imx6dl_pm_init();

	imx6q_1588_init();

	imx6q_enet_plt_init();

	imx6q_axi_init();

}

arch/arm/mach-imx/mach-imx6sx.c

+50 −0
Original line number Diff line number Diff line
@@ -12,12 +12,62 @@ 
#include <linux/regmap.h>

#include <linux/mfd/syscon.h>

#include <linux/mfd/syscon/imx6q-iomuxc-gpr.h>

#include <linux/fec.h>

#include <linux/netdevice.h>

#include <asm/mach/arch.h>

#include <asm/mach/map.h>



#include "common.h"

#include "cpuidle.h"



static struct fec_platform_data fec_pdata[2];



static void imx6sx_fec1_sleep_enable(int enabled)

{

	struct regmap *gpr;



	gpr = syscon_regmap_lookup_by_compatible("fsl,imx6sx-iomuxc-gpr");

	if (!IS_ERR(gpr)) {

		if (enabled)

			regmap_update_bits(gpr, IOMUXC_GPR4,

					   IMX6SX_GPR4_FEC_ENET1_STOP_REQ,

					   IMX6SX_GPR4_FEC_ENET1_STOP_REQ);

		else

			regmap_update_bits(gpr, IOMUXC_GPR4,

					   IMX6SX_GPR4_FEC_ENET1_STOP_REQ, 0);

	} else

		pr_err("failed to find fsl,imx6sx-iomux-gpr regmap\n");

}



static void imx6sx_fec2_sleep_enable(int enabled)

{

	struct regmap *gpr;



	gpr = syscon_regmap_lookup_by_compatible("fsl,imx6sx-iomuxc-gpr");

	if (!IS_ERR(gpr)) {

		if (enabled)

			regmap_update_bits(gpr, IOMUXC_GPR4,

					   IMX6SX_GPR4_FEC_ENET2_STOP_REQ,

					   IMX6SX_GPR4_FEC_ENET2_STOP_REQ);

		else

			regmap_update_bits(gpr, IOMUXC_GPR4,

					   IMX6SX_GPR4_FEC_ENET2_STOP_REQ, 0);

	} else

		pr_err("failed to find fsl,imx6sx-iomux-gpr regmap\n");

}



static void __init imx6sx_enet_plt_init(void)

{

	struct device_node *np;



	np = of_find_node_by_path("/soc/aips-bus@02100000/ethernet@02188000");

	if (np && of_get_property(np, "fsl,magic-packet", NULL))

		fec_pdata[0].sleep_mode_enable = imx6sx_fec1_sleep_enable;

	np = of_find_node_by_path("/soc/aips-bus@02100000/ethernet@021b4000");

	if (np && of_get_property(np, "fsl,magic-packet", NULL))

		fec_pdata[1].sleep_mode_enable = imx6sx_fec2_sleep_enable;

}



static int ar8031_phy_fixup(struct phy_device *dev)

{

	u16 val;