diff --git a/drivers/net/wireless/ti/Kconfig b/drivers/net/wireless/ti/Kconfig
index 75722d81188ce4fc6b131350b781719fbaf31a12..1e8d04b56c9a968d44fae7ba3cf5c1408703dab4 100644
--- a/drivers/net/wireless/ti/Kconfig
+++ b/drivers/net/wireless/ti/Kconfig
@@ -7,5 +7,5 @@ menuconfig WL_TI
 
 if WL_TI
 source "drivers/net/wireless/ti/wl1251/Kconfig"
-source "drivers/net/wireless/ti/wl12xx/Kconfig"
+source "drivers/net/wireless/ti/wlcore/Kconfig"
 endif # WL_TI
diff --git a/drivers/net/wireless/ti/Makefile b/drivers/net/wireless/ti/Makefile
index db2cb03f6f98b89a74dbe9841502cd08cd478a28..10919dbd875d6e6a1f076b71cfc8dd7a80c2f31a 100644
--- a/drivers/net/wireless/ti/Makefile
+++ b/drivers/net/wireless/ti/Makefile
@@ -1,3 +1,3 @@
-obj-$(CONFIG_WL12XX)			+= wl12xx/
-obj-$(CONFIG_WL12XX_PLATFORM_DATA)	+= wl12xx/
+obj-$(CONFIG_WL12XX)			+= wlcore/
+obj-$(CONFIG_WL12XX_PLATFORM_DATA)	+= wlcore/
 obj-$(CONFIG_WL1251)			+= wl1251/
diff --git a/drivers/net/wireless/ti/wl12xx/Kconfig b/drivers/net/wireless/ti/wlcore/Kconfig
similarity index 100%
rename from drivers/net/wireless/ti/wl12xx/Kconfig
rename to drivers/net/wireless/ti/wlcore/Kconfig
diff --git a/drivers/net/wireless/ti/wl12xx/Makefile b/drivers/net/wireless/ti/wlcore/Makefile
similarity index 100%
rename from drivers/net/wireless/ti/wl12xx/Makefile
rename to drivers/net/wireless/ti/wlcore/Makefile
diff --git a/drivers/net/wireless/ti/wl12xx/acx.c b/drivers/net/wireless/ti/wlcore/acx.c
similarity index 100%
rename from drivers/net/wireless/ti/wl12xx/acx.c
rename to drivers/net/wireless/ti/wlcore/acx.c
diff --git a/drivers/net/wireless/ti/wl12xx/acx.h b/drivers/net/wireless/ti/wlcore/acx.h
similarity index 100%
rename from drivers/net/wireless/ti/wl12xx/acx.h
rename to drivers/net/wireless/ti/wlcore/acx.h
diff --git a/drivers/net/wireless/ti/wl12xx/boot.c b/drivers/net/wireless/ti/wlcore/boot.c
similarity index 100%
rename from drivers/net/wireless/ti/wl12xx/boot.c
rename to drivers/net/wireless/ti/wlcore/boot.c
diff --git a/drivers/net/wireless/ti/wl12xx/boot.h b/drivers/net/wireless/ti/wlcore/boot.h
similarity index 100%
rename from drivers/net/wireless/ti/wl12xx/boot.h
rename to drivers/net/wireless/ti/wlcore/boot.h
diff --git a/drivers/net/wireless/ti/wl12xx/cmd.c b/drivers/net/wireless/ti/wlcore/cmd.c
similarity index 100%
rename from drivers/net/wireless/ti/wl12xx/cmd.c
rename to drivers/net/wireless/ti/wlcore/cmd.c
diff --git a/drivers/net/wireless/ti/wl12xx/cmd.h b/drivers/net/wireless/ti/wlcore/cmd.h
similarity index 100%
rename from drivers/net/wireless/ti/wl12xx/cmd.h
rename to drivers/net/wireless/ti/wlcore/cmd.h
diff --git a/drivers/net/wireless/ti/wl12xx/conf.h b/drivers/net/wireless/ti/wlcore/conf.h
similarity index 100%
rename from drivers/net/wireless/ti/wl12xx/conf.h
rename to drivers/net/wireless/ti/wlcore/conf.h
diff --git a/drivers/net/wireless/ti/wl12xx/debug.h b/drivers/net/wireless/ti/wlcore/debug.h
similarity index 100%
rename from drivers/net/wireless/ti/wl12xx/debug.h
rename to drivers/net/wireless/ti/wlcore/debug.h
diff --git a/drivers/net/wireless/ti/wl12xx/debugfs.c b/drivers/net/wireless/ti/wlcore/debugfs.c
similarity index 100%
rename from drivers/net/wireless/ti/wl12xx/debugfs.c
rename to drivers/net/wireless/ti/wlcore/debugfs.c
diff --git a/drivers/net/wireless/ti/wl12xx/debugfs.h b/drivers/net/wireless/ti/wlcore/debugfs.h
similarity index 100%
rename from drivers/net/wireless/ti/wl12xx/debugfs.h
rename to drivers/net/wireless/ti/wlcore/debugfs.h
diff --git a/drivers/net/wireless/ti/wl12xx/event.c b/drivers/net/wireless/ti/wlcore/event.c
similarity index 100%
rename from drivers/net/wireless/ti/wl12xx/event.c
rename to drivers/net/wireless/ti/wlcore/event.c
diff --git a/drivers/net/wireless/ti/wl12xx/event.h b/drivers/net/wireless/ti/wlcore/event.h
similarity index 100%
rename from drivers/net/wireless/ti/wl12xx/event.h
rename to drivers/net/wireless/ti/wlcore/event.h
diff --git a/drivers/net/wireless/ti/wl12xx/ini.h b/drivers/net/wireless/ti/wlcore/ini.h
similarity index 100%
rename from drivers/net/wireless/ti/wl12xx/ini.h
rename to drivers/net/wireless/ti/wlcore/ini.h
diff --git a/drivers/net/wireless/ti/wl12xx/init.c b/drivers/net/wireless/ti/wlcore/init.c
similarity index 100%
rename from drivers/net/wireless/ti/wl12xx/init.c
rename to drivers/net/wireless/ti/wlcore/init.c
diff --git a/drivers/net/wireless/ti/wl12xx/init.h b/drivers/net/wireless/ti/wlcore/init.h
similarity index 100%
rename from drivers/net/wireless/ti/wl12xx/init.h
rename to drivers/net/wireless/ti/wlcore/init.h
diff --git a/drivers/net/wireless/ti/wl12xx/io.c b/drivers/net/wireless/ti/wlcore/io.c
similarity index 100%
rename from drivers/net/wireless/ti/wl12xx/io.c
rename to drivers/net/wireless/ti/wlcore/io.c
diff --git a/drivers/net/wireless/ti/wl12xx/io.h b/drivers/net/wireless/ti/wlcore/io.h
similarity index 100%
rename from drivers/net/wireless/ti/wl12xx/io.h
rename to drivers/net/wireless/ti/wlcore/io.h
diff --git a/drivers/net/wireless/ti/wl12xx/main.c b/drivers/net/wireless/ti/wlcore/main.c
similarity index 100%
rename from drivers/net/wireless/ti/wl12xx/main.c
rename to drivers/net/wireless/ti/wlcore/main.c
diff --git a/drivers/net/wireless/ti/wl12xx/ps.c b/drivers/net/wireless/ti/wlcore/ps.c
similarity index 100%
rename from drivers/net/wireless/ti/wl12xx/ps.c
rename to drivers/net/wireless/ti/wlcore/ps.c
diff --git a/drivers/net/wireless/ti/wl12xx/ps.h b/drivers/net/wireless/ti/wlcore/ps.h
similarity index 100%
rename from drivers/net/wireless/ti/wl12xx/ps.h
rename to drivers/net/wireless/ti/wlcore/ps.h
diff --git a/drivers/net/wireless/ti/wl12xx/reg.h b/drivers/net/wireless/ti/wlcore/reg.h
similarity index 100%
rename from drivers/net/wireless/ti/wl12xx/reg.h
rename to drivers/net/wireless/ti/wlcore/reg.h
diff --git a/drivers/net/wireless/ti/wl12xx/rx.c b/drivers/net/wireless/ti/wlcore/rx.c
similarity index 100%
rename from drivers/net/wireless/ti/wl12xx/rx.c
rename to drivers/net/wireless/ti/wlcore/rx.c
diff --git a/drivers/net/wireless/ti/wl12xx/rx.h b/drivers/net/wireless/ti/wlcore/rx.h
similarity index 100%
rename from drivers/net/wireless/ti/wl12xx/rx.h
rename to drivers/net/wireless/ti/wlcore/rx.h
diff --git a/drivers/net/wireless/ti/wl12xx/scan.c b/drivers/net/wireless/ti/wlcore/scan.c
similarity index 100%
rename from drivers/net/wireless/ti/wl12xx/scan.c
rename to drivers/net/wireless/ti/wlcore/scan.c
diff --git a/drivers/net/wireless/ti/wl12xx/scan.h b/drivers/net/wireless/ti/wlcore/scan.h
similarity index 100%
rename from drivers/net/wireless/ti/wl12xx/scan.h
rename to drivers/net/wireless/ti/wlcore/scan.h
diff --git a/drivers/net/wireless/ti/wl12xx/sdio.c b/drivers/net/wireless/ti/wlcore/sdio.c
similarity index 100%
rename from drivers/net/wireless/ti/wl12xx/sdio.c
rename to drivers/net/wireless/ti/wlcore/sdio.c
diff --git a/drivers/net/wireless/ti/wl12xx/spi.c b/drivers/net/wireless/ti/wlcore/spi.c
similarity index 100%
rename from drivers/net/wireless/ti/wl12xx/spi.c
rename to drivers/net/wireless/ti/wlcore/spi.c
diff --git a/drivers/net/wireless/ti/wl12xx/testmode.c b/drivers/net/wireless/ti/wlcore/testmode.c
similarity index 100%
rename from drivers/net/wireless/ti/wl12xx/testmode.c
rename to drivers/net/wireless/ti/wlcore/testmode.c
diff --git a/drivers/net/wireless/ti/wl12xx/testmode.h b/drivers/net/wireless/ti/wlcore/testmode.h
similarity index 100%
rename from drivers/net/wireless/ti/wl12xx/testmode.h
rename to drivers/net/wireless/ti/wlcore/testmode.h
diff --git a/drivers/net/wireless/ti/wl12xx/tx.c b/drivers/net/wireless/ti/wlcore/tx.c
similarity index 100%
rename from drivers/net/wireless/ti/wl12xx/tx.c
rename to drivers/net/wireless/ti/wlcore/tx.c
diff --git a/drivers/net/wireless/ti/wl12xx/tx.h b/drivers/net/wireless/ti/wlcore/tx.h
similarity index 100%
rename from drivers/net/wireless/ti/wl12xx/tx.h
rename to drivers/net/wireless/ti/wlcore/tx.h
diff --git a/drivers/net/wireless/ti/wl12xx/wl12xx.h b/drivers/net/wireless/ti/wlcore/wl12xx.h
similarity index 100%
rename from drivers/net/wireless/ti/wl12xx/wl12xx.h
rename to drivers/net/wireless/ti/wlcore/wl12xx.h
diff --git a/drivers/net/wireless/ti/wl12xx/wl12xx_80211.h b/drivers/net/wireless/ti/wlcore/wl12xx_80211.h
similarity index 100%
rename from drivers/net/wireless/ti/wl12xx/wl12xx_80211.h
rename to drivers/net/wireless/ti/wlcore/wl12xx_80211.h
diff --git a/drivers/net/wireless/ti/wl12xx/wl12xx_platform_data.c b/drivers/net/wireless/ti/wlcore/wl12xx_platform_data.c
similarity index 100%
rename from drivers/net/wireless/ti/wl12xx/wl12xx_platform_data.c
rename to drivers/net/wireless/ti/wlcore/wl12xx_platform_data.c