From: xxm <xxm@rock-chips.com>
Date: Mon, 4 Aug 2014 06:46:13 +0000 (+0800)
Subject: rockchip: mali400: change gpu to built-in temp
X-Git-Tag: firefly_0821_release~4916^2~70
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=3a37be7ce1646a45e62e3d866babddf05b4fcee6;p=firefly-linux-kernel-4.4.55.git

rockchip: mali400: change gpu to built-in temp
---

diff --git a/arch/arm/configs/rockchip_defconfig b/arch/arm/configs/rockchip_defconfig
index 5e2fc53cb328..09bfd429f1db 100644
--- a/arch/arm/configs/rockchip_defconfig
+++ b/arch/arm/configs/rockchip_defconfig
@@ -34,7 +34,6 @@ CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_PARTITION_ADVANCED=y
 CONFIG_ARCH_ROCKCHIP=y
-CONFIG_RK_PARTITION=y
 CONFIG_RK_USB_UART=y
 CONFIG_BLOCK_RKNAND=y
 CONFIG_ARM_ERRATA_720789=y
@@ -210,7 +209,6 @@ CONFIG_RFKILL=y
 CONFIG_RFKILL_RK=y
 CONFIG_DEVTMPFS=y
 CONFIG_DMA_CMA=y
-CONFIG_CMA_ALLOC_RETRY=20
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_UID_STAT=y
 CONFIG_SRAM=y
@@ -347,13 +345,10 @@ CONFIG_MEDIA_RC_SUPPORT=y
 CONFIG_MEDIA_CONTROLLER=y
 CONFIG_VIDEO_V4L2_SUBDEV_API=y
 CONFIG_V4L_PLATFORM_DRIVERS=y
-CONFIG_MALI_MIDGARD=m
-CONFIG_MALI_MIDGARD_DVFS=y
-CONFIG_MALI_MIDGARD_RT_PM=y
-CONFIG_MALI_MIDGARD_DEBUG_SYS=y
-CONFIG_MALI_EXPERT=y
-CONFIG_MALI_DEBUG_SHADER_SPLIT_FS=y
-CONFIG_MALI_PLATFORM_THIRDPARTY_NAME="rk"
+CONFIG_MALI400=y
+CONFIG_MALI400_DEBUG=y
+# CONFIG_MALI400_PROFILING is not set
+CONFIG_MALI_SHARED_INTERRUPTS=y
 CONFIG_FB=y
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
 # CONFIG_LCD_CLASS_DEVICE is not set
@@ -362,8 +357,8 @@ CONFIG_BACKLIGHT_CLASS_DEVICE=y
 CONFIG_BACKLIGHT_PWM=y
 CONFIG_FB_ROCKCHIP=y
 CONFIG_LCDC_RK3188=y
-CONFIG_LCDC_RK312X=y
 CONFIG_LCDC_RK3288=y
+CONFIG_LCDC_RK312X=y
 CONFIG_RK_TRSM=y
 CONFIG_RK32_LVDS=y
 CONFIG_RK31XX_LVDS=y
@@ -488,8 +483,6 @@ CONFIG_MMC_PARANOID_SD_INIT=y
 CONFIG_MMC_BLOCK_MINORS=32
 # CONFIG_MMC_BLOCK_BOUNCE is not set
 CONFIG_MMC_DW=y
-#CONFIG_MMC_DW_IDMAC is not set
-CONFIG_MMC_DW_EDMAC=y
 CONFIG_MMC_DW_ROCKCHIP=y
 CONFIG_LEDS_GPIO=y
 CONFIG_LEDS_TRIGGERS=y