From: Huang, Tao <huangtao@rock-chips.com>
Date: Wed, 7 Jan 2015 06:30:39 +0000 (+0800)
Subject: Merge branch develop-3.10
X-Git-Tag: firefly_0821_release~4158^2~468
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=2879802a3cd1713131468610e3756f9cd4e87c51;p=firefly-linux-kernel-4.4.55.git

Merge branch develop-3.10
---

2879802a3cd1713131468610e3756f9cd4e87c51
diff --cc arch/arm/mach-rockchip/Kconfig
index 30f5dc3b0e52,24b25bc5cf95..fce1583eb46a
--- a/arch/arm/mach-rockchip/Kconfig
+++ b/arch/arm/mach-rockchip/Kconfig
@@@ -21,5 -21,66 +21,6 @@@ config ARCH_ROCKCHI
  	select PL330_DMA
  	select FIQ_GLUE
  	select ARM_ERRATA_818325
+ 	select ARM_ERRATA_821420
  
 -if ARCH_ROCKCHIP
 -
 -config RK_LAST_LOG
 -	bool "Save the last kernel log on /proc/last_log"
 -	depends on DEBUG_KERNEL && PRINTK
 -	default y
 -	help
 -	  It is only intended for debugging.
 -
 -config RK_DEBUG_UART
 -	int "Debug UART"
 -	default 2
 -	help
 -	  Select a UART for debugging. -1 disable.
 -
 -config RK_USB_UART
 -        bool "Support USB UART Bypass Function"
 -        depends on (RK_DEBUG_UART = 2) 
 -
 -config RK_CONSOLE_THREAD
 -	bool "Console write by thread"
 -	depends on FIQ_DEBUGGER_CONSOLE
 -	default y
 -	help
 -	  Normal kernel printk will write out to UART by "kconsole" kthread
 -
 -config BLOCK_RKNAND
 -	tristate "RK NAND Device Support"
 -	default n
 -	help
 -	  RK NAND Device Support.
 -
 -config RK_FPGA
 -	bool "FPGA Board"
 -
 -config DVFS
 -        bool "Enable dvfs"
 -	default y
 -	select PM_OPP
 -	select CPU_FREQ
 -
 -config RK_PM_TESTS
 -	bool "/sys/pm_tests/ support"
 -	default n
 -	select DVFS
 -	select WATCHDOG
 -
 -config DDR_TEST
 -	bool "DDR Test"
 -	select CRC32
 -	default n
 -
 -config RK_VCODEC
 -	tristate "VCODEC (VPU HEVC) service driver in kernel"
 -	depends on ARCH_ROCKCHIP
 -	default y
 -
 -config RK_PL330_DMA_TEST
 -	bool "pl330 DMA memcpy test"
 -
 -endif
 +source "arch/arm/mach-rockchip/Kconfig.common"
diff --cc drivers/video/rockchip/rk_fb.c
index 9ba1230d5528,041a40b9eefa..5779256a67c5
mode 100644,100755..100644
--- a/drivers/video/rockchip/rk_fb.c
+++ b/drivers/video/rockchip/rk_fb.c
diff --cc drivers/video/rockchip/transmitter/rk31xx_lvds.c
index 3b7cc5a9ee68,85003fe00926..c60b971ff599
mode 100644,100755..100644
--- a/drivers/video/rockchip/transmitter/rk31xx_lvds.c
+++ b/drivers/video/rockchip/transmitter/rk31xx_lvds.c
diff --cc include/linux/rk_fb.h
index b1ad85a314f4,657fbef59aa6..002b7c0838ac
mode 100644,100755..100644
--- a/include/linux/rk_fb.h
+++ b/include/linux/rk_fb.h