From patchwork Sat Aug 13 07:56:29 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kirsher, Jeffrey T" X-Patchwork-Id: 109914 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 9E37CB6F7E for ; Sat, 13 Aug 2011 17:57:15 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751877Ab1HMH4s (ORCPT ); Sat, 13 Aug 2011 03:56:48 -0400 Received: from mga09.intel.com ([134.134.136.24]:3492 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751416Ab1HMH4l (ORCPT ); Sat, 13 Aug 2011 03:56:41 -0400 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga102.jf.intel.com with ESMTP; 13 Aug 2011 00:56:41 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.67,351,1309762800"; d="scan'208";a="37410180" Received: from unknown (HELO jtkirshe-mobl.amr.corp.intel.com) ([10.255.14.227]) by orsmga002.jf.intel.com with ESMTP; 13 Aug 2011 00:56:40 -0700 From: Jeff Kirsher To: davem@davemloft.net Cc: Jeff Kirsher , netdev@vger.kernel.org, gospo@redhat.com, sassmann@redhat.com, Claudio Lanconelli Subject: [net-next 05/12] enc28j60: Move the Microchip driver Date: Sat, 13 Aug 2011 00:56:29 -0700 Message-Id: <1313222196-10074-6-git-send-email-jeffrey.t.kirsher@intel.com> X-Mailer: git-send-email 1.7.6 In-Reply-To: <1313222196-10074-1-git-send-email-jeffrey.t.kirsher@intel.com> References: <1313222196-10074-1-git-send-email-jeffrey.t.kirsher@intel.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Move the Microchip driver into drivers/net/ethernet/microchip/ and make the necessary Kconfig and Makefile changes. CC: Claudio Lanconelli Signed-off-by: Jeff Kirsher --- drivers/net/Kconfig | 17 --------- drivers/net/Makefile | 1 - drivers/net/ethernet/Kconfig | 1 + drivers/net/ethernet/Makefile | 1 + drivers/net/ethernet/microchip/Kconfig | 37 ++++++++++++++++++++ drivers/net/ethernet/microchip/Makefile | 5 +++ drivers/net/{ => ethernet/microchip}/enc28j60.c | 0 drivers/net/{ => ethernet/microchip}/enc28j60_hw.h | 0 8 files changed, 44 insertions(+), 18 deletions(-) create mode 100644 drivers/net/ethernet/microchip/Kconfig create mode 100644 drivers/net/ethernet/microchip/Makefile rename drivers/net/{ => ethernet/microchip}/enc28j60.c (100%) rename drivers/net/{ => ethernet/microchip}/enc28j60_hw.h (100%) diff --git a/drivers/net/enc28j60.c b/drivers/net/ethernet/microchip/enc28j60.c similarity index 100% rename from drivers/net/enc28j60.c rename to drivers/net/ethernet/microchip/enc28j60.c diff --git a/drivers/net/enc28j60_hw.h b/drivers/net/ethernet/microchip/enc28j60_hw.h similarity index 100% rename from drivers/net/enc28j60_hw.h rename to drivers/net/ethernet/microchip/enc28j60_hw.h diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 75ca0da..e83f559 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -274,23 +274,6 @@ config DM9000_FORCE_SIMPLE_PHY_POLL costly MII PHY reads. Note, this will not work if the chip is operating with an external PHY. -config ENC28J60 - tristate "ENC28J60 support" - depends on EXPERIMENTAL && SPI && NET_ETHERNET - select CRC32 - ---help--- - Support for the Microchip EN28J60 ethernet chip. - - To compile this driver as a module, choose M here. The module will be - called enc28j60. - -config ENC28J60_WRITEVERIFY - bool "Enable write verify" - depends on ENC28J60 - ---help--- - Enable the verify after the buffer write useful for debugging purpose. - If unsure, say N. - config NET_PCI bool "EISA, VLB, PCI and on board controllers" depends on ISA || EISA || PCI diff --git a/drivers/net/Makefile b/drivers/net/Makefile index e2f1f55..08ee56f 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -53,7 +53,6 @@ obj-$(CONFIG_TUN) += tun.o obj-$(CONFIG_VETH) += veth.o obj-$(CONFIG_NET_NETX) += netx-eth.o obj-$(CONFIG_DM9000) += dm9000.o -obj-$(CONFIG_ENC28J60) += enc28j60.o obj-$(CONFIG_DEV_APPLETALK) += appletalk/ obj-$(CONFIG_ETHERNET) += ethernet/ diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig index 32561c7..0cec25c 100644 --- a/drivers/net/ethernet/Kconfig +++ b/drivers/net/ethernet/Kconfig @@ -78,6 +78,7 @@ config LANTIQ_ETOP source "drivers/net/ethernet/marvell/Kconfig" source "drivers/net/ethernet/mellanox/Kconfig" source "drivers/net/ethernet/micrel/Kconfig" +source "drivers/net/ethernet/microchip/Kconfig" config MIPS_SIM_NET tristate "MIPS simulator Network device" diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile index 94f1be8..ebe8aee 100644 --- a/drivers/net/ethernet/Makefile +++ b/drivers/net/ethernet/Makefile @@ -36,6 +36,7 @@ obj-$(CONFIG_LANTIQ_ETOP) += lantiq_etop.o obj-$(CONFIG_NET_VENDOR_MARVELL) += marvell/ obj-$(CONFIG_NET_VENDOR_MELLANOX) += mellanox/ obj-$(CONFIG_NET_VENDOR_MICREL) += micrel/ +obj-$(CONFIG_NET_VENDOR_MICROCHIP) += microchip/ obj-$(CONFIG_MIPS_SIM_NET) += mipsnet.o obj-$(CONFIG_NET_VENDOR_MYRI) += myricom/ obj-$(CONFIG_FEALNX) += fealnx.o diff --git a/drivers/net/ethernet/microchip/Kconfig b/drivers/net/ethernet/microchip/Kconfig new file mode 100644 index 0000000..53b0b04 --- /dev/null +++ b/drivers/net/ethernet/microchip/Kconfig @@ -0,0 +1,37 @@ +# +# Microchip network device configuration +# + +config NET_VENDOR_MICROCHIP + bool "Microchip devices" + depends on SPI && EXPERIMENTAL + ---help--- + If you have a network (Ethernet) card belonging to this class, say Y + and read the Ethernet-HOWTO, available from + . + + Note that the answer to this question doesn't directly affect the + kernel: saying N will just cause the configurator to skip all + the questions about Microchip cards. If you say Y, you will be asked + for your specific card in the following questions. + +if NET_VENDOR_MICROCHIP + +config ENC28J60 + tristate "ENC28J60 support" + depends on SPI && EXPERIMENTAL + select CRC32 + ---help--- + Support for the Microchip EN28J60 ethernet chip. + + To compile this driver as a module, choose M here. The module will be + called enc28j60. + +config ENC28J60_WRITEVERIFY + bool "Enable write verify" + depends on ENC28J60 + ---help--- + Enable the verify after the buffer write useful for debugging purpose. + If unsure, say N. + +endif # NET_VENDOR_MICROCHIP diff --git a/drivers/net/ethernet/microchip/Makefile b/drivers/net/ethernet/microchip/Makefile new file mode 100644 index 0000000..573d429 --- /dev/null +++ b/drivers/net/ethernet/microchip/Makefile @@ -0,0 +1,5 @@ +# +# Makefile for the Microchip network device drivers. +# + +obj-$(CONFIG_ENC28J60) += enc28j60.o