Skip to content

Commit

Permalink
Revert "ARM: imx: add FEC sleep mode callback function"
Browse files Browse the repository at this point in the history 
i.MX platform maintainer Shawn Guo is not happy with the such commit as
explained below [1]:

"The GPR difference between SoCs can be encoded in device tree as well.
It's pointless to repeat the same code pattern for every single
platform, that need to set up GPR bits for enabling magic packet wake
up, while the only difference is the register and bit offset.

The platform code will become quite messy and unmaintainable if every
device driver dump their GPR register setup code into platform.

Sorry, but it's NACK from me."

This reverts commit 456062b ("ARM: imx: add FEC sleep mode callback
function").

[1] http://www.spinics.net/lists/netdev/msg310922.html

Signed-off-by: Fabio Estevam <[email protected]>
Acked-by: Shawn Guo <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
  • Loading branch information
@davem330
Fabio Estevam authored and davem330 committed Jan 9, 2015
1 parent 0bec3b7 commit 99b164a
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 90 deletions.
41 changes: 1 addition & 40 deletions arch/arm/mach-imx/mach-imx6q.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@
#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>
Expand All @@ -41,35 +39,6 @@
#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)
{
Expand Down Expand Up @@ -292,12 +261,6 @@ 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;
Expand All @@ -311,13 +274,11 @@ static void __init imx6q_init_machine(void)

imx6q_enet_phy_init();

of_platform_populate(NULL, of_default_bus_match_table,
imx6q_auxdata_lookup, parent);
of_platform_populate(NULL, of_default_bus_match_table, NULL, parent);

imx_anatop_init();
cpu_is_imx6q() ? imx6q_pm_init() : imx6dl_pm_init();
imx6q_1588_init();
imx6q_enet_plt_init();
imx6q_axi_init();
}

Expand Down
50 changes: 0 additions & 50 deletions arch/arm/mach-imx/mach-imx6sx.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,62 +12,12 @@
#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;
Expand Down

0 comments on commit 99b164a

Please sign in to comment.