Rename sun4i_wemac to sunxi_emac

This patch renames sun4i/wemac to allwinner/sunxi_emac Signed-off-by: Oliver Schinagl <[email protected]> Signed-off-by: Hans de Goede <[email protected]>
waxiangzi · Jul 29, 2013 · bd28eb7 · bd28eb7
1 parent 256c4cd
commit bd28eb7
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 13 deletions.
diff --git a/arch/arm/configs/sun4i_crane_defconfig b/arch/arm/configs/sun4i_crane_defconfig
@@ -158,7 +158,7 @@ CONFIG_DM_MULTIPATH=y
 CONFIG_DM_MULTIPATH_QL=y
 CONFIG_DM_MULTIPATH_ST=y
 CONFIG_NETDEVICES=y
-CONFIG_WEMAC_SUN4I=y
+CONFIG_SUNXI_EMAC=y
 CONFIG_PHYLIB=y
 CONFIG_PPP=y
 CONFIG_PPP_BSDCOMP=y

diff --git a/arch/arm/configs/sun4i_defconfig b/arch/arm/configs/sun4i_defconfig
@@ -116,7 +116,7 @@ CONFIG_ATA=y
 CONFIG_SATA_AHCI_PLATFORM=y
 CONFIG_SW_SATA_AHCI_PLATFORM=m
 CONFIG_NETDEVICES=y
-CONFIG_WEMAC_SUN4I=y
+CONFIG_SUNXI_EMAC=y
 CONFIG_PHYLIB=y
 CONFIG_RTL8192CU_SW=m
 CONFIG_INPUT_FF_MEMLESS=y

diff --git a/arch/arm/configs/sun5i_defconfig b/arch/arm/configs/sun5i_defconfig
@@ -96,7 +96,7 @@ CONFIG_BLK_DEV_SR=y
 CONFIG_BLK_DEV_SR_VENDOR=y
 CONFIG_SCSI_MULTI_LUN=y
 CONFIG_NETDEVICES=y
-CONFIG_WEMAC_SUN4I=y
+CONFIG_SUNXI_EMAC=y
 CONFIG_PHYLIB=y
 CONFIG_INPUT_FF_MEMLESS=y
 CONFIG_INPUT_POLLDEV=y

diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
@@ -178,15 +178,19 @@ config WEMAC_SUN3I
 	  To compile this driver as a module, choose M here.  The module
 	  will be called wemac.
 
-config WEMAC_SUN4I
-        tristate "wemac support(A1x)"
+config SUNXI_EMAC
+        tristate "Allwinner Ethernet MAC support"
         depends on ARCH_SUN4I || ARCH_SUN5I || ARCH_SUN7I
 	select MII
         ---help---
-          Support for Softwinner chipset.
+          Support for Allwinner sunxi Ethernet MAC chipset support.
+	  Currently known working chipsets are:
+	    * sun4i (A10)
+	    * sun5i (A10s)
+	    * sun7i (A20)
 
           To compile this driver as a module, choose M here.  The module
-          will be called wemac.
+          will be called sunxi_emac.
 
 source "drivers/net/ethernet/tehuti/Kconfig"
 source "drivers/net/ethernet/ti/Kconfig"

diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
@@ -67,8 +67,8 @@ obj-$(CONFIG_NET_VENDOR_SGI) += sgi/
 obj-$(CONFIG_NET_VENDOR_SMSC) += smsc/
 obj-$(CONFIG_NET_VENDOR_STMICRO) += stmicro/
 obj-$(CONFIG_NET_VENDOR_SUN) += sun/
-obj-$(CONFIG_WEMAC_SUN3I) += sun4i/
-obj-$(CONFIG_WEMAC_SUN4I) += sun4i/
+obj-$(CONFIG_WEMAC_SUN3I) += sun3i/
+obj-$(CONFIG_SUNXI_EMAC) += allwinner/
 obj-$(CONFIG_NET_VENDOR_TEHUTI) += tehuti/
 obj-$(CONFIG_NET_VENDOR_TI) += ti/
 obj-$(CONFIG_TILE_NET) += tile/

diff --git a/drivers/net/ethernet/allwinner/Makefile b/drivers/net/ethernet/allwinner/Makefile
@@ -0,0 +1,3 @@
+obj-$(CONFIG_SUNXI_EMAC) += sunxi_emac.o
+
+
diff --git a/drivers/net/ethernet/sun4i/emac_readme.txt → ...rs/net/ethernet/allwinner/emac_readme.txt b/drivers/net/ethernet/sun4i/emac_readme.txt → ...rs/net/ethernet/allwinner/emac_readme.txt
diff --git a/drivers/net/ethernet/sun4i/sun4i_wemac.c → drivers/net/ethernet/allwinner/sunxi_emac.c b/drivers/net/ethernet/sun4i/sun4i_wemac.c → drivers/net/ethernet/allwinner/sunxi_emac.c
@@ -48,7 +48,7 @@
 #include <plat/system.h>
 #include <mach/clock.h>
 
-#include "sun4i_wemac.h"
+#include "sunxi_emac.h"
 
 /* Board/System/Debug information/definition ---------------- */
 

diff --git a/drivers/net/ethernet/sun4i/sun4i_wemac.h → drivers/net/ethernet/allwinner/sunxi_emac.h b/drivers/net/ethernet/sun4i/sun4i_wemac.h → drivers/net/ethernet/allwinner/sunxi_emac.h
diff --git a/drivers/net/ethernet/sun4i/Makefile b/drivers/net/ethernet/sun4i/Makefile