From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from az33egw02.freescale.net (az33egw02.freescale.net [192.88.158.103]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "az33egw02.freescale.net", Issuer "Thawte Premium Server CA" (verified OK)) by ozlabs.org (Postfix) with ESMTP id 00E63DE13C for ; Tue, 8 May 2007 04:30:03 +1000 (EST) Received: from az33smr02.freescale.net (az33smr02.freescale.net [10.64.34.200]) by az33egw02.freescale.net (8.12.11/az33egw02) with ESMTP id l47ITxmB029794 for ; Mon, 7 May 2007 11:29:59 -0700 (MST) Received: from mailserv2.am.freescale.net (mailserv2.am.freescale.net [10.82.65.62]) by az33smr02.freescale.net (8.13.1/8.13.0) with ESMTP id l47ITwmb017550 for ; Mon, 7 May 2007 13:29:58 -0500 (CDT) Received: from ld0162-tx32.am.freescale.net (ld0162-tx32 [10.82.19.112]) by mailserv2.am.freescale.net (8.13.3/8.13.3) with ESMTP id l47I8CxK022266 for ; Mon, 7 May 2007 13:08:12 -0500 (CDT) Received: from ld0162-tx32.am.freescale.net (localhost [127.0.0.1]) by ld0162-tx32.am.freescale.net (Postfix) with ESMTP id D9BABAEFC9 for ; Mon, 7 May 2007 13:29:57 -0500 (CDT) Received: (from b07421@localhost) by ld0162-tx32.am.freescale.net (8.12.11/8.12.11/Submit) id l47ITvkv026970 for linuxppc-dev@ozlabs.org; Mon, 7 May 2007 13:29:57 -0500 Date: Mon, 7 May 2007 13:29:57 -0500 From: Scott Wood To: linuxppc-dev@ozlabs.org Subject: [PATCH 12/13] gianfar: Add flags for magic packet and MDIO. Message-ID: <20070507182957.GK26920@ld0162-tx32.am.freescale.net> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii In-Reply-To: <20070507182907.GA26897@ld0162-tx32.am.freescale.net> List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , The magic packet flag indicates that the hardware has this capability. The MDIO flag indicates that this device's registers contain active MDIO registers, and thus this device should not be put to sleep. Signed-off-by: Scott Wood --- arch/powerpc/sysdev/fsl_soc.c | 7 +++++++ include/linux/fsl_devices.h | 2 ++ 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/arch/powerpc/sysdev/fsl_soc.c b/arch/powerpc/sysdev/fsl_soc.c index 1fd9f51..528c0ca 100644 --- a/arch/powerpc/sysdev/fsl_soc.c +++ b/arch/powerpc/sysdev/fsl_soc.c @@ -302,6 +302,9 @@ static int __init gfar_of_init(void) FSL_GIANFAR_DEV_HAS_VLAN | FSL_GIANFAR_DEV_HAS_EXTENDED_HASH; + if (of_get_property(np, "fsl,magic-packet", NULL)) + gfar_data.device_flags |= FSL_GIANFAR_DEV_HAS_MAGIC_PACKET; + ph = of_get_property(np, "phy-handle", NULL); phy = of_find_node_by_phandle(*ph); @@ -323,6 +326,10 @@ static int __init gfar_of_init(void) gfar_data.phy_id = *id; gfar_data.bus_id = res.start; + if (res.start >= gfar_dev->resource[0].start && + res.start < gfar_dev->resource[0].end) + gfar_data.device_flags |= FSL_GIANFAR_DEV_HAS_MDIO; + of_node_put(phy); of_node_put(mdio); diff --git a/include/linux/fsl_devices.h b/include/linux/fsl_devices.h index 9bded66..e7eac86 100644 --- a/include/linux/fsl_devices.h +++ b/include/linux/fsl_devices.h @@ -86,6 +86,8 @@ struct gianfar_mdio_data { #define FSL_GIANFAR_DEV_HAS_VLAN 0x00000020 #define FSL_GIANFAR_DEV_HAS_EXTENDED_HASH 0x00000040 #define FSL_GIANFAR_DEV_HAS_PADDING 0x00000080 +#define FSL_GIANFAR_DEV_HAS_MAGIC_PACKET 0x00000100 +#define FSL_GIANFAR_DEV_HAS_MDIO 0x00000200 /* Flags in gianfar_platform_data */ #define FSL_GIANFAR_BRD_HAS_PHY_INTR 0x00000001 /* set or use a timer */ -- 1.5.0.3