From: Kasin Lee <kasin.li@amlogic.com>
Date: Fri, 15 Aug 2014 07:10:30 +0000 (+0800)
Subject: PD #96069: new cts doesn't need change driver name
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=fab04494804681dd9738a53b7af57a1bc5696673;p=GitHub%2FLineageOS%2FG12%2Fandroid_hardware_amlogic_kernel-modules_mali-driver.git

PD #96069: new cts doesn't need change driver name

Change-Id: I6eb09b8cbdbae70990f90ffc423c5be5a12e6c68
---

diff --git a/mali/linux/mali_kernel_linux.c b/mali/linux/mali_kernel_linux.c
index 4b35bda..fc71a9a 100755
--- a/mali/linux/mali_kernel_linux.c
+++ b/mali/linux/mali_kernel_linux.c
@@ -114,7 +114,7 @@ static u32 mali_cpu_clock_last_value[8] = {0,};
 EXPORT_SYMBOL(mali_set_user_setting);
 EXPORT_SYMBOL(mali_get_user_setting);
 
-static char mali_dev_name[] = "mali0"; /* should be const, but the functions we call requires non-cost */
+static char mali_dev_name[] = "mali"; /* should be const, but the functions we call requires non-cost */
 
 /* This driver only supports one Mali device, and this variable stores this single platform device */
 struct platform_device *mali_platform_device = NULL;
diff --git a/mali/platform/mpgpu.c b/mali/platform/mpgpu.c
index fe0f637..8c63c33 100755
--- a/mali/platform/mpgpu.c
+++ b/mali/platform/mpgpu.c
@@ -20,6 +20,8 @@
 #include <linux/slab.h>
 #include <linux/list.h>
 
+#include <mach/io.h>
+#include <plat/io.h>
 #include <asm/io.h>
 
 #include <linux/mali/mali_utgard.h>
@@ -32,14 +34,11 @@ static ssize_t domain_stat_read(struct class *class,
 {
 	unsigned int val;
 #if MESON_CPU_TYPE >= MESON_CPU_TYPE_MESON8
-	if (mali_pm_statue == 1) {
-		val = mali_pmu_get_status();
-	} else
-		val = 0x7;
+	val = readl((u32 *)(IO_AOBUS_BASE + 0xf0)) & 0xff;
 #else
-	val = 0;
+	val = 0xffffffff;
 #endif
-	return sprintf(buf, "%x\n", val);
+	return sprintf(buf, "%x\n", val>>4);
 }
 
 #if MESON_CPU_TYPE > MESON_CPU_TYPE_MESON6TVD