Cleanup and merge with r3p0-04rel0

source http://malideveloper.arm.com/develop-for-mali/drivers/open-source-mali-gpus-linux-kernel-device-drivers/