diff --git a/drivers/mxc/amd-gpu/Makefile b/drivers/mxc/amd-gpu/Makefile
index 981d2599a93..5629c56b121 100644
--- a/drivers/mxc/amd-gpu/Makefile
+++ b/drivers/mxc/amd-gpu/Makefile
@@ -3,26 +3,26 @@ EXTRA_CFLAGS := \
 	-I$(obj)/include/api
 
 obj-$(CONFIG_MXC_AMD_GPU) += gpu.o
-gpu-objs += 	gsl_cmdstream.o \
-		gsl_cmdwindow.o \
-		gsl_context.o \
-		gsl_device.o \
-		gsl_drawctxt.o \
-		gsl_driver.o \
-		gsl_g12.o \
-		gsl_intrmgr.o \
-		gsl_memmgr.o \
-		gsl_mmu.o \
-		gsl_ringbuffer.o \
-		gsl_sharedmem.o \
-		gsl_yamato.o \
-		gsl_linux_map.o \
-		gsl_kmod.o \
-		gsl_hal.o \
-		gsl_kmod_cleanup.o \
-		misc.o
+gpu-objs += 	kgsl_cmdstream.o \
+		kgsl_cmdwindow.o \
+		kgsl_context.o \
+		kgsl_device.o \
+		kgsl_drawctxt.o \
+		kgsl_driver.o \
+		kgsl_g12.o \
+		kgsl_intrmgr.o \
+		kgsl_memmgr.o \
+		kgsl_mmu.o \
+		kgsl_ringbuffer.o \
+		kgsl_sharedmem.o \
+		kgsl_yamato.o \
+		kgsl_linux_map.o \
+		kgsl_kmod.o \
+		kgsl_hal.o \
+		kgsl_kmod_cleanup.o \
+		kgsl_pwrctrl.o
 
 ifdef CONFIG_MXC_AMD_GPU_LOGGING
-gpu-objs += gsl_log.o
+gpu-objs += kgsl_log.o
 EXTRA_CFLAGS += -DGSL_LOG
 endif
diff --git a/drivers/mxc/amd-gpu/gsl_cmdstream.c b/drivers/mxc/amd-gpu/kgsl_cmdstream.c
similarity index 100%
rename from drivers/mxc/amd-gpu/gsl_cmdstream.c
rename to drivers/mxc/amd-gpu/kgsl_cmdstream.c
diff --git a/drivers/mxc/amd-gpu/gsl_cmdwindow.c b/drivers/mxc/amd-gpu/kgsl_cmdwindow.c
similarity index 100%
rename from drivers/mxc/amd-gpu/gsl_cmdwindow.c
rename to drivers/mxc/amd-gpu/kgsl_cmdwindow.c
diff --git a/drivers/mxc/amd-gpu/gsl_context.c b/drivers/mxc/amd-gpu/kgsl_context.c
similarity index 100%
rename from drivers/mxc/amd-gpu/gsl_context.c
rename to drivers/mxc/amd-gpu/kgsl_context.c
diff --git a/drivers/mxc/amd-gpu/gsl_debug_pm4.c b/drivers/mxc/amd-gpu/kgsl_debug_pm4.c
similarity index 100%
rename from drivers/mxc/amd-gpu/gsl_debug_pm4.c
rename to drivers/mxc/amd-gpu/kgsl_debug_pm4.c
diff --git a/drivers/mxc/amd-gpu/gsl_device.c b/drivers/mxc/amd-gpu/kgsl_device.c
similarity index 100%
rename from drivers/mxc/amd-gpu/gsl_device.c
rename to drivers/mxc/amd-gpu/kgsl_device.c
diff --git a/drivers/mxc/amd-gpu/gsl_drawctxt.c b/drivers/mxc/amd-gpu/kgsl_drawctxt.c
similarity index 100%
rename from drivers/mxc/amd-gpu/gsl_drawctxt.c
rename to drivers/mxc/amd-gpu/kgsl_drawctxt.c
diff --git a/drivers/mxc/amd-gpu/gsl_driver.c b/drivers/mxc/amd-gpu/kgsl_driver.c
similarity index 100%
rename from drivers/mxc/amd-gpu/gsl_driver.c
rename to drivers/mxc/amd-gpu/kgsl_driver.c
diff --git a/drivers/mxc/amd-gpu/gsl_g12.c b/drivers/mxc/amd-gpu/kgsl_g12.c
similarity index 100%
rename from drivers/mxc/amd-gpu/gsl_g12.c
rename to drivers/mxc/amd-gpu/kgsl_g12.c
diff --git a/drivers/mxc/amd-gpu/gsl_hal.c b/drivers/mxc/amd-gpu/kgsl_hal.c
similarity index 100%
rename from drivers/mxc/amd-gpu/gsl_hal.c
rename to drivers/mxc/amd-gpu/kgsl_hal.c
diff --git a/drivers/mxc/amd-gpu/gsl_intrmgr.c b/drivers/mxc/amd-gpu/kgsl_intrmgr.c
similarity index 100%
rename from drivers/mxc/amd-gpu/gsl_intrmgr.c
rename to drivers/mxc/amd-gpu/kgsl_intrmgr.c
diff --git a/drivers/mxc/amd-gpu/gsl_kmod.c b/drivers/mxc/amd-gpu/kgsl_kmod.c
similarity index 99%
rename from drivers/mxc/amd-gpu/gsl_kmod.c
rename to drivers/mxc/amd-gpu/kgsl_kmod.c
index 495fbb1105a..1170c552f0b 100644
--- a/drivers/mxc/amd-gpu/gsl_kmod.c
+++ b/drivers/mxc/amd-gpu/kgsl_kmod.c
@@ -21,7 +21,7 @@
 #include "gsl_buildconfig.h"
 #include "gsl_halconfig.h"
 #include "gsl_ioctl.h"
-#include "gsl_kmod_cleanup.h"
+#include "kgsl_kmod_cleanup.h"
 #include "gsl_linux_map.h"
 
 #include <linux/version.h>
diff --git a/drivers/mxc/amd-gpu/gsl_kmod_cleanup.c b/drivers/mxc/amd-gpu/kgsl_kmod_cleanup.c
similarity index 99%
rename from drivers/mxc/amd-gpu/gsl_kmod_cleanup.c
rename to drivers/mxc/amd-gpu/kgsl_kmod_cleanup.c
index fd855a1aac6..000c80952a1 100644
--- a/drivers/mxc/amd-gpu/gsl_kmod_cleanup.c
+++ b/drivers/mxc/amd-gpu/kgsl_kmod_cleanup.c
@@ -17,7 +17,7 @@
  */
  
 #include "gsl.h"
-#include "gsl_kmod_cleanup.h"
+#include "kgsl_kmod_cleanup.h"
 
 #include <linux/kernel.h>
 #include <linux/fs.h>
diff --git a/drivers/mxc/amd-gpu/gsl_kmod_cleanup.h b/drivers/mxc/amd-gpu/kgsl_kmod_cleanup.h
similarity index 100%
rename from drivers/mxc/amd-gpu/gsl_kmod_cleanup.h
rename to drivers/mxc/amd-gpu/kgsl_kmod_cleanup.h
diff --git a/drivers/mxc/amd-gpu/gsl_linux_map.c b/drivers/mxc/amd-gpu/kgsl_linux_map.c
similarity index 100%
rename from drivers/mxc/amd-gpu/gsl_linux_map.c
rename to drivers/mxc/amd-gpu/kgsl_linux_map.c
diff --git a/drivers/mxc/amd-gpu/gsl_log.c b/drivers/mxc/amd-gpu/kgsl_log.c
similarity index 100%
rename from drivers/mxc/amd-gpu/gsl_log.c
rename to drivers/mxc/amd-gpu/kgsl_log.c
diff --git a/drivers/mxc/amd-gpu/gsl_memmgr.c b/drivers/mxc/amd-gpu/kgsl_memmgr.c
similarity index 100%
rename from drivers/mxc/amd-gpu/gsl_memmgr.c
rename to drivers/mxc/amd-gpu/kgsl_memmgr.c
diff --git a/drivers/mxc/amd-gpu/gsl_mmu.c b/drivers/mxc/amd-gpu/kgsl_mmu.c
similarity index 100%
rename from drivers/mxc/amd-gpu/gsl_mmu.c
rename to drivers/mxc/amd-gpu/kgsl_mmu.c
diff --git a/drivers/mxc/amd-gpu/misc.c b/drivers/mxc/amd-gpu/kgsl_pwrctrl.c
similarity index 100%
rename from drivers/mxc/amd-gpu/misc.c
rename to drivers/mxc/amd-gpu/kgsl_pwrctrl.c
diff --git a/drivers/mxc/amd-gpu/gsl_ringbuffer.c b/drivers/mxc/amd-gpu/kgsl_ringbuffer.c
similarity index 100%
rename from drivers/mxc/amd-gpu/gsl_ringbuffer.c
rename to drivers/mxc/amd-gpu/kgsl_ringbuffer.c
diff --git a/drivers/mxc/amd-gpu/gsl_sharedmem.c b/drivers/mxc/amd-gpu/kgsl_sharedmem.c
similarity index 100%
rename from drivers/mxc/amd-gpu/gsl_sharedmem.c
rename to drivers/mxc/amd-gpu/kgsl_sharedmem.c
diff --git a/drivers/mxc/amd-gpu/gsl_tbdump.c b/drivers/mxc/amd-gpu/kgsl_tbdump.c
similarity index 100%
rename from drivers/mxc/amd-gpu/gsl_tbdump.c
rename to drivers/mxc/amd-gpu/kgsl_tbdump.c
diff --git a/drivers/mxc/amd-gpu/gsl_yamato.c b/drivers/mxc/amd-gpu/kgsl_yamato.c
similarity index 100%
rename from drivers/mxc/amd-gpu/gsl_yamato.c
rename to drivers/mxc/amd-gpu/kgsl_yamato.c